From 677db72bb3dc9d91f0f960509d848b66255238c4 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 25 May 2016 13:00:00 +0200
Subject: [PATCH] Utils.getPackageUri() for creating Uris from packageNames

Since this is done a lot, might as well have a reusable method.
---
 app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java  | 6 +++---
 app/src/main/java/org/fdroid/fdroid/Utils.java             | 7 +++++++
 .../org/fdroid/fdroid/localrepo/CacheSwapAppsService.java  | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
index 21a49518c..ab171366e 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
@@ -158,7 +158,7 @@ public class TestUtils {
         context.setPackageManager(pm);
         pm.install(appId, versionCode, versionName);
         Intent installIntent = new Intent(Intent.ACTION_PACKAGE_ADDED);
-        installIntent.setData(Uri.parse("package:" + appId));
+        installIntent.setData(Utils.getPackageUri(appId));
         new PackageAddedReceiver().onReceive(context, installIntent);
 
     }
@@ -176,7 +176,7 @@ public class TestUtils {
         context.setPackageManager(pm);
         pm.install(appId, versionCode, versionName);
         Intent installIntent = new Intent(Intent.ACTION_PACKAGE_CHANGED);
-        installIntent.setData(Uri.parse("package:" + appId));
+        installIntent.setData(Utils.getPackageUri(appId));
         new PackageUpgradedReceiver().onReceive(context, installIntent);
 
     }
@@ -189,7 +189,7 @@ public class TestUtils {
         context.setPackageManager(pm);
         pm.remove(appId);
         Intent installIntent = new Intent(Intent.ACTION_PACKAGE_REMOVED);
-        installIntent.setData(Uri.parse("package:" + appId));
+        installIntent.setData(Utils.getPackageUri(appId));
         new PackageRemovedReceiver().onReceive(context, installIntent);
 
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java
index 73b81d805..619e63bbc 100644
--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@@ -267,6 +267,13 @@ public final class Utils {
         return b.build();
     }
 
+    /**
+     * Create a standard {@link PackageManager} {@link Uri} for pointing to an app.
+     */
+    public static Uri getPackageUri(String packageName) {
+        return Uri.parse("package:" + packageName);
+    }
+
     /**
      * This location is only for caching, do not install directly from this location
      * because if the file is on the External Storage, any other app could swap out
diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java b/app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java
index a3674f9d9..63a1fa1c0 100644
--- a/app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java
+++ b/app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java
@@ -58,7 +58,7 @@ public class CacheSwapAppsService extends IntentService {
             if (!indexJarFile.exists()
                     || FileUtils.isFileNewer(new File(applicationInfo.sourceDir), indexJarFile)) {
                 Intent intent = new Intent();
-                intent.setData(Uri.parse("package:" + applicationInfo.packageName));
+                intent.setData(Utils.getPackageUri(applicationInfo.packageName));
                 parseApp(context, intent);
             }
         }