From 43e5ab7eb2af3af026b161b1c3da224c2a051abc Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Thu, 19 Jul 2018 17:22:49 +0200
Subject: [PATCH 1/4] fix typoes in comments

---
 app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java   | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/AppProvider.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java
index 1ada06ab3..0a110be84 100644
--- a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java
+++ b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java
@@ -363,7 +363,7 @@ public class IndexV1Updater extends IndexUpdater {
             contentValues.put(Schema.RepoTable.Cols.MIRRORS, Utils.serializeCommaSeparatedString(repo.mirrors));
         }
         repoPersister.commit(contentValues, repo.getId());
-        profiler.log("Persited to database.");
+        profiler.log("Persisted to database.");
 
         if (repo.pushRequests == Repo.PUSH_REQUEST_ACCEPT_ALWAYS) {
             processRepoPushRequests(requests);
diff --git a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
index 620096aad..c8c41fc50 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
@@ -81,7 +81,7 @@ public class ApkProvider extends FDroidProvider {
         }
 
         /**
-         * Find an app which is closest to the version code suggested by the server, with some caveates:
+         * Find an app which is closest to the version code suggested by the server, with some caveats:
          * <ul>
          * <li>If installed, limit to apks signed by the same signer as the installed apk.</li>
          * <li>Otherwise, limit to apks signed by the "preferred" signer (see {@link App#preferredSigner}).</li>
diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 04f8c890f..588c3f698 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -145,7 +145,7 @@ public class AppProvider extends FDroidProvider {
 
     /**
      * A QuerySelection which is aware of the option/need to join onto the
-     * installed apps table. Not that the base classes
+     * installed apps table. Note that the base classes
      * {@link org.fdroid.fdroid.data.QuerySelection#add(QuerySelection)} and
      * {@link org.fdroid.fdroid.data.QuerySelection#add(String, String[])} methods
      * will only return the base class {@link org.fdroid.fdroid.data.QuerySelection}
@@ -1206,7 +1206,7 @@ public class AppProvider extends FDroidProvider {
     }
 
     /**
-     * Returns a query which requires two parameters to be bdeatound. These are (in order):
+     * Returns a query which requires two parameters to be bound. These are (in order):
      *  1) The repo version that introduced density specific icons
      *  2) The dir to density specific icons for the current device.
      */

From 4595517aba7c0cf5e3e74c0fe9e86841134b2bd7 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Thu, 19 Jul 2018 17:23:11 +0200
Subject: [PATCH 2/4] AppProvider: fix IconUpdateQuery

The query was trying to figure out some thing about suggestedVercode
which shouldn't at all be necessary for setting the iconUrl.
The index already contains the icon pointing to the suggested version by
that repository, so we just take that regardless.
---
 app/src/main/java/org/fdroid/fdroid/data/AppProvider.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 588c3f698..1bae7e858 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -1233,12 +1233,7 @@ public class AppProvider extends FDroidProvider {
                     app + "." + Cols.ICON +
                 ") " +
                 " FROM " +
-                apk +
-                " JOIN " + repo + " ON (" + repo + "." + RepoTable.Cols._ID + " = " + apk + "." + ApkTable.Cols.REPO_ID + ") " +
-                " WHERE " +
-                app + "." + Cols.ROW_ID + " = " + apk + "." + ApkTable.Cols.APP_ID + " AND " +
-                apk + "." + ApkTable.Cols.VERSION_CODE + " = " + app + "." + Cols.SUGGESTED_VERSION_CODE;
-
+                repo + " WHERE " + repo + "." + RepoTable.Cols._ID + " = " + app + "." + Cols.REPO_ID;
         return "UPDATE " + app + " SET "
             + Cols.ICON_URL + " = ( " + iconUrlQuery + " )";
     }

From d82023b9436abc0a04de0267eb04528efc8e3312 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Sat, 22 Dec 2018 17:30:31 +1100
Subject: [PATCH 3/4] Add test for loading app icons from correct repository

---
 .../fdroid/fdroid/updater/AppIconsTest.java   | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java

diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
new file mode 100644
index 000000000..e659549a6
--- /dev/null
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
@@ -0,0 +1,74 @@
+package org.fdroid.fdroid.updater;
+
+import android.content.ContentValues;
+import org.fdroid.fdroid.BuildConfig;
+import org.fdroid.fdroid.IndexUpdater;
+import org.fdroid.fdroid.data.App;
+import org.fdroid.fdroid.data.AppProvider;
+import org.fdroid.fdroid.data.Repo;
+import org.fdroid.fdroid.data.RepoProvider;
+import org.fdroid.fdroid.data.Schema;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Check whether app icons are loaded from the correct repository. The repository with the
+ * highest priority should be where we decide to load icons from.
+ */
+@Config(constants = BuildConfig.class)
+@RunWith(RobolectricTestRunner.class)
+@SuppressWarnings("LineLength")
+public class AppIconsTest extends MultiIndexUpdaterTest {
+
+    private static final int HIGH_PRIORITY = 2;
+    private static final int LOW_PRIORITY = 1;
+
+    @Before
+    public void setupMainAndArchiveRepo() {
+        createRepo(REPO_MAIN, REPO_MAIN_URI, context);
+        createRepo(REPO_ARCHIVE, REPO_ARCHIVE_URI, context);
+    }
+
+    @Test
+    public void mainRepo() throws IndexUpdater.UpdateException {
+        setRepoPriority(REPO_MAIN_URI, HIGH_PRIORITY);
+        setRepoPriority(REPO_ARCHIVE_URI, LOW_PRIORITY);
+
+        updateMain();
+        updateArchive();
+
+        assertIconUrl("https://f-droid.org/repo/icons/org.adaway.54.png");
+    }
+
+    @Test
+    public void archiveRepo() throws IndexUpdater.UpdateException {
+        setRepoPriority(REPO_MAIN_URI, LOW_PRIORITY);
+        setRepoPriority(REPO_ARCHIVE_URI, HIGH_PRIORITY);
+
+        updateMain();
+        updateArchive();
+
+        assertIconUrl("https://f-droid.org/archive/icons/org.adaway.54.png");
+    }
+
+    private void setRepoPriority(String repoUri, int priority) {
+        ContentValues values = new ContentValues(1);
+        values.put(Schema.RepoTable.Cols.PRIORITY, priority);
+
+        Repo repo = RepoProvider.Helper.findByAddress(context, repoUri);
+        RepoProvider.Helper.update(context, repo, values);
+    }
+
+    private void assertIconUrl(String expectedUrl) {
+        App app = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(),
+                "org.adaway", new String[] {Schema.AppMetadataTable.Cols.ICON_URL});
+
+        assertEquals(app.iconUrl, expectedUrl);
+    }
+
+}

From da9eba94ebeb15f0dbc21e1f628a99277360e61a Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Sat, 22 Dec 2018 19:39:03 +1100
Subject: [PATCH 4/4] Remove unused parameter from app provider, after updating
 icon query

---
 app/src/main/java/org/fdroid/fdroid/data/AppProvider.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 1bae7e858..727aa9d81 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -1193,12 +1193,11 @@ public class AppProvider extends FDroidProvider {
 
     private void updateIconUrls() {
         final String appTable = getTableName();
-        final String apkTable = getApkTableName();
         final String iconsDir = Utils.getIconsDir(getContext(), 1.0);
         String repoVersion = Integer.toString(Repo.VERSION_DENSITY_SPECIFIC_ICONS);
         Utils.debugLog(TAG, "Updating icon paths for apps belonging to repos with version >= " + repoVersion);
         Utils.debugLog(TAG, "Using icons dir '" + iconsDir + "'");
-        String query = getIconUpdateQuery(appTable, apkTable);
+        String query = getIconUpdateQuery(appTable);
         final String[] params = {
             repoVersion, iconsDir, Utils.FALLBACK_ICONS_DIR,
         };
@@ -1210,7 +1209,7 @@ public class AppProvider extends FDroidProvider {
      *  1) The repo version that introduced density specific icons
      *  2) The dir to density specific icons for the current device.
      */
-    private static String getIconUpdateQuery(String app, String apk) {
+    private static String getIconUpdateQuery(String app) {
 
         final String repo = RepoTable.NAME;