From 038816e32ab12ffec68da9930678bd22616cc94b Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Mon, 21 Dec 2015 21:07:45 +1100 Subject: [PATCH] Renamed Apk.id to Apk.packageName --- .../org/fdroid/fdroid/CompatibilityChecker.java | 4 ++-- .../src/org/fdroid/fdroid/RepoXMLHandler.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/Apk.java | 8 ++++---- .../src/org/fdroid/fdroid/data/ApkProvider.java | 6 +++--- F-Droid/src/org/fdroid/fdroid/data/App.java | 4 ++-- .../org/fdroid/fdroid/data/RepoPersister.java | 6 +++--- .../org/fdroid/fdroid/data/TempApkProvider.java | 2 +- .../src/org/fdroid/fdroid/net/ApkDownloader.java | 2 +- .../org/fdroid/fdroid/ApkProviderHelperTest.java | 8 ++++---- .../src/org/fdroid/fdroid/ApkProviderTest.java | 16 ++++++++-------- .../org/fdroid/fdroid/BaseApkProviderTest.java | 4 ++-- .../org/fdroid/fdroid/MultiRepoUpdaterTest.java | 2 +- .../test/src/org/fdroid/fdroid/mock/MockApk.java | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java index 09552b0bd..db22131d6 100644 --- a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java +++ b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java @@ -101,7 +101,7 @@ public class CompatibilityChecker extends Compatibility { } if (!features.contains(feat)) { Collections.addAll(incompatibleReasons, feat.split(",")); - Utils.debugLog(TAG, apk.id + " vercode " + apk.vercode + Utils.debugLog(TAG, apk.packageName + " vercode " + apk.vercode + " is incompatible based on lack of " + feat); } } @@ -110,7 +110,7 @@ public class CompatibilityChecker extends Compatibility { for (final String code : apk.nativecode) { incompatibleReasons.add(code); } - Utils.debugLog(TAG, apk.id + " vercode " + apk.vercode + Utils.debugLog(TAG, apk.packageName + " vercode " + apk.vercode + " only supports " + Utils.CommaSeparatedList.str(apk.nativecode) + " while your architectures are " + cpuAbisDesc); } diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java index c52e91a64..f6d5f6131 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java @@ -252,7 +252,7 @@ public class RepoXMLHandler extends DefaultHandler { curapp.packageName = attributes.getValue("", "id"); } else if ("package".equals(localName) && curapp != null && curapk == null) { curapk = new Apk(); - curapk.id = curapp.packageName; + curapk.packageName = curapp.packageName; curapk.repo = repo.getId(); currentApkHashType = null; diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java index 807c55182..0c95ec063 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/Apk.java +++ b/F-Droid/src/org/fdroid/fdroid/data/Apk.java @@ -9,7 +9,7 @@ import java.util.Date; public class Apk extends ValueObject implements Comparable { - public String id; + public String packageName; public String version; public int vercode; public int size; // Size in bytes - 0 means we don't know! @@ -65,7 +65,7 @@ public class Apk extends ValueObject implements Comparable { features = Utils.CommaSeparatedList.make(cursor.getString(i)); break; case ApkProvider.DataColumns.PACKAGE_NAME: - id = cursor.getString(i); + packageName = cursor.getString(i); break; case ApkProvider.DataColumns.IS_COMPATIBLE: compatible = cursor.getInt(i) == 1; @@ -118,12 +118,12 @@ public class Apk extends ValueObject implements Comparable { @Override public String toString() { - return id + " (version " + vercode + ")"; + return packageName + " (version " + vercode + ")"; } public ContentValues toContentValues() { ContentValues values = new ContentValues(); - values.put(ApkProvider.DataColumns.PACKAGE_NAME, id); + values.put(ApkProvider.DataColumns.PACKAGE_NAME, packageName); values.put(ApkProvider.DataColumns.VERSION, version); values.put(ApkProvider.DataColumns.VERSION_CODE, vercode); values.put(ApkProvider.DataColumns.REPO_ID, repo); diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java index b9dfcbcfd..5cac43d31 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/F-Droid/src/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.id, apk.vercode); + Uri uri = getContentUri(apk.packageName, apk.vercode); 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.id, apk.vercode); + return getContentUri(apk.packageName, apk.vercode); } public static Uri getContentUri(String id, int versionCode) { @@ -329,7 +329,7 @@ public class ApkProvider extends FDroidProvider { builder.append(','); } final Apk a = apks.get(i); - builder.append(a.id).append(':').append(a.vercode); + builder.append(a.packageName).append(':').append(a.vercode); } return builder.toString(); } diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java index 43fac7e8b..935fab2cf 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -273,10 +273,10 @@ public class App extends ValueObject implements Comparable { apk.added = this.added; apk.minSdkVersion = Utils.getMinSdkVersion(context, packageName); apk.maxSdkVersion = Utils.getMaxSdkVersion(context, packageName); - apk.id = this.packageName; + apk.packageName = this.packageName; apk.installedFile = apkFile; apk.permissions = Utils.CommaSeparatedList.make(packageInfo.requestedPermissions); - apk.apkName = apk.id + "_" + apk.vercode + ".apk"; + apk.apkName = apk.packageName + "_" + apk.vercode + ".apk"; final FeatureInfo[] features = packageInfo.reqFeatures; if (features != null && features.length > 0) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java index 4f8b1cc22..0812438ca 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java +++ b/F-Droid/src/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.id.equals(apk.id) && existing.vercode == apk.vercode) { + if (existing.packageName.equals(apk.packageName) && existing.vercode == apk.vercode) { exists = true; break; } @@ -254,8 +254,8 @@ public class RepoPersister { for (Apk existingApk : existing) { boolean shouldStay = false; - if (packages.containsKey(existingApk.id)) { - for (Apk newApk : packages.get(existingApk.id)) { + if (packages.containsKey(existingApk.packageName)) { + for (Apk newApk : packages.get(existingApk.packageName)) { if (newApk.vercode == existingApk.vercode) { shouldStay = true; break; diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java index 269437122..7486f24cc 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java @@ -49,7 +49,7 @@ public class TempApkProvider extends ApkProvider { .buildUpon() .appendPath(PATH_APK) .appendPath(Integer.toString(apk.vercode)) - .appendPath(apk.id) + .appendPath(apk.packageName) .build(); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java index 6a2bddec8..83e2cc98e 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java @@ -197,7 +197,7 @@ public class ApkDownloader implements AsyncDownloader.Listener { Utils.debugLog(TAG, "Downloading apk from " + remoteAddress + " to " + localFile); try { - dlWrapper = DownloaderFactory.createAsync(context, remoteAddress, localFile, app.name + " " + curApk.version, curApk.id, credentials, this); + dlWrapper = DownloaderFactory.createAsync(context, remoteAddress, localFile, app.name + " " + curApk.version, curApk.packageName, credentials, this); dlWrapper.download(); return true; } catch (IOException e) { diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java index a2fd1e8a5..c91b27d06 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java @@ -112,7 +112,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { Apk apk = new Apk(cursor); cursor.close(); - assertEquals("com.example", apk.id); + assertEquals("com.example", apk.packageName); assertEquals(10, apk.vercode); assertNull(apk.features); @@ -138,7 +138,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { Apk updatedApk = new Apk(updatedCursor); updatedCursor.close(); - assertEquals("com.example", updatedApk.id); + assertEquals("com.example", updatedApk.packageName); assertEquals(10, updatedApk.vercode); assertNotNull(updatedApk.features); @@ -176,7 +176,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.id); + assertEquals("com.example", apk.packageName); assertEquals(11, apk.vercode); assertEquals("v1.1", apk.version); assertEquals("xxxxyyyy", apk.hash); @@ -191,7 +191,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { assertNotNull(apkLessFields); - assertEquals("com.example", apkLessFields.id); + assertEquals("com.example", apkLessFields.packageName); assertEquals("xxxxyyyy", apkLessFields.hash); // Didn't ask for these fields, so should be their default values... diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java index 0d3810f77..e5ff7395b 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java @@ -127,9 +127,9 @@ public class ApkProviderTest extends BaseApkProviderTest { assertTotalApkCount(5); - assertEquals("com.example.one", one.id); - assertEquals("com.example.two", two.id); - assertEquals("com.example.five", five.id); + assertEquals("com.example.one", one.packageName); + assertEquals("com.example.two", two.packageName); + assertEquals("com.example.five", five.packageName); String[] expectedIds = { "com.example.one", @@ -142,7 +142,7 @@ public class ApkProviderTest extends BaseApkProviderTest { List all = ApkProvider.Helper.findByRepo(getSwappableContext(), new MockRepo(10), ApkProvider.DataColumns.ALL); List actualIds = new ArrayList<>(); for (Apk apk : all) { - actualIds.add(apk.id); + actualIds.add(apk.packageName); } TestUtils.assertContainsOnly(actualIds, expectedIds); @@ -158,7 +158,7 @@ public class ApkProviderTest extends BaseApkProviderTest { List allRemaining = ApkProvider.Helper.findByRepo(getSwappableContext(), new MockRepo(10), ApkProvider.DataColumns.ALL); List actualRemainingIds = new ArrayList<>(); for (Apk apk : allRemaining) { - actualRemainingIds.add(apk.id); + actualRemainingIds.add(apk.packageName); } String[] expectedRemainingIds = { @@ -232,7 +232,7 @@ public class ApkProviderTest extends BaseApkProviderTest { Apk apk = new MockApk("org.fdroid.fdroid", 13); // Insert a new record... - Uri newUri = TestUtils.insertApk(this, apk.id, apk.vercode); + Uri newUri = TestUtils.insertApk(this, apk.packageName, apk.vercode); assertEquals(ApkProvider.getContentUri(apk).toString(), newUri.toString()); cursor = queryAllApks(); assertNotNull(cursor); @@ -255,7 +255,7 @@ public class ApkProviderTest extends BaseApkProviderTest { cursor.moveToFirst(); Apk toCheck = new Apk(cursor); cursor.close(); - assertEquals("org.fdroid.fdroid", toCheck.id); + assertEquals("org.fdroid.fdroid", toCheck.packageName); assertEquals(13, toCheck.vercode); } @@ -328,7 +328,7 @@ public class ApkProviderTest extends BaseApkProviderTest { // But this should have saved correctly... assertEquals("Some features", apk.features.toString()); - assertEquals("com.example.com", apk.id); + assertEquals("com.example.com", apk.packageName); assertEquals(1, apk.vercode); assertEquals(10, apk.repo); } diff --git a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java index 641732963..0015584f1 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java +++ b/F-Droid/test/src/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.id.equals(apk.id)) { + if (a.vercode == apk.vercode && a.packageName.equals(apk.packageName)) { found = true; break; } @@ -56,7 +56,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest { protected void assertBelongsToApp(List apks, String appId) { for (Apk apk : apks) { - assertEquals(appId, apk.id); + assertEquals(appId, apk.packageName); } } diff --git a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java index 7664d1d4a..871dd4367 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java @@ -279,7 +279,7 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase { for (int versionCode : versionCodes) { boolean found = false; for (Apk apk : apksToCheck) { - if (apk.vercode == versionCode && apk.id.equals(appId)) { + if (apk.vercode == versionCode && apk.packageName.equals(appId)) { found = true; break; } diff --git a/F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java b/F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java index f3da31d6d..4790301ac 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java +++ b/F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java @@ -5,7 +5,7 @@ import org.fdroid.fdroid.data.Apk; public class MockApk extends Apk { public MockApk(String id, int versionCode) { - this.id = id; + this.packageName = id; this.vercode = versionCode; }