Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

purge appInfo property variable from App class

Browse Source 
Expose less stuff as properties, this didn't need to be exposed, it was
only an implementation shortcut.
This commit is contained in:
Hans-Christoph Steiner 2014-05-06 19:35:49 -04:00
parent 3352d83102
commit d8d8a45d88
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/fdroid/fdroid/data/App.java
View File

@ -95,7 +95,6 @@ public class App extends ValueObject implements Comparable<App> {
public int installedVersionCode; public int installedVersionCode;
public ApplicationInfo appInfo;
public Apk installedApk; // might be null if not installed public Apk installedApk; // might be null if not installed
@Override @Override
@ -215,7 +214,6 @@ public class App extends ValueObject implements Comparable<App> {
+ ", last updated on " + this.lastUpdated + ")</p>"; + ", last updated on " + this.lastUpdated + ")</p>";
this.name = (String) appInfo.loadLabel(pm); this.name = (String) appInfo.loadLabel(pm);
this.appInfo = appInfo;
File apkFile = new File(appInfo.publicSourceDir); File apkFile = new File(appInfo.publicSourceDir);
Apk apk = new Apk(); Apk apk = new Apk();

14
src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
View File

@ -210,9 +210,17 @@ public class LocalRepoManager {
} }
public void copyIconsToRepo() { public void copyIconsToRepo() {
for (App app : apps.values()) ApplicationInfo appInfo;
if (app.installedApk != null) for (App app : apps.values()) {
copyIconToRepo(app.appInfo.loadIcon(pm), app.id, app.installedApk.vercode); 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();
}
}
}
} }
/** /**