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

rename App.upstreamVersionName to suggestedVersionName #1063

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2020-01-10 16:59:21 +01:00
parent 531494e571
commit 10808e2fea
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,12 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
public String liberapayID;
public String upstreamVersionName;
/**
* This matches {@code CurrentVersion} in build metadata files.
*
* @see <a href="https://f-droid.org/docs/Build_Metadata_Reference/#CurrentVersion">CurrentVersion</a>
*/
public String suggestedVersionName;
/**
* The index-v1 metadata uses the term `suggestedVersionCode` but we need that
@ -315,8 +320,8 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
case Cols.UPSTREAM_VERSION_CODE:
upstreamVersionCode = cursor.getInt(i);
break;
case Cols.UPSTREAM_VERSION_NAME:
upstreamVersionName = cursor.getString(i);
case Cols.SUGGESTED_VERSION_NAME:
suggestedVersionName = cursor.getString(i);
break;
case Cols.ADDED:
added = Utils.parseDate(cursor.getString(i), null);
@ -960,7 +965,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
values.put(Cols.LAST_UPDATED, Utils.formatDate(lastUpdated, ""));
values.put(Cols.PREFERRED_SIGNER, preferredSigner);
values.put(Cols.AUTO_INSTALL_VERSION_CODE, autoInstallVersionCode);
values.put(Cols.UPSTREAM_VERSION_NAME, upstreamVersionName);
values.put(Cols.SUGGESTED_VERSION_NAME, suggestedVersionName);
values.put(Cols.UPSTREAM_VERSION_CODE, upstreamVersionCode);
values.put(Cols.ForWriting.Categories.CATEGORIES, Utils.serializeCommaSeparatedString(categories));
values.put(Cols.ANTI_FEATURES, Utils.serializeCommaSeparatedString(antiFeatures));
@ -1186,7 +1191,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
dest.writeString(this.flattrID);
dest.writeString(this.liberapayID);
dest.writeString(this.preferredSigner);
dest.writeString(this.upstreamVersionName);
dest.writeString(this.suggestedVersionName);
dest.writeInt(this.upstreamVersionCode);
dest.writeString(this.autoInstallVersionName);
dest.writeInt(this.autoInstallVersionCode);
@ -1237,7 +1242,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
this.flattrID = in.readString();
this.liberapayID = in.readString();
this.preferredSigner = in.readString();
this.upstreamVersionName = in.readString();
this.suggestedVersionName = in.readString();
this.upstreamVersionCode = in.readInt();
this.autoInstallVersionName = in.readString();
this.autoInstallVersionCode = in.readInt();

2
app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
View File

@ -148,7 +148,7 @@ public class DBHelper extends SQLiteOpenHelper {
+ AppMetadataTable.Cols.CHANGELOG + " text, "
+ AppMetadataTable.Cols.PREFERRED_SIGNER + " text,"
+ AppMetadataTable.Cols.AUTO_INSTALL_VERSION_CODE + " text,"
+ AppMetadataTable.Cols.UPSTREAM_VERSION_NAME + " text,"
+ AppMetadataTable.Cols.SUGGESTED_VERSION_NAME + " text,"
+ AppMetadataTable.Cols.UPSTREAM_VERSION_CODE + " integer,"
+ AppMetadataTable.Cols.ANTI_FEATURES + " string,"
+ AppMetadataTable.Cols.DONATE + " string,"

2
app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
View File

@ -275,7 +275,7 @@ public class InstalledAppProvider extends FDroidProvider {
query.addField(Cols._ID);
query.appendField(Cols.APPLICATION_LABEL, null, Schema.AppMetadataTable.Cols.NAME);
query.appendField(Cols.VERSION_CODE, null, AppMetadataTable.Cols.UPSTREAM_VERSION_CODE);
query.appendField(Cols.VERSION_NAME, null, AppMetadataTable.Cols.UPSTREAM_VERSION_NAME);
query.appendField(Cols.VERSION_NAME, null, AppMetadataTable.Cols.SUGGESTED_VERSION_NAME);
query.appendField(PackageTable.Cols.PACKAGE_NAME, PackageTable.NAME,
AppMetadataTable.Cols.Package.PACKAGE_NAME);
break;

2
app/src/main/java/org/fdroid/fdroid/data/RepoXMLHandler.java
View File

@ -269,7 +269,7 @@ public class RepoXMLHandler extends DefaultHandler {
curapp.lastUpdated = Utils.parseDate(str, null);
break;
case "marketversion":
curapp.upstreamVersionName = str;
curapp.suggestedVersionName = str;
break;
case "marketvercode":
curapp.upstreamVersionCode = Utils.parseInt(str, -1);

6
app/src/main/java/org/fdroid/fdroid/data/Schema.java
View File

@ -192,7 +192,7 @@ public interface Schema {
String LIBERAPAY_ID = "liberapayID";
String PREFERRED_SIGNER = "preferredSigner";
String AUTO_INSTALL_VERSION_CODE = "suggestedVercode"; // name mismatch from issue #1063
String UPSTREAM_VERSION_NAME = "upstreamVersion";
String SUGGESTED_VERSION_NAME = "upstreamVersion"; // name mismatch from issue #1063
String UPSTREAM_VERSION_CODE = "upstreamVercode";
String ADDED = "added";
String LAST_UPDATED = "lastUpdated";
@ -244,7 +244,7 @@ public interface Schema {
ROW_ID, PACKAGE_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION,
WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE,
TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID,
UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
SUGGESTED_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
ANTI_FEATURES, REQUIREMENTS, ICON_URL,
FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS,
SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS,
@ -261,7 +261,7 @@ public interface Schema {
_ID, ROW_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION,
WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE,
TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID,
UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
SUGGESTED_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
ANTI_FEATURES, REQUIREMENTS, ICON_URL,
FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS,
SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS,

6
app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
View File

@ -94,13 +94,13 @@ public class InstalledAppProviderTest extends FDroidProviderTest {
apps = InstalledAppProvider.Helper.all(context);
assertEquals(3, apps.length);
assertEquals(packageName0, apps[0].packageName);
assertEquals("v0", apps[0].upstreamVersionName);
assertEquals("v0", apps[0].suggestedVersionName);
assertEquals(0, apps[0].upstreamVersionCode);
assertEquals(packageName1, apps[1].packageName);
assertEquals("v1", apps[1].upstreamVersionName);
assertEquals("v1", apps[1].suggestedVersionName);
assertEquals(1, apps[1].upstreamVersionCode);
assertEquals(packageName2, apps[2].packageName);
assertEquals("v2", apps[2].upstreamVersionName);
assertEquals("v2", apps[2].suggestedVersionName);
assertEquals(2, apps[2].upstreamVersionCode);
assertNotEquals(packageName0, apps[2].packageName);
}