From cb4edbed44c72cbd8315ee9f665d4403fa0b1e88 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 1 Sep 2016 15:58:09 +0200
Subject: [PATCH] if updating notification, also try getting app name from DB

Now that the packageName is included in the Installer broadcast Intents,
it can be used to fetch the app name from the database, if all other ways
fail.
---
 .../fdroid/installer/InstallManagerService.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 7fedf8256..62b1b0d88 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -5,6 +5,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -22,6 +23,7 @@ import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.compat.PackageManagerCompat;
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.App;
+import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.DownloaderService;
 
@@ -255,6 +257,10 @@ public class InstallManagerService extends Service {
                         // show notification if app details is not visible
                         if (!TextUtils.isEmpty(errorMessage)) {
                             App app = getAppFromActive(downloadUrl);
+                            if (app == null) {
+                                ContentResolver resolver = context.getContentResolver();
+                                app = AppProvider.Helper.findByPackageName(resolver, apk.packageName);
+                            }
                             // show notification if app details is not visible
                             if (app != null && AppDetails.isAppVisible(app.packageName)) {
                                 cancelNotification(downloadUrl);
@@ -337,10 +343,14 @@ public class InstallManagerService extends Service {
             title = String.format(getString(R.string.tap_to_update_format),
                     pm.getApplicationLabel(pm.getApplicationInfo(apk.packageName, 0)));
         } catch (PackageManager.NameNotFoundException e) {
-            // TODO use packageName to fetch App instance from database if not cached
             String name = getAppName(apk);
             if (TextUtils.isEmpty(name) || name.equals(new App().name)) {
-                return;  // do not have a name to display, so leave notification as is
+                ContentResolver resolver = getContentResolver();
+                App app = AppProvider.Helper.findByPackageName(resolver, apk.packageName);
+                if (app == null || TextUtils.isEmpty(app.name)) {
+                    return;  // do not have a name to display, so leave notification as is
+                }
+                name = app.name;
             }
             title = String.format(getString(R.string.tap_to_install_format), name);
         }