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

Rename App's upstream vars to VersionCode/Name

Browse Source 
Updates #37.
This commit is contained in:
Daniel Martí 2016-04-19 12:05:29 +01:00
parent cde57efb98
commit 550f04cc8b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java
View File

@ -204,10 +204,10 @@ public class RepoXMLHandler extends DefaultHandler {
curapp.lastUpdated = Utils.parseDate(str, null); curapp.lastUpdated = Utils.parseDate(str, null);
break; break;
case "marketversion": case "marketversion":
curapp.upstreamVersion = str; curapp.upstreamVersionName = str;
break; break;
case "marketvercode": case "marketvercode":
curapp.upstreamVercode = Utils.parseInt(str, -1); curapp.upstreamVersionCode = Utils.parseInt(str, -1);
break; break;
case "categories": case "categories":
curapp.categories = Utils.CommaSeparatedList.make(str); curapp.categories = Utils.CommaSeparatedList.make(str);

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

@ -59,8 +59,8 @@ public class App extends ValueObject implements Comparable<App> {
public String flattrID; public String flattrID;
public String upstreamVersion; public String upstreamVersionName;
public int upstreamVercode; public int upstreamVersionCode;
/** /**
* Unlike other public fields, this is only accessible via a getter, to * Unlike other public fields, this is only accessible via a getter, to
@ -180,10 +180,10 @@ public class App extends ValueObject implements Comparable<App> {
suggestedVersionCode = cursor.getInt(i); suggestedVersionCode = cursor.getInt(i);
break; break;
case AppProvider.DataColumns.UPSTREAM_VERSION_CODE: case AppProvider.DataColumns.UPSTREAM_VERSION_CODE:
upstreamVercode = cursor.getInt(i); upstreamVersionCode = cursor.getInt(i);
break; break;
case AppProvider.DataColumns.UPSTREAM_VERSION: case AppProvider.DataColumns.UPSTREAM_VERSION_NAME:
upstreamVersion = cursor.getString(i); upstreamVersionName = cursor.getString(i);
break; break;
case AppProvider.DataColumns.ADDED: case AppProvider.DataColumns.ADDED:
added = Utils.parseDate(cursor.getString(i), null); added = Utils.parseDate(cursor.getString(i), null);
@ -404,8 +404,8 @@ public class App extends ValueObject implements Comparable<App> {
values.put(AppProvider.DataColumns.ADDED, Utils.formatDate(added, "")); values.put(AppProvider.DataColumns.ADDED, Utils.formatDate(added, ""));
values.put(AppProvider.DataColumns.LAST_UPDATED, Utils.formatDate(lastUpdated, "")); values.put(AppProvider.DataColumns.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));
values.put(AppProvider.DataColumns.SUGGESTED_VERSION_CODE, suggestedVersionCode); values.put(AppProvider.DataColumns.SUGGESTED_VERSION_CODE, suggestedVersionCode);
values.put(AppProvider.DataColumns.UPSTREAM_VERSION, upstreamVersion); values.put(AppProvider.DataColumns.UPSTREAM_VERSION_NAME, upstreamVersionName);
values.put(AppProvider.DataColumns.UPSTREAM_VERSION_CODE, upstreamVercode); values.put(AppProvider.DataColumns.UPSTREAM_VERSION_CODE, upstreamVersionCode);
values.put(AppProvider.DataColumns.CATEGORIES, Utils.CommaSeparatedList.str(categories)); values.put(AppProvider.DataColumns.CATEGORIES, Utils.CommaSeparatedList.str(categories));
values.put(AppProvider.DataColumns.ANTI_FEATURES, Utils.CommaSeparatedList.str(antiFeatures)); values.put(AppProvider.DataColumns.ANTI_FEATURES, Utils.CommaSeparatedList.str(antiFeatures));
values.put(AppProvider.DataColumns.REQUIREMENTS, Utils.CommaSeparatedList.str(requirements)); values.put(AppProvider.DataColumns.REQUIREMENTS, Utils.CommaSeparatedList.str(requirements));

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

@ -191,7 +191,7 @@ public class AppProvider extends FDroidProvider {
String LITECOIN_ADDR = "litecoinAddr"; String LITECOIN_ADDR = "litecoinAddr";
String FLATTR_ID = "flattrID"; String FLATTR_ID = "flattrID";
String SUGGESTED_VERSION_CODE = "suggestedVercode"; String SUGGESTED_VERSION_CODE = "suggestedVercode";
String UPSTREAM_VERSION = "upstreamVersion"; String UPSTREAM_VERSION_NAME = "upstreamVersion";
String UPSTREAM_VERSION_CODE = "upstreamVercode"; String UPSTREAM_VERSION_CODE = "upstreamVercode";
String ADDED = "added"; String ADDED = "added";
String LAST_UPDATED = "lastUpdated"; String LAST_UPDATED = "lastUpdated";
@ -217,7 +217,7 @@ public class AppProvider extends FDroidProvider {
_ID, IS_COMPATIBLE, PACKAGE_NAME, NAME, SUMMARY, ICON, DESCRIPTION, _ID, IS_COMPATIBLE, PACKAGE_NAME, NAME, SUMMARY, ICON, DESCRIPTION,
LICENSE, AUTHOR, EMAIL, WEB_URL, TRACKER_URL, SOURCE_URL, LICENSE, AUTHOR, EMAIL, WEB_URL, TRACKER_URL, SOURCE_URL,
CHANGELOG_URL, DONATE_URL, BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID, CHANGELOG_URL, DONATE_URL, BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID,
UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED, UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES, CATEGORIES, ANTI_FEATURES, REQUIREMENTS, IGNORE_ALLUPDATES,
IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE, IGNORE_THISUPDATE, ICON_URL, ICON_URL_LARGE,
SUGGESTED_VERSION_CODE, SuggestedApk.VERSION, SUGGESTED_VERSION_CODE, SuggestedApk.VERSION,