From cd4700aeeda49bc4717b440d5c5dd5fa3207428e Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Mon, 18 Jul 2016 07:34:54 +1000
Subject: [PATCH] Removed `TargetApi` annotation from class, push to methods
 and API problems.

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.
---
 .../views/AppSecurityPermissions.java         | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
index f44808d9a..a743b0850 100644
--- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
+++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
@@ -29,6 +29,7 @@ import android.content.pm.PermissionInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Parcel;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.SpannableStringBuilder;
 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
  * - Start from latest included commit and include changes until the newest commit with care
  */
-@TargetApi(Build.VERSION_CODES.M)
 public class AppSecurityPermissions {
 
     private static final String TAG = "AppSecurityPermissions";
@@ -104,11 +104,12 @@ public class AppSecurityPermissions {
             super(info);
         }
 
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
         public Drawable loadGroupIcon(Context context, PackageManager pm) {
             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);
                 }
-                final boolean newPerm = installedPkgInfo != null
-                        && (existingFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0;
                 MyPermissionInfo myPerm = new MyPermissionInfo(tmpPermInfo);
                 myPerm.existingReqFlags = existingFlags;
-                // This is a new permission if the app is already installed and
-                // doesn't currently hold this permission.
-                myPerm.newPerm = newPerm;
+                myPerm.newPerm = isNewPermission(installedPkgInfo, existingFlags);
                 permSet.add(myPerm);
             } catch (NameNotFoundException e) {
                 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) {
         switch (which) {
             case WHICH_NEW: