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

Removed TargetApi annotation from class, push to methods and API problems.

Browse Source 
This class is used by `AppDetails` without an API verison check around its access.
Thus, we call methods on this that are unsupported when on gingerbread.

By removing `TargetApi` from the class, it unearthed a couple of locations
where methods were being invoked without first guarding against the build version
correctly. These two locations have been fixed and a `TargetApi` attached to the
more narrowly defined method which requires it.
This commit is contained in:
Peter Serwylo 2016-07-18 07:34:54 +10:00
parent a4458b7cdf
commit cd4700aeed
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
View File

@ -29,6 +29,7 @@ import android.content.pm.PermissionInfo;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
@ -70,7 +71,6 @@ import java.util.Set;
* - Open https://github.com/android/platform_frameworks_base/commits/master/core/java/android/widget/AppSecurityPermissions.java * - Open https://github.com/android/platform_frameworks_base/commits/master/core/java/android/widget/AppSecurityPermissions.java
* - Start from latest included commit and include changes until the newest commit with care * - Start from latest included commit and include changes until the newest commit with care
*/ */
@TargetApi(Build.VERSION_CODES.M)
public class AppSecurityPermissions { public class AppSecurityPermissions {
private static final String TAG = "AppSecurityPermissions"; private static final String TAG = "AppSecurityPermissions";
@ -104,11 +104,12 @@ public class AppSecurityPermissions {
super(info); super(info);
} }
@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
public Drawable loadGroupIcon(Context context, PackageManager pm) { public Drawable loadGroupIcon(Context context, PackageManager pm) {
if (icon != 0) { if (icon != 0) {
return (Build.VERSION.SDK_INT < 22) ? loadIcon(pm) : loadUnbadgedIcon(pm); return (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) ? loadIcon(pm) : loadUnbadgedIcon(pm);
} }
return context.getDrawable(R.drawable.ic_perm_device_info); return ContextCompat.getDrawable(context, R.drawable.ic_perm_device_info);
} }
} }
@ -309,13 +310,9 @@ public class AppSecurityPermissions {
} }
permGroups.put(tmpPermInfo.group, group); permGroups.put(tmpPermInfo.group, group);
} }
final boolean newPerm = installedPkgInfo != null
&& (existingFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0;
MyPermissionInfo myPerm = new MyPermissionInfo(tmpPermInfo); MyPermissionInfo myPerm = new MyPermissionInfo(tmpPermInfo);
myPerm.existingReqFlags = existingFlags; myPerm.existingReqFlags = existingFlags;
// This is a new permission if the app is already installed and myPerm.newPerm = isNewPermission(installedPkgInfo, existingFlags);
// doesn't currently hold this permission.
myPerm.newPerm = newPerm;
permSet.add(myPerm); permSet.add(myPerm);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.i(TAG, "Ignoring unknown permission:" + permName); Log.i(TAG, "Ignoring unknown permission:" + permName);
@ -323,6 +320,20 @@ public class AppSecurityPermissions {
} }
} }
/**
* A permission is a "new permission" if the app is already installed and
* doesn't currently hold this permission. On older devices that don't support
* this concept, permissions are never "new permissions".
*/
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private static boolean isNewPermission(PackageInfo installedPkgInfo, int existingFlags) {
if (installedPkgInfo == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
return false;
}
return (existingFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0;
}
private List<MyPermissionInfo> getPermissionList(MyPermissionGroupInfo grp, int which) { private List<MyPermissionInfo> getPermissionList(MyPermissionGroupInfo grp, int which) {
switch (which) { switch (which) {
case WHICH_NEW: case WHICH_NEW: