From 85cd9abd4cfdd1cab0f336d312802ba0a03c77fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 21 Sep 2013 23:46:09 +0200
Subject: [PATCH] Set PackageInstaller as org.fdroid.fdroid whenever possible
 (closes: #355)

---
 src/org/fdroid/fdroid/AppDetails.java         |  4 +++
 .../fdroid/compat/PackageManagerCompat.java   | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 src/org/fdroid/fdroid/compat/PackageManagerCompat.java

diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 6547b0c01..2d600e3ff 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -68,6 +68,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
+import org.fdroid.fdroid.compat.PackageManagerCompat;
+
 public class AppDetails extends ListActivity {
 
     private static final int REQUEST_INSTALL = 0;
@@ -967,6 +969,8 @@ public class AppDetails extends ListActivity {
             if (downloadHandler != null) {
                 downloadHandler = null;
             }
+
+            PackageManagerCompat.setInstaller(mPm, app.id);
             resetRequired = true;
             break;
         case REQUEST_UNINSTALL:
diff --git a/src/org/fdroid/fdroid/compat/PackageManagerCompat.java b/src/org/fdroid/fdroid/compat/PackageManagerCompat.java
new file mode 100644
index 000000000..2c5c5d81a
--- /dev/null
+++ b/src/org/fdroid/fdroid/compat/PackageManagerCompat.java
@@ -0,0 +1,28 @@
+package org.fdroid.fdroid.compat;
+
+import java.lang.Exception;
+
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+public class PackageManagerCompat extends Compatibility {
+
+    public static void setInstaller(PackageManager mPm, String app_id) {
+        if (!hasApi(11)) return;
+        try {
+            mPm.setInstallerPackageName(app_id, "org.fdroid.fdroid");
+            Log.d("FDroid", "Installer package name for " +
+                    app_id + " 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
+            //  * ...
+            Log.d("FDroid", "Could not set installer package name for " +
+                    app_id + ": " + e.getMessage());
+        }
+    }
+
+}