From d8d8a45d88557d2fde42da4a22aa8df84b16e9d0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 6 May 2014 19:35:49 -0400
Subject: [PATCH] purge appInfo property variable from App class

Expose less stuff as properties, this didn't need to be exposed, it was
only an implementation shortcut.
---
 src/org/fdroid/fdroid/data/App.java                |  2 --
 .../fdroid/fdroid/localrepo/LocalRepoManager.java  | 14 +++++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/org/fdroid/fdroid/data/App.java b/src/org/fdroid/fdroid/data/App.java
index 38d900572..ebed22717 100644
--- a/src/org/fdroid/fdroid/data/App.java
+++ b/src/org/fdroid/fdroid/data/App.java
@@ -95,7 +95,6 @@ public class App extends ValueObject implements Comparable<App> {
 
     public int installedVersionCode;
 
-    public ApplicationInfo appInfo;
     public Apk installedApk; // might be null if not installed
 
     @Override
@@ -215,7 +214,6 @@ public class App extends ValueObject implements Comparable<App> {
                 + ", last updated on " + this.lastUpdated + ")</p>";
 
         this.name = (String) appInfo.loadLabel(pm);
-        this.appInfo = appInfo;
 
         File apkFile = new File(appInfo.publicSourceDir);
         Apk apk = new Apk();
diff --git a/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
index 317377f04..053665f2b 100644
--- a/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
+++ b/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
@@ -210,9 +210,17 @@ public class LocalRepoManager {
     }
 
     public void copyIconsToRepo() {
-        for (App app : apps.values())
-            if (app.installedApk != null)
-                copyIconToRepo(app.appInfo.loadIcon(pm), app.id, app.installedApk.vercode);
+        ApplicationInfo appInfo;
+        for (App app : apps.values()) {
+            if (app.installedApk != null) {
+                try {
+                    appInfo = pm.getApplicationInfo(app.id, PackageManager.GET_META_DATA);
+                    copyIconToRepo(appInfo.loadIcon(pm), app.id, app.installedApk.vercode);
+                } catch (NameNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
 
     /**