TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 15:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat Permissions "not now" as a denial

Browse Source 
Fixes #7713
This commit is contained in:
Moxie Marlinspike 2018-04-23 18:28:57 -07:00 committed by Greyson Parrelli
parent a5047cb17b
commit 35d158cfee
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/thoughtcrime/securesms/permissions/Permissions.java
View File

@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.util.ServiceUtil;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -156,7 +157,7 @@ public class Permissions {
private void executePermissionsRequestWithRationale(PermissionsRequest request) { private void executePermissionsRequestWithRationale(PermissionsRequest request) {
RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader) RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
.setPositiveButton(R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request)) .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request))
.setNegativeButton(R.string.Permissions_not_now, null) .setNegativeButton(R.string.Permissions_not_now, (dialog, which) -> executeNoPermissionsRequest(request))
.show() .show()
.getWindow() .getWindow()
.setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT); .setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT);
@ -176,6 +177,19 @@ public class Permissions {
permissionObject.requestPermissions(requestCode, requestedPermissions); permissionObject.requestPermissions(requestCode, requestedPermissions);
} }
private void executeNoPermissionsRequest(PermissionsRequest request) {
for (String permission : requestedPermissions) {
request.addMapping(permission, true);
}
String[] permissions = filterNotGranted(permissionObject.getContext(), requestedPermissions);
int[] grantResults = Stream.of(permissions).mapToInt(permission -> PackageManager.PERMISSION_DENIED).toArray();
boolean[] showDialog = new boolean[permissions.length];
Arrays.fill(showDialog, true);
request.onResult(permissions, grantResults, showDialog);
}
} }
private static void requestPermissions(@NonNull Activity activity, int requestCode, String... permissions) { private static void requestPermissions(@NonNull Activity activity, int requestCode, String... permissions) {