TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 04:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restored camera permission check for avatar change action.

Browse Source
This commit is contained in:
Anton Chekulaev
2020-09-07 21:03:15 +10:00
parent a1778c9503
commit e352869aeb
4 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ public class Permissions {
}
for (String permission : requestedPermissions) {
request.addMapping(permission, permissionObject.shouldShouldPermissionRationale(permission));
request.addMapping(permission, permissionObject.shouldShowPermissionRationale(permission));
}
permissionObject.requestPermissions(requestCode, requestedPermissions);
@@ -240,7 +240,7 @@ public class Permissions {
for (int i=0;i<permissions.length;i++) {
if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
shouldShowRationaleDialog[i] = context.shouldShouldPermissionRationale(permissions[i]);
shouldShowRationaleDialog[i] = context.shouldShowPermissionRationale(permissions[i]);
}
}
@@ -259,7 +259,7 @@ public class Permissions {
private abstract static class PermissionObject {
abstract Context getContext();
abstract boolean shouldShouldPermissionRationale(String permission);
abstract boolean shouldShowPermissionRationale(String permission);
abstract boolean hasAll(String... permissions);
abstract void requestPermissions(int requestCode, String... permissions);
@@ -287,7 +287,7 @@ public class Permissions {
}
@Override
public boolean shouldShouldPermissionRationale(String permission) {
public boolean shouldShowPermissionRationale(String permission) {
return ActivityCompat.shouldShowRequestPermissionRationale(activity, permission);
}
@@ -316,7 +316,7 @@ public class Permissions {
}
@Override
public boolean shouldShouldPermissionRationale(String permission) {
public boolean shouldShowPermissionRationale(String permission) {
return fragment.shouldShowRequestPermissionRationale(permission);
}