From 432f45254b569125446d6d69507b134c4e85e56b Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Tue, 18 Apr 2017 23:49:16 +0530
Subject: [PATCH] PrivilegedInstaller: fallback to default installer for
 uninstall

* On API >= 24, in cases when the installer package name is not set
  to privext, the system won't let us uninstall.
* Fallback to the DefaultInstaller so that uninstall still works.
---
 .../fdroid/fdroid/compat/PackageManagerCompat.java   |  2 ++
 .../fdroid/installer/InstallManagerService.java      |  6 +++++-
 .../java/org/fdroid/fdroid/installer/Installer.java  | 12 ++++++++++++
 .../fdroid/fdroid/installer/PrivilegedInstaller.java |  5 +----
 4 files changed, 20 insertions(+), 5 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 0daf49d6b..9c625c4ac 100644
--- a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
+++ b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
@@ -29,6 +29,8 @@ public class PackageManagerCompat {
                 mPm.setInstallerPackageName(packageName, "org.fdroid.fdroid");
             }
             Utils.debugLog(TAG, "Installer package name for " + packageName + " set successfully");
+        } catch (SecurityException e) {
+            throw new SecurityException(e);
         } catch (Exception e) {
             // Many problems can occur:
             //  * App wasn't installed due to incompatibility
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
index e36d21f4c..1237d5181 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -338,7 +338,11 @@ public class InstallManagerService extends Service {
                         Apk apkComplete =  appUpdateStatusManager.getApk(downloadUrl);
 
                         if (apkComplete != null) {
-                            PackageManagerCompat.setInstaller(context, getPackageManager(), apkComplete.packageName);
+                            try {
+                                PackageManagerCompat.setInstaller(context, getPackageManager(), apkComplete.packageName);
+                            } catch (SecurityException e) {
+                                // Will happen if we fell back to DefaultInstaller for some reason.
+                            }
                         }
                         localBroadcastManager.unregisterReceiver(this);
                         break;
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
index e77b83634..7bf061005 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java
@@ -31,6 +31,8 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.compat.PackageManagerCompat;
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.ApkProvider;
 import org.fdroid.fdroid.privileged.views.AppDiff;
@@ -138,6 +140,16 @@ public abstract class Installer {
             return null;
         }
 
+        try {
+            PackageManagerCompat.setInstaller(context, context.getPackageManager(), apk.packageName);
+        } catch (SecurityException e) {
+            Utils.debugLog(TAG, "Falling back to default installer for uninstall");
+            Intent intent = new Intent(context, DefaultInstallerActivity.class);
+            intent.setAction(DefaultInstallerActivity.ACTION_UNINSTALL_PACKAGE);
+            intent.putExtra(Installer.EXTRA_APK, apk);
+            return intent;
+        }
+
         Intent intent = new Intent(context, UninstallDialogActivity.class);
         intent.putExtra(Installer.EXTRA_APK, apk);
 
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
index e0e9a8623..719b64288 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
@@ -34,6 +34,7 @@ import android.util.Log;
 
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.compat.PackageManagerCompat;
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.privileged.IPrivilegedCallback;
@@ -395,10 +396,6 @@ public class PrivilegedInstaller extends Installer {
             }
         };
 
-        /*
-         * Set installer to the privileged extension
-         */
-        PackageManagerCompat.setInstaller(context, context.getPackageManager(), apk.packageName);
         Intent serviceIntent = new Intent(PRIVILEGED_EXTENSION_SERVICE_INTENT);
         serviceIntent.setPackage(PRIVILEGED_EXTENSION_PACKAGE_NAME);
         context.getApplicationContext().bindService(serviceIntent, mServiceConnection,