Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'api29-3' into 'master'

Browse Source 
Handle API 29 split-permissions v3

See merge request fdroid/fdroidclient!869
This commit is contained in:
Hans-Christoph Steiner 2020-02-04 15:57:19 +00:00
commit 7cd42ce499
2 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/org/fdroid/fdroid/data/Apk.java
View File

@ -503,17 +503,6 @@ public class Apk extends ValueObject implements Comparable<Apk>, Parcelable {
* another permission, for example: * another permission, for example:
* {@link Manifest.permission#WRITE_EXTERNAL_STORAGE} implies * {@link Manifest.permission#WRITE_EXTERNAL_STORAGE} implies
* {@link Manifest.permission#READ_EXTERNAL_STORAGE}. * {@link Manifest.permission#READ_EXTERNAL_STORAGE}.
* Staring with API 29 / Android 10 / Q,
* Apps targetting API 28 or lower automatically get
* {@link Manifest.permission#ACCESS_BACKGROUND_LOCATION} when they ask for either of
* {@link Manifest.permission#ACCESS_COARSE_LOCATION} or
* {@link Manifest.permission#ACCESS_FINE_LOCATION}.
* Also,
* {@link Manifest.permission#ACCESS_FINE_LOCATION} implies
* {@link Manifest.permission#ACCESS_COARSE_LOCATION}.
* And,
* {@link Manifest.permission#READ_EXTERNAL_STORAGE} implies
* {@link Manifest.permission#ACCESS_MEDIA_LOCATION}
* Many of these rules are for quite old Android versions, * Many of these rules are for quite old Android versions,
* so they are not included here. * so they are not included here.
* *
@ -536,20 +525,27 @@ public class Apk extends ValueObject implements Comparable<Apk>, Parcelable {
if (Build.VERSION.SDK_INT >= 16 && set.contains(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { if (Build.VERSION.SDK_INT >= 16 && set.contains(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
set.add(Manifest.permission.READ_EXTERNAL_STORAGE); set.add(Manifest.permission.READ_EXTERNAL_STORAGE);
} }
if (targetSdkVersion <= 28) { if (Build.VERSION.SDK_INT >= 29) {
if (Build.VERSION.SDK_INT >= 29 && (set.contains(Manifest.permission.ACCESS_COARSE_LOCATION) || if (set.contains(Manifest.permission.ACCESS_FINE_LOCATION)) {
set.contains(Manifest.permission.ACCESS_FINE_LOCATION))) {
// TODO: Change the below to Manifest.permission once we target SDK 29.
set.add("android.permission.ACCESS_BACKGROUND_LOCATION");
}
}
if (Build.VERSION.SDK_INT >= 29 && set.contains(Manifest.permission.ACCESS_FINE_LOCATION)) {
set.add(Manifest.permission.ACCESS_COARSE_LOCATION); set.add(Manifest.permission.ACCESS_COARSE_LOCATION);
} }
if (Build.VERSION.SDK_INT >= 29 && set.contains(Manifest.permission.READ_EXTERNAL_STORAGE)) { if (targetSdkVersion >= 29) {
// TODO: Change the below to Manifest.permission once we target SDK 29. // Do nothing. The targetSdk for the below split-permissions is set to 29,
// so we don't make any changes for apps targetting 29 or above
} else {
// TODO: Change the strings below to Manifest.permission once we target SDK 29.
if (set.contains(Manifest.permission.ACCESS_FINE_LOCATION)) {
set.add("android.permission.ACCESS_BACKGROUND_LOCATION");
}
if (set.contains(Manifest.permission.ACCESS_COARSE_LOCATION)) {
set.add("android.permission.ACCESS_BACKGROUND_LOCATION");
}
if (set.contains(Manifest.permission.READ_EXTERNAL_STORAGE)) {
set.add("android.permission.ACCESS_MEDIA_LOCATION"); set.add("android.permission.ACCESS_MEDIA_LOCATION");
} }
}
}
requestedPermissions = set.toArray(new String[set.size()]); requestedPermissions = set.toArray(new String[set.size()]);
} }

29
app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
View File

@ -103,23 +103,26 @@ public class RepoXMLHandler extends DefaultHandler {
requestedPermissionsSet.contains(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { requestedPermissionsSet.contains(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
requestedPermissionsSet.add(Manifest.permission.READ_EXTERNAL_STORAGE); requestedPermissionsSet.add(Manifest.permission.READ_EXTERNAL_STORAGE);
} }
if (curapk.targetSdkVersion <= 28) { if (Build.VERSION.SDK_INT >= 29) {
if (Build.VERSION.SDK_INT >= 29 && if (requestedPermissionsSet.contains(Manifest.permission.ACCESS_FINE_LOCATION)) {
(requestedPermissionsSet.contains(Manifest.permission.ACCESS_COARSE_LOCATION) ||
requestedPermissionsSet.contains(Manifest.permission.ACCESS_FINE_LOCATION))) {
// TODO: Change the below to Manifest.permission once we target SDK 29.
requestedPermissionsSet.add("android.permission.ACCESS_BACKGROUND_LOCATION");
}
}
if (Build.VERSION.SDK_INT >= 29 &&
requestedPermissionsSet.contains(Manifest.permission.ACCESS_FINE_LOCATION)) {
requestedPermissionsSet.add(Manifest.permission.ACCESS_COARSE_LOCATION); requestedPermissionsSet.add(Manifest.permission.ACCESS_COARSE_LOCATION);
} }
if (Build.VERSION.SDK_INT >= 29 && if (curapk.targetSdkVersion >= 29) {
requestedPermissionsSet.contains(Manifest.permission.READ_EXTERNAL_STORAGE)) { // Do nothing. The targetSdk for the below split-permissions is set to 29,
// TODO: Change the below to Manifest.permission once we target SDK 29. // so we don't make any changes for apps targetting 29 or above
} else {
// TODO: Change the strings below to Manifest.permission once we target SDK 29.
if (requestedPermissionsSet.contains(Manifest.permission.ACCESS_FINE_LOCATION)) {
requestedPermissionsSet.add("android.permission.ACCESS_BACKGROUND_LOCATION");
}
if (requestedPermissionsSet.contains(Manifest.permission.ACCESS_COARSE_LOCATION)) {
requestedPermissionsSet.add("android.permission.ACCESS_BACKGROUND_LOCATION");
}
if (requestedPermissionsSet.contains(Manifest.permission.READ_EXTERNAL_STORAGE)) {
requestedPermissionsSet.add("android.permission.ACCESS_MEDIA_LOCATION"); requestedPermissionsSet.add("android.permission.ACCESS_MEDIA_LOCATION");
} }
}
}
int size = requestedPermissionsSet.size(); int size = requestedPermissionsSet.size();
curapk.requestedPermissions = requestedPermissionsSet.toArray(new String[size]); curapk.requestedPermissions = requestedPermissionsSet.toArray(new String[size]);
requestedPermissionsSet.clear(); requestedPermissionsSet.clear();