From 531494e57186663141735c3d77d03f0910c00480 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 10 Jan 2020 17:41:29 +0100 Subject: [PATCH] rename App.suggestedVersionName to autoInstallVersionName #1063 # Conflicts: # app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java --- .../main/java/org/fdroid/fdroid/data/App.java | 18 +++++++++--------- .../apps/StandardAppListItemController.java | 2 +- .../InstalledAppListItemController.java | 2 +- .../fdroid/updater/IndexV1UpdaterTest.java | 2 +- 4 files changed, 12 insertions(+), 12 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 010966fbe..10e9ba526 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -177,10 +177,10 @@ public class App extends ValueObject implements Comparable, Parcelable { /** * Unlike other public fields, this is only accessible via a getter, to * emphasise that setting it wont do anything. In order to change this, - * you need to change suggestedVersionCode to an apk which is in the - * apk table. + * you need to change {@link #autoInstallVersionCode} to an APK which is + * in the {@link Schema.ApkTable} table. */ - private String suggestedVersionName; + private String autoInstallVersionName; /** * The version that will be automatically installed if the user does not @@ -304,7 +304,7 @@ public class App extends ValueObject implements Comparable, Parcelable { liberapayID = cursor.getString(i); break; case Cols.AutoInstallApk.VERSION_NAME: - suggestedVersionName = cursor.getString(i); + autoInstallVersionName = cursor.getString(i); break; case Cols.PREFERRED_SIGNER: preferredSigner = cursor.getString(i); @@ -1081,11 +1081,11 @@ public class App extends ValueObject implements Comparable, Parcelable { /** - * @see App#suggestedVersionName for why this uses a getter while other member variables are + * @see App#autoInstallVersionName for why this uses a getter while other member variables are * publicly accessible. */ - public String getSuggestedVersionName() { - return suggestedVersionName; + public String getAutoInstallVersionName() { + return autoInstallVersionName; } /** @@ -1188,7 +1188,7 @@ public class App extends ValueObject implements Comparable, Parcelable { dest.writeString(this.preferredSigner); dest.writeString(this.upstreamVersionName); dest.writeInt(this.upstreamVersionCode); - dest.writeString(this.suggestedVersionName); + dest.writeString(this.autoInstallVersionName); dest.writeInt(this.autoInstallVersionCode); dest.writeLong(this.added != null ? this.added.getTime() : -1); dest.writeLong(this.lastUpdated != null ? this.lastUpdated.getTime() : -1); @@ -1239,7 +1239,7 @@ public class App extends ValueObject implements Comparable, Parcelable { this.preferredSigner = in.readString(); this.upstreamVersionName = in.readString(); this.upstreamVersionCode = in.readInt(); - this.suggestedVersionName = in.readString(); + this.autoInstallVersionName = in.readString(); this.autoInstallVersionCode = in.readInt(); long tmpAdded = in.readLong(); this.added = tmpAdded == -1 ? null : new Date(tmpAdded); diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java index a35d64b32..63f724345 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java @@ -40,7 +40,7 @@ public class StandardAppListItemController extends AppListItemController { return activity.getString(R.string.antifeatures); } else if (app.isInstalled(activity.getApplicationContext())) { if (app.canAndWantToUpdate(activity)) { - return activity.getString(R.string.app_version_x_available, app.getSuggestedVersionName()); + return activity.getString(R.string.app_version_x_available, app.getAutoInstallVersionName()); } else { return activity.getString(R.string.app_version_x_installed, app.installedVersionName); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java index a77dc1aa0..bbed32d1d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java @@ -54,7 +54,7 @@ public class InstalledAppListItemController extends AppListItemController { } else if (prefs.ignoreThisUpdate > 0 && prefs.ignoreThisUpdate == app.autoInstallVersionCode) { return activity.getString( R.string.installed_app__updates_ignored_for_suggested_version, - app.getSuggestedVersionName()); + app.getAutoInstallVersionName()); } return null; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java index b789ba749..c1205cc1e 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java @@ -304,6 +304,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest { "authorEmail", "authorName", "autoInstallVersionCode", + "autoInstallVersionName", "bitcoin", "categories", "changelog", @@ -333,7 +334,6 @@ public class IndexV1UpdaterTest extends FDroidProviderTest { "translation", "tvBanner", "tvScreenshots", - "upstreamVersionCode", "video", "wearScreenshots", "webSite",