TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-21 18:11:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utilise dialog dsl in SettingsDialog

Browse Source
This commit is contained in:
andrew 2023-06-02 19:19:43 +09:30
parent 4641512644
commit 033eabbc53
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
View File

@ -255,7 +255,7 @@ public class Permissions {
resultListener.onResult(permissions, grantResults, shouldShowRationaleDialog); resultListener.onResult(permissions, grantResults, shouldShowRationaleDialog);
} }
private static Intent getApplicationSettingsIntent(@NonNull Context context) { static Intent getApplicationSettingsIntent(@NonNull Context context) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
Uri uri = Uri.fromParts("package", context.getPackageName(), null); Uri uri = Uri.fromParts("package", context.getPackageName(), null);
@ -352,20 +352,8 @@ public class Permissions {
@Override @Override
public void run() { public void run() {
Context context = this.context.get(); Context context = this.context.get();
if (context == null) return;
if (context != null) { SettingsDialog.show(context, message);
AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.ThemeOverlay_Session_AlertDialog)
.setTitle(R.string.Permissions_permission_required)
.setMessage(message)
.setPositiveButton(R.string.Permissions_continue, (dialog, which) -> context.startActivity(getApplicationSettingsIntent(context)))
.setNegativeButton(android.R.string.cancel, null)
.create();
Button positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
if (positiveButton != null) {
positiveButton.setContentDescription(context.getString(R.string.AccessibilityId_continue));
}
alertDialog.show();
}
} }
} }
} }

21
app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt Normal file
View File

@ -0,0 +1,21 @@
package org.thoughtcrime.securesms.permissions
import android.content.Context
import network.loki.messenger.R
import org.thoughtcrime.securesms.showSessionDialog
class SettingsDialog {
companion object {
@JvmStatic
fun show(context: Context, message: String) {
context.showSessionDialog {
title(R.string.Permissions_permission_required)
text(message)
button(R.string.Permissions_continue, R.string.AccessibilityId_continue) {
context.startActivity(Permissions.getApplicationSettingsIntent(context))
}
cancelButton()
}
}
}
}