From 1abbedc4ab509f517ecd6fb8855fa388de057697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 19 Apr 2016 11:49:00 +0100 Subject: [PATCH] Rename Apk.vercode to Apk.versionCode Updates #37. --- .../org/fdroid/fdroid/ApkProviderHelperTest.java | 8 ++++---- .../java/org/fdroid/fdroid/ApkProviderTest.java | 6 +++--- .../java/org/fdroid/fdroid/BaseApkProviderTest.java | 2 +- .../java/org/fdroid/fdroid/MultiRepoUpdaterTest.java | 2 +- .../java/org/fdroid/fdroid/mock/MockApk.java | 2 +- app/src/main/java/org/fdroid/fdroid/AppDetails.java | 10 +++++----- .../java/org/fdroid/fdroid/CompatibilityChecker.java | 4 ++-- .../main/java/org/fdroid/fdroid/RepoXMLHandler.java | 2 +- app/src/main/java/org/fdroid/fdroid/data/Apk.java | 12 ++++++------ .../java/org/fdroid/fdroid/data/ApkProvider.java | 8 ++++---- app/src/main/java/org/fdroid/fdroid/data/App.java | 4 ++-- .../java/org/fdroid/fdroid/data/RepoPersister.java | 4 ++-- .../java/org/fdroid/fdroid/data/TempApkProvider.java | 2 +- .../fdroid/fdroid/localrepo/LocalRepoManager.java | 6 +++--- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java index 7e7b27d77..2ab571652 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java @@ -121,7 +121,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { cursor.close(); assertEquals("com.example", apk.packageName); - assertEquals(10, apk.vercode); + assertEquals(10, apk.versionCode); assertNull(apk.features); assertNull(apk.added); @@ -147,7 +147,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { updatedCursor.close(); assertEquals("com.example", updatedApk.packageName); - assertEquals(10, updatedApk.vercode); + assertEquals(10, updatedApk.versionCode); assertNotNull(updatedApk.features); assertNotNull(updatedApk.added); @@ -187,7 +187,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { // The find() method populates ALL fields if you don't specify any, // so we expect to find each of the ones we inserted above... assertEquals("com.example", apk.packageName); - assertEquals(11, apk.vercode); + assertEquals(11, apk.versionCode); assertEquals("v1.1", apk.version); assertEquals("xxxxyyyy", apk.hash); assertEquals("a hash type", apk.hashType); @@ -207,7 +207,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { // Didn't ask for these fields, so should be their default values... assertNull(apkLessFields.hashType); assertNull(apkLessFields.version); - assertEquals(0, apkLessFields.vercode); + assertEquals(0, apkLessFields.versionCode); Apk notFound = ApkProvider.Helper.find(getMockContext(), "com.doesnt.exist", 1000); assertNull(notFound); diff --git a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java index 922b69639..a8f2bd51b 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java @@ -233,7 +233,7 @@ public class ApkProviderTest extends BaseApkProviderTest { Apk apk = new MockApk("org.fdroid.fdroid", 13); // Insert a new record... - Uri newUri = TestUtils.insertApk(this, apk.packageName, apk.vercode); + Uri newUri = TestUtils.insertApk(this, apk.packageName, apk.versionCode); assertEquals(ApkProvider.getContentUri(apk).toString(), newUri.toString()); cursor = queryAllApks(); assertNotNull(cursor); @@ -257,7 +257,7 @@ public class ApkProviderTest extends BaseApkProviderTest { Apk toCheck = new Apk(cursor); cursor.close(); assertEquals("org.fdroid.fdroid", toCheck.packageName); - assertEquals(13, toCheck.vercode); + assertEquals(13, toCheck.versionCode); } public void testCount() { @@ -330,7 +330,7 @@ public class ApkProviderTest extends BaseApkProviderTest { // But this should have saved correctly... assertEquals("Some features", apk.features.toString()); assertEquals("com.example.com", apk.packageName); - assertEquals(1, apk.vercode); + assertEquals(1, apk.versionCode); assertEquals(10, apk.repo); } diff --git a/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java index 0015584f1..acaf3e12d 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java @@ -40,7 +40,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest { protected void assertContains(List apks, Apk apk) { boolean found = false; for (Apk a : apks) { - if (a.vercode == apk.vercode && a.packageName.equals(apk.packageName)) { + if (a.versionCode == apk.versionCode && a.packageName.equals(apk.packageName)) { found = true; break; } diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java index 04978533e..6f498d3f6 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java @@ -289,7 +289,7 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase { for (int versionCode : versionCodes) { boolean found = false; for (Apk apk : apksToCheck) { - if (apk.vercode == versionCode && apk.packageName.equals(appId)) { + if (apk.versionCode == versionCode && apk.packageName.equals(appId)) { found = true; break; } diff --git a/app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java b/app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java index 4790301ac..be7dff5a5 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java @@ -6,7 +6,7 @@ public class MockApk extends Apk { public MockApk(String id, int versionCode) { this.packageName = id; - this.vercode = versionCode; + this.versionCode = versionCode; } } diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java index a9e57447b..fad18ed43 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java @@ -160,7 +160,7 @@ public class AppDetails extends AppCompatActivity { private String getInstalledStatus(final Apk apk) { // Definitely not installed. - if (apk.vercode != app.installedVersionCode) { + if (apk.versionCode != app.installedVersionCode) { return getString(R.string.app_not_installed); } // Definitely installed this version. @@ -211,7 +211,7 @@ public class AppDetails extends AppCompatActivity { holder.version.setText(getString(R.string.version) + " " + apk.version - + (apk.vercode == app.suggestedVercode ? " ☆" : "")); + + (apk.versionCode == app.suggestedVercode ? " ☆" : "")); holder.status.setText(getInstalledStatus(apk)); @@ -1246,7 +1246,7 @@ public class AppDetails extends AppCompatActivity { Apk curApk = null; for (int i = 0; i < appDetails.getApks().getCount(); i++) { final Apk apk = appDetails.getApks().getItem(i); - if (apk.vercode == app.suggestedVercode) { + if (apk.versionCode == app.suggestedVercode) { curApk = apk; break; } @@ -1619,9 +1619,9 @@ public class AppDetails extends AppCompatActivity { public void onListItemClick(ListView l, View v, int position, long id) { App app = appDetails.getApp(); final Apk apk = appDetails.getApks().getItem(position - l.getHeaderViewsCount()); - if (app.installedVersionCode == apk.vercode) { + if (app.installedVersionCode == apk.versionCode) { remove(); - } else if (app.installedVersionCode > apk.vercode) { + } else if (app.installedVersionCode > apk.versionCode) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setMessage(R.string.installDowngrade); builder.setPositiveButton(R.string.yes, diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java index 6fa1c3fb6..306f38ced 100644 --- a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java +++ b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java @@ -102,7 +102,7 @@ public class CompatibilityChecker { } if (!features.contains(feat)) { Collections.addAll(incompatibleReasons, feat.split(",")); - Utils.debugLog(TAG, apk.packageName + " vercode " + apk.vercode + Utils.debugLog(TAG, apk.packageName + " vercode " + apk.versionCode + " is incompatible based on lack of " + feat); } } @@ -111,7 +111,7 @@ public class CompatibilityChecker { for (final String code : apk.nativecode) { incompatibleReasons.add(code); } - Utils.debugLog(TAG, apk.packageName + " vercode " + apk.vercode + Utils.debugLog(TAG, apk.packageName + " vercode " + apk.versionCode + " only supports " + Utils.CommaSeparatedList.str(apk.nativecode) + " while your architectures are " + cpuAbisDesc); } diff --git a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java index ff24611ba..be9149443 100644 --- a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java +++ b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java @@ -99,7 +99,7 @@ public class RepoXMLHandler extends DefaultHandler { curapk.version = str; break; case "versioncode": - curapk.vercode = Utils.parseInt(str, -1); + curapk.versionCode = Utils.parseInt(str, -1); break; case "size": curapk.size = Utils.parseInt(str, 0); diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java index 1e7dc633f..9972ac2e9 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Apk.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Apk.java @@ -16,7 +16,7 @@ public class Apk extends ValueObject implements Comparable { public String packageName; public String version; - public int vercode; + public int versionCode; public int size; // Size in bytes - 0 means we don't know! public long repo; // ID of the repo it comes from public String hash; @@ -109,7 +109,7 @@ public class Apk extends ValueObject implements Comparable { version = cursor.getString(i); break; case ApkProvider.DataColumns.VERSION_CODE: - vercode = cursor.getInt(i); + versionCode = cursor.getInt(i); break; case ApkProvider.DataColumns.REPO_VERSION: repoVersion = cursor.getInt(i); @@ -123,14 +123,14 @@ public class Apk extends ValueObject implements Comparable { @Override public String toString() { - return packageName + " (version " + vercode + ")"; + return packageName + " (version " + versionCode + ")"; } public ContentValues toContentValues() { ContentValues values = new ContentValues(); values.put(ApkProvider.DataColumns.PACKAGE_NAME, packageName); values.put(ApkProvider.DataColumns.VERSION, version); - values.put(ApkProvider.DataColumns.VERSION_CODE, vercode); + values.put(ApkProvider.DataColumns.VERSION_CODE, versionCode); values.put(ApkProvider.DataColumns.REPO_ID, repo); values.put(ApkProvider.DataColumns.HASH, hash); values.put(ApkProvider.DataColumns.HASH_TYPE, hashType); @@ -153,9 +153,9 @@ public class Apk extends ValueObject implements Comparable { @TargetApi(19) public int compareTo(Apk apk) { if (Build.VERSION.SDK_INT < 19) { - return Integer.valueOf(vercode).compareTo(apk.vercode); + return Integer.valueOf(versionCode).compareTo(apk.versionCode); } - return Integer.compare(vercode, apk.vercode); + return Integer.compare(versionCode, apk.versionCode); } } diff --git a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java index 8a0d8c519..031a3ce3d 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java @@ -34,7 +34,7 @@ public class ApkProvider extends FDroidProvider { public static void update(Context context, Apk apk) { ContentResolver resolver = context.getContentResolver(); - Uri uri = getContentUri(apk.packageName, apk.vercode); + Uri uri = getContentUri(apk.packageName, apk.versionCode); resolver.update(uri, apk.toContentValues(), null, null); } @@ -279,7 +279,7 @@ public class ApkProvider extends FDroidProvider { } public static Uri getContentUri(Apk apk) { - return getContentUri(apk.packageName, apk.vercode); + return getContentUri(apk.packageName, apk.versionCode); } public static Uri getContentUri(String packageName, int versionCode) { @@ -328,8 +328,8 @@ public class ApkProvider extends FDroidProvider { if (i != 0) { builder.append(','); } - final Apk a = apks.get(i); - builder.append(a.packageName).append(':').append(a.vercode); + final Apk apk = apks.get(i); + builder.append(apk.packageName).append(':').append(apk.versionCode); } return builder.toString(); } 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 ea2c20f75..9065b2a58 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -276,7 +276,7 @@ public class App extends ValueObject implements Comparable { final SanitizedFile apkFile = SanitizedFile.knownSanitized(appInfo.publicSourceDir); final Apk apk = new Apk(); apk.version = packageInfo.versionName; - apk.vercode = packageInfo.versionCode; + apk.versionCode = packageInfo.versionCode; apk.hashType = "sha256"; apk.hash = Utils.getBinaryHash(apkFile, apk.hashType); apk.added = this.added; @@ -285,7 +285,7 @@ public class App extends ValueObject implements Comparable { apk.packageName = this.packageName; apk.installedFile = apkFile; apk.permissions = Utils.CommaSeparatedList.make(packageInfo.requestedPermissions); - apk.apkName = apk.packageName + "_" + apk.vercode + ".apk"; + apk.apkName = apk.packageName + "_" + apk.versionCode + ".apk"; final FeatureInfo[] features = packageInfo.reqFeatures; if (features != null && features.length > 0) { diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java index 5ec7e86e9..ca05dd631 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java +++ b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java @@ -169,7 +169,7 @@ public class RepoPersister { for (Apk apk : packages) { boolean exists = false; for (Apk existing : existingApks) { - if (existing.packageName.equals(apk.packageName) && existing.vercode == apk.vercode) { + if (existing.packageName.equals(apk.packageName) && existing.versionCode == apk.versionCode) { exists = true; break; } @@ -256,7 +256,7 @@ public class RepoPersister { if (packages.containsKey(existingApk.packageName)) { for (Apk newApk : packages.get(existingApk.packageName)) { - if (newApk.vercode == existingApk.vercode) { + if (newApk.versionCode == existingApk.versionCode) { shouldStay = true; break; } diff --git a/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java index 26765fa75..831b231ba 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java @@ -49,7 +49,7 @@ public class TempApkProvider extends ApkProvider { return getContentUri() .buildUpon() .appendPath(PATH_APK) - .appendPath(Integer.toString(apk.vercode)) + .appendPath(Integer.toString(apk.versionCode)) .appendPath(apk.packageName) .build(); } diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java index 5ae72b52b..c98c33694 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java @@ -293,7 +293,7 @@ public final class LocalRepoManager { if (app.installedApk != null) { try { appInfo = pm.getApplicationInfo(app.packageName, PackageManager.GET_META_DATA); - copyIconToRepo(appInfo.loadIcon(pm), app.packageName, app.installedApk.vercode); + copyIconToRepo(appInfo.loadIcon(pm), app.packageName, app.installedApk.versionCode); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "Error getting app icon", e); } @@ -439,7 +439,7 @@ public final class LocalRepoManager { tag("source", "source"); tag("tracker", "tracker"); tag("marketversion", app.installedApk.version); - tag("marketvercode", app.installedApk.vercode); + tag("marketvercode", app.installedApk.versionCode); tagPackage(app); @@ -450,7 +450,7 @@ public final class LocalRepoManager { serializer.startTag("", "package"); tag("version", app.installedApk.version); - tag("versioncode", app.installedApk.vercode); + tag("versioncode", app.installedApk.versionCode); tag("apkname", app.installedApk.apkName); tagHash(app); tag("sig", app.installedApk.sig.toLowerCase(Locale.US));