From 941d8a0b8bbd79895173e10e0bf71ca2e881a8fc Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Fri, 21 Feb 2020 16:08:08 +0100
Subject: [PATCH] rename app.icon to app.iconFromApk

This makes it clearer what this is actually referring to.
---
 .../fdroid/nearby/LocalRepoManager.java       |  2 +-
 .../main/java/org/fdroid/fdroid/data/App.java | 19 ++++++++++---------
 .../fdroid/fdroid/data/RepoXMLHandler.java    |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
index e5f8d7f13..336e2db0b 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
@@ -414,7 +414,7 @@ public final class LocalRepoManager {
             tag("lastupdated", app.lastUpdated);
             tag("name", app.name);
             tag("summary", app.summary);
-            tag("icon", app.icon);
+            tag("icon", app.iconFromApk);
             tag("desc", app.description);
             tag("license", "Unknown");
             tag("categories", "LocalRepo," + Preferences.get().getLocalRepoName());
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index d6f9c76a7..149552090 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -118,7 +118,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     public String name = "Unknown";
 
     public String summary = "Unknown application";
-    public String icon;
+    public String iconFromApk;
 
     public String description;
 
@@ -217,7 +217,8 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     public String[] requirements;
 
     /**
-     * URL to download the app's icon.
+     * URL to download the app's icon. (Set only from localized block, see also
+     * {@link #iconFromApk} and {@link #getIconUrl(Context)}
      */
     private String iconUrl;
 
@@ -260,7 +261,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
                     summary = cursor.getString(i);
                     break;
                 case Cols.ICON:
-                    icon = cursor.getString(i);
+                    iconFromApk = cursor.getString(i);
                     break;
                 case Cols.DESCRIPTION:
                     description = cursor.getString(i);
@@ -665,7 +666,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     public String getIconUrl(Context context) {
         Repo repo = RepoProvider.Helper.findById(context, repoId);
         if (TextUtils.isEmpty(iconUrl)) {
-            if (TextUtils.isEmpty(icon)){
+            if (TextUtils.isEmpty(iconFromApk)){
                 return null;
             }
             String iconsDir;
@@ -674,7 +675,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
             } else {
                 iconsDir = Utils.FALLBACK_ICONS_DIR;
             }
-            return repo.address + iconsDir + icon;
+            return repo.address + iconsDir + iconFromApk;
         }
         return repo.address + "/" + packageName + "/" + iconUrl;
     }
@@ -779,7 +780,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
                 + ", last updated on " + this.lastUpdated + ")</p>";
 
         this.name = (String) appInfo.loadLabel(pm);
-        this.icon = getIconName(packageName, packageInfo.versionCode);
+        this.iconFromApk = getIconName(packageName, packageInfo.versionCode);
         this.installedVersionName = packageInfo.versionName;
         this.installedVersionCode = packageInfo.versionCode;
         this.compatible = true;
@@ -966,7 +967,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
         values.put(Cols.NAME, name);
         values.put(Cols.REPO_ID, repoId);
         values.put(Cols.SUMMARY, summary);
-        values.put(Cols.ICON, icon);
+        values.put(Cols.ICON, iconFromApk);
         values.put(Cols.ICON_URL, iconUrl);
         values.put(Cols.DESCRIPTION, description);
         values.put(Cols.WHATSNEW, whatsNew);
@@ -1196,7 +1197,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
         dest.writeString(this.name);
         dest.writeLong(this.repoId);
         dest.writeString(this.summary);
-        dest.writeString(this.icon);
+        dest.writeString(this.iconFromApk);
         dest.writeString(this.description);
         dest.writeString(this.whatsNew);
         dest.writeString(this.license);
@@ -1247,7 +1248,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
         this.name = in.readString();
         this.repoId = in.readLong();
         this.summary = in.readString();
-        this.icon = in.readString();
+        this.iconFromApk = in.readString();
         this.description = in.readString();
         this.whatsNew = in.readString();
         this.license = in.readString();
diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
index 6e5e55160..1110a2412 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
@@ -214,7 +214,7 @@ public class RepoXMLHandler extends DefaultHandler {
                     curapp.name = str;
                     break;
                 case "icon":
-                    curapp.icon = str;
+                    curapp.iconFromApk = str;
                     break;
                 case "description":
                     // This is the old-style description. We'll read it