From 0ec9689a6ca461f8d5f4d587080d5a7e23e39f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 19 Apr 2016 12:09:02 +0100 Subject: [PATCH] Rename App's suggestedVersion to suggestedVersionName --- app/src/main/java/org/fdroid/fdroid/UpdateService.java | 2 +- app/src/main/java/org/fdroid/fdroid/data/App.java | 10 +++++----- .../main/java/org/fdroid/fdroid/data/AppProvider.java | 8 ++++---- .../java/org/fdroid/fdroid/views/AppListAdapter.java | 4 ++-- .../fdroid/fdroid/views/fragments/AppListFragment.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index 3c2605b7b..a9a631a4a 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -471,7 +471,7 @@ public class UpdateService extends IntentService implements ProgressListener { for (int i = 0; i < Math.min(hasUpdates.getCount(), MAX_UPDATES_TO_SHOW); i++) { App app = new App(hasUpdates); hasUpdates.moveToNext(); - inboxStyle.addLine(app.name + " (" + app.installedVersionName + " → " + app.getSuggestedVersion() + ")"); + inboxStyle.addLine(app.name + " (" + app.installedVersionName + " → " + app.getSuggestedVersionName() + ")"); } if (hasUpdates.getCount() > MAX_UPDATES_TO_SHOW) { 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 7490c3ea3..dda0ae0ba 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -68,7 +68,7 @@ public class App extends ValueObject implements Comparable { * you need to change suggestedVersionCode to an apk which is in the * apk table. */ - private String suggestedVersion; + private String suggestedVersionName; public int suggestedVersionCode; @@ -173,8 +173,8 @@ public class App extends ValueObject implements Comparable { case AppProvider.DataColumns.FLATTR_ID: flattrID = cursor.getString(i); break; - case AppProvider.DataColumns.SuggestedApk.VERSION: - suggestedVersion = cursor.getString(i); + case AppProvider.DataColumns.SuggestedApk.VERSION_NAME: + suggestedVersionName = cursor.getString(i); break; case AppProvider.DataColumns.SUGGESTED_VERSION_CODE: suggestedVersionCode = cursor.getInt(i); @@ -445,7 +445,7 @@ public class App extends ValueObject implements Comparable { return new AppFilter().filter(this); } - public String getSuggestedVersion() { - return suggestedVersion; + public String getSuggestedVersionName() { + return suggestedVersionName; } } 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 98d9b7406..4116638bb 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java @@ -204,7 +204,7 @@ public class AppProvider extends FDroidProvider { String ICON_URL_LARGE = "iconUrlLarge"; interface SuggestedApk { - String VERSION = "suggestedApkVersion"; + String VERSION_NAME = "suggestedApkVersion"; } interface InstalledApp { @@ -220,7 +220,7 @@ public class AppProvider extends FDroidProvider { UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED, CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES, IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE, - SUGGESTED_VERSION_CODE, SuggestedApk.VERSION, + SUGGESTED_VERSION_CODE, SuggestedApk.VERSION_NAME, InstalledApp.VERSION_CODE, InstalledApp.VERSION_NAME, InstalledApp.SIGNATURE, }; @@ -348,7 +348,7 @@ public class AppProvider extends FDroidProvider { @Override public void addField(String field) { switch (field) { - case DataColumns.SuggestedApk.VERSION: + case DataColumns.SuggestedApk.VERSION_NAME: addSuggestedApkVersionField(); break; case DataColumns.InstalledApp.VERSION_NAME: @@ -380,7 +380,7 @@ public class AppProvider extends FDroidProvider { private void addSuggestedApkVersionField() { addSuggestedApkField( ApkProvider.DataColumns.VERSION_NAME, - DataColumns.SuggestedApk.VERSION); + DataColumns.SuggestedApk.VERSION_NAME); } private void addSuggestedApkField(String fieldName, String alias) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java index c2c148b56..a1f222dc0 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java @@ -118,14 +118,14 @@ public abstract class AppListAdapter extends CursorAdapter { } if (!app.isInstalled()) { - return app.getSuggestedVersion(); + return app.getSuggestedVersionName(); } final String installedVersionString = app.installedVersionName; if (app.canAndWantToUpdate() && showStatusUpdate()) { return String.format(upgradeFromTo, - installedVersionString, app.getSuggestedVersion()); + installedVersionString, app.getSuggestedVersionName()); } if (app.installedVersionCode > 0 && showStatusInstalled()) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java index 09f5ac069..3a37171a7 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -49,7 +49,7 @@ public abstract class AppListFragment extends ListFragment implements AppProvider.DataColumns.ICON_URL, AppProvider.DataColumns.InstalledApp.VERSION_CODE, AppProvider.DataColumns.InstalledApp.VERSION_NAME, - AppProvider.DataColumns.SuggestedApk.VERSION, + AppProvider.DataColumns.SuggestedApk.VERSION_NAME, AppProvider.DataColumns.SUGGESTED_VERSION_CODE, AppProvider.DataColumns.IGNORE_ALLUPDATES, AppProvider.DataColumns.IGNORE_THISUPDATE,