From cd635459ad7df4bd7456a4a5c770de96f9e1dcd3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 10 Jan 2020 16:54:09 +0100 Subject: [PATCH] rename Cols.SuggestedApk to AutoInstallApk #1063 --- .../main/java/org/fdroid/fdroid/data/App.java | 2 +- .../org/fdroid/fdroid/data/AppProvider.java | 33 +++++++++++-------- .../java/org/fdroid/fdroid/data/Schema.java | 6 ++-- 3 files changed, 23 insertions(+), 18 deletions(-) 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 a0975bfa7..010966fbe 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -303,7 +303,7 @@ public class App extends ValueObject implements Comparable, Parcelable { case Cols.LIBERAPAY_ID: liberapayID = cursor.getString(i); break; - case Cols.SuggestedApk.VERSION_NAME: + case Cols.AutoInstallApk.VERSION_NAME: suggestedVersionName = cursor.getString(i); break; case Cols.PREFERRED_SIGNER: 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 dc3f5190b..40765ec7f 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java @@ -32,17 +32,17 @@ import java.util.Set; /** * Each app has a bunch of metadata that it associates with a package name (such as org.fdroid.fdroid). * Multiple repositories can host the same package, and provide different metadata for that app. - * + *

* As such, it is usually the case that you are interested in an {@link App} which has its metadata * provided by "the repo with the best priority", rather than "specific repo X". This is important * when asking for an apk, whereby the preferable way is likely using: - * - * * {@link AppProvider.Helper#findHighestPriorityMetadata(ContentResolver, String)} - * + *

+ * * {@link AppProvider.Helper#findHighestPriorityMetadata(ContentResolver, String)} + *

* rather than: - * - * * {@link AppProvider.Helper#findSpecificApp(ContentResolver, String, long, String[])} - * + *

+ * * {@link AppProvider.Helper#findSpecificApp(ContentResolver, String, long, String[])} + *

* The same can be said of retrieving a list of {@link App} objects, where the metadata for each app * in the result set should be populated from the repository with the best priority. */ @@ -53,7 +53,8 @@ public class AppProvider extends FDroidProvider { public static final class Helper { - private Helper() { } + private Helper() { + } public static List all(ContentResolver resolver) { return all(resolver, Cols.ALL); @@ -192,6 +193,7 @@ public class AppProvider extends FDroidProvider { * Tells the query selection that it will need to join onto the installed apps table * when used. This should be called when your query makes use of fields from that table * (for example, list all installed, or list those which can be updated). + * * @return A reference to this object, to allow method chaining, for example * return new AppQuerySelection(selection).requiresInstalledTable()) */ @@ -361,8 +363,8 @@ public class AppProvider extends FDroidProvider { case Cols.Package.PACKAGE_NAME: appendField(PackageTable.Cols.PACKAGE_NAME, PackageTable.NAME, Cols.Package.PACKAGE_NAME); break; - case Cols.SuggestedApk.VERSION_NAME: - addSuggestedApkVersionField(); + case Cols.AutoInstallApk.VERSION_NAME: + addAutoInstallApkVersionField(); break; case Cols.InstalledApp.VERSION_NAME: addInstalledAppVersionName(); @@ -387,13 +389,16 @@ public class AppProvider extends FDroidProvider { appendField("COUNT( DISTINCT " + getTableName() + "." + Cols.ROW_ID + " ) AS " + Cols._COUNT); } - private void addSuggestedApkVersionField() { - addSuggestedApkField( + private void addAutoInstallApkVersionField() { + addAutoInstallApkField( ApkTable.Cols.VERSION_NAME, - Cols.SuggestedApk.VERSION_NAME); + Cols.AutoInstallApk.VERSION_NAME); } - private void addSuggestedApkField(String fieldName, String alias) { + /** + * @see suggestedApk name mismatch #1063 + */ + private void addAutoInstallApkField(String fieldName, String alias) { if (!isSuggestedApkTableAdded) { isSuggestedApkTableAdded = true; leftJoin( diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java index 875f3bb50..b96099937 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java @@ -210,7 +210,7 @@ public interface Schema { String IS_APK = "isApk"; String IS_LOCALIZED = "isLocalized"; - interface SuggestedApk { + interface AutoInstallApk { String VERSION_NAME = "suggestedApkVersion"; } @@ -238,7 +238,7 @@ public interface Schema { /** * Each of the physical columns in the sqlite table. Differs from {@link Cols#ALL} in * that it doesn't include fields which are aliases of other fields (e.g. {@link Cols#_ID} - * or which are from other related tables (e.g. {@link Cols.SuggestedApk#VERSION_NAME}). + * or which are from other related tables (e.g. {@link AutoInstallApk#VERSION_NAME}). */ String[] ALL_COLS = { ROW_ID, PACKAGE_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION, @@ -265,7 +265,7 @@ public interface Schema { ANTI_FEATURES, REQUIREMENTS, ICON_URL, FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS, SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS, - PREFERRED_SIGNER, AUTO_INSTALL_VERSION_CODE, IS_APK, IS_LOCALIZED, SuggestedApk.VERSION_NAME, + PREFERRED_SIGNER, AUTO_INSTALL_VERSION_CODE, IS_APK, IS_LOCALIZED, AutoInstallApk.VERSION_NAME, InstalledApp.VERSION_CODE, InstalledApp.VERSION_NAME, InstalledApp.SIGNATURE, Package.PACKAGE_NAME, };