Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename App's suggestedVersion to suggestedVersionName

Browse Source
This commit is contained in:
Daniel Martí 2016-04-19 12:09:02 +01:00
parent 550f04cc8b
commit 0ec9689a6c
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/UpdateService.java
View File

@ -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) {

10
app/src/main/java/org/fdroid/fdroid/data/App.java
View File

@ -68,7 +68,7 @@ public class App extends ValueObject implements Comparable<App> {
* 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<App> {
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<App> {
return new AppFilter().filter(this);
}
public String getSuggestedVersion() {
return suggestedVersion;
public String getSuggestedVersionName() {
return suggestedVersionName;
}
}

8
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -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) {

4
app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java
View File

@ -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()) {

2
app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java
View File

@ -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,