From 204ac3cca9095daffac945ea8d72f8bddc2313bc Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Thu, 20 Apr 2017 21:56:59 +0530
Subject: [PATCH] PackageManagerCompat: Handle exceptions better

* Don't catch all exceptions, only what we expect.
* Also re-format comments as javadoc
---
 .../fdroid/compat/PackageManagerCompat.java   | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
index 7c02411cc..05a6c51c7 100644
--- a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
+++ b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
@@ -5,9 +5,24 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.util.Log;
+
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.installer.PrivilegedInstaller;
 
+/**
+ * Starting with 7.0 (API 24), we're using PackageInstaller APIs
+ * to install and uninstall apps via the privileged extension.
+ * That enforces the uninstaller being the same as the installer,
+ * so set the package name to privileged extension if it is being used.
+ * <p>
+ * While setting the installer package name, many problems can occur,
+ * such as:
+ * <li> App wasn't installed due to incompatibility
+ * <li> User canceled install
+ * <li> Another app interfered in the process
+ * <li> Another app already set the target's installer package,
+ * which happens in the case where we fell back to {@link org.fdroid.fdroid.installer.DefaultInstaller}
+ */
 public class PackageManagerCompat {
 
     private static final String TAG = "PackageManagerCompat";
@@ -16,25 +31,13 @@ public class PackageManagerCompat {
     public static void setInstaller(Context context, PackageManager mPm, String packageName) {
         if (Build.VERSION.SDK_INT < 11) return;
         try {
-            /*
-             * Starting with 7.0 (API 24), we're using PackageInstaller APIs
-             * to install and uninstall apps via the privileged extension.
-             * That enforces the uninstaller being the same as the installer,
-             * so set the package name to that.
-             */
             if (Build.VERSION.SDK_INT >= 24 && PrivilegedInstaller.isDefault(context)) {
                 mPm.setInstallerPackageName(packageName, "org.fdroid.fdroid.privileged");
             } else {
                 mPm.setInstallerPackageName(packageName, "org.fdroid.fdroid");
             }
             Utils.debugLog(TAG, "Installer package name for " + packageName + " set successfully");
-        } catch (Exception e) {
-            // Many problems can occur:
-            //  * App wasn't installed due to incompatibility
-            //  * User canceled install
-            //  * Another app interfered in the process
-            //  * Another app already set the target's installer package
-            //  * ...
+        } catch (SecurityException | IllegalArgumentException e) {
             Log.e(TAG, "Could not set installer package name for " +
                     packageName, e);
         }