From 756df4d635ff44433838371af00b4ac559d18bcf Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Sat, 19 Dec 2015 09:21:24 +1100 Subject: [PATCH 1/3] Renamed Java constant APP_ID to PACKAGE_NAME In both the ApkProvider and the AppProvider. Left the underlying database name as 'id' for now because it is not as important or visible. --- F-Droid/src/org/fdroid/fdroid/data/Apk.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java | 10 +++++----- F-Droid/src/org/fdroid/fdroid/data/App.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/data/AppProvider.java | 6 +++--- F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java | 6 +++--- .../fdroid/fdroid/views/fragments/AppListFragment.java | 2 +- .../src/org/fdroid/fdroid/ApkProviderHelperTest.java | 4 ++-- .../test/src/org/fdroid/fdroid/ApkProviderTest.java | 2 +- .../test/src/org/fdroid/fdroid/AppProviderTest.java | 6 +++--- .../src/org/fdroid/fdroid/BaseApkProviderTest.java | 2 +- .../src/org/fdroid/fdroid/InstalledAppCacheTest.java | 4 ++-- F-Droid/test/src/org/fdroid/fdroid/TestUtils.java | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java index 9c7d84523..807c55182 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/Apk.java +++ b/F-Droid/src/org/fdroid/fdroid/data/Apk.java @@ -64,7 +64,7 @@ public class Apk extends ValueObject implements Comparable { case ApkProvider.DataColumns.FEATURES: features = Utils.CommaSeparatedList.make(cursor.getString(i)); break; - case ApkProvider.DataColumns.APK_ID: + case ApkProvider.DataColumns.PACKAGE_NAME: id = cursor.getString(i); break; case ApkProvider.DataColumns.IS_COMPATIBLE: @@ -123,7 +123,7 @@ public class Apk extends ValueObject implements Comparable { public ContentValues toContentValues() { ContentValues values = new ContentValues(); - values.put(ApkProvider.DataColumns.APK_ID, id); + values.put(ApkProvider.DataColumns.PACKAGE_NAME, id); 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 75e45158c..80417840f 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java @@ -194,7 +194,7 @@ public class ApkProvider extends FDroidProvider { String _COUNT_DISTINCT_ID = "countDistinct"; - String APK_ID = "id"; + String PACKAGE_NAME = "id"; String VERSION = "version"; String REPO_ID = "repo"; String HASH = "hash"; @@ -216,7 +216,7 @@ public class ApkProvider extends FDroidProvider { String REPO_ADDRESS = "repoAddress"; String[] ALL = { - _ID, APK_ID, VERSION, REPO_ID, HASH, VERSION_CODE, NAME, SIZE, + _ID, PACKAGE_NAME, VERSION, REPO_ID, HASH, VERSION_CODE, NAME, SIZE, SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, MAX_SDK_VERSION, PERMISSIONS, FEATURES, NATIVE_CODE, HASH_TYPE, ADDED_DATE, IS_COMPATIBLE, REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS, @@ -395,7 +395,7 @@ public class ApkProvider extends FDroidProvider { } private QuerySelection queryApp(String appId) { - final String selection = DataColumns.APK_ID + " = ? "; + final String selection = DataColumns.PACKAGE_NAME + " = ? "; final String[] args = {appId}; return new QuerySelection(selection, args); } @@ -418,7 +418,7 @@ public class ApkProvider extends FDroidProvider { } private QuerySelection queryRepoApps(long repoId, String appIds) { - return queryRepo(repoId).add(AppProvider.queryApps(appIds, DataColumns.APK_ID)); + return queryRepo(repoId).add(AppProvider.queryApps(appIds, DataColumns.PACKAGE_NAME)); } protected QuerySelection queryApks(String apkKeys) { @@ -512,7 +512,7 @@ public class ApkProvider extends FDroidProvider { getContext().getContentResolver().notifyChange(uri, null); } return getContentUri( - values.getAsString(DataColumns.APK_ID), + values.getAsString(DataColumns.PACKAGE_NAME), values.getAsInteger(DataColumns.VERSION_CODE)); } diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java index 02f131a9e..c483eaaf5 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -124,7 +124,7 @@ public class App extends ValueObject implements Comparable { case AppProvider.DataColumns.IS_COMPATIBLE: compatible = cursor.getInt(i) == 1; break; - case AppProvider.DataColumns.APP_ID: + case AppProvider.DataColumns.PACKAGE_NAME: id = cursor.getString(i); break; case AppProvider.DataColumns.NAME: @@ -369,7 +369,7 @@ public class App extends ValueObject implements Comparable { public ContentValues toContentValues() { final ContentValues values = new ContentValues(); - values.put(AppProvider.DataColumns.APP_ID, id); + values.put(AppProvider.DataColumns.PACKAGE_NAME, id); values.put(AppProvider.DataColumns.NAME, name); values.put(AppProvider.DataColumns.SUMMARY, summary); values.put(AppProvider.DataColumns.ICON, icon); diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index e30fcfb61..55d218710 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -173,7 +173,7 @@ public class AppProvider extends FDroidProvider { String _ID = "rowid as _id"; // Required for CursorLoaders String _COUNT = "_count"; String IS_COMPATIBLE = "compatible"; - String APP_ID = "id"; + String PACKAGE_NAME = "id"; String NAME = "name"; String SUMMARY = "summary"; String ICON = "icon"; @@ -211,7 +211,7 @@ public class AppProvider extends FDroidProvider { } String[] ALL = { - _ID, IS_COMPATIBLE, APP_ID, NAME, SUMMARY, ICON, DESCRIPTION, + _ID, IS_COMPATIBLE, PACKAGE_NAME, NAME, SUMMARY, ICON, DESCRIPTION, LICENSE, WEB_URL, TRACKER_URL, SOURCE_URL, CHANGELOG_URL, DONATE_URL, BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID, UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED, @@ -851,7 +851,7 @@ public class AppProvider extends FDroidProvider { if (!isApplyingBatch()) { getContext().getContentResolver().notifyChange(uri, null); } - return getContentUri(values.getAsString(DataColumns.APP_ID)); + return getContentUri(values.getAsString(DataColumns.PACKAGE_NAME)); } @Override diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java index bc2e914db..6fdd45733 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java +++ b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java @@ -161,7 +161,7 @@ public class RepoPersister { */ private ArrayList insertOrUpdateApks(List packages) { String[] projection = new String[]{ - ApkProvider.DataColumns.APK_ID, + ApkProvider.DataColumns.PACKAGE_NAME, ApkProvider.DataColumns.VERSION_CODE, }; List existingApks = ApkProvider.Helper.knownApks(context, packages, projection); @@ -216,7 +216,7 @@ public class RepoPersister { * array. */ private boolean isAppInDatabase(App app) { - String[] fields = {AppProvider.DataColumns.APP_ID}; + String[] fields = {AppProvider.DataColumns.PACKAGE_NAME}; App found = AppProvider.Helper.findById(context.getContentResolver(), app.id, fields); return found != null; } @@ -247,7 +247,7 @@ public class RepoPersister { */ @Nullable private ContentProviderOperation deleteOrphanedApks(List apps, Map> packages) { - String[] projection = new String[]{ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.VERSION_CODE}; + String[] projection = new String[]{ApkProvider.DataColumns.PACKAGE_NAME, ApkProvider.DataColumns.VERSION_CODE}; List existing = ApkProvider.Helper.find(context, repo, apps, projection); List toDelete = new ArrayList<>(); diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java index 143684d2d..ac24f55bb 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -35,7 +35,7 @@ public abstract class AppListFragment extends ListFragment implements public static final String[] APP_PROJECTION = { AppProvider.DataColumns._ID, // Required for cursor loader to work. - AppProvider.DataColumns.APP_ID, + AppProvider.DataColumns.PACKAGE_NAME, AppProvider.DataColumns.NAME, AppProvider.DataColumns.SUMMARY, AppProvider.DataColumns.IS_COMPATIBLE, diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java index e0808bda7..a2fd1e8a5 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java @@ -56,7 +56,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { Collections.addAll(apksToCheck, unknown); String[] projection = { - ApkProvider.DataColumns.APK_ID, + ApkProvider.DataColumns.PACKAGE_NAME, ApkProvider.DataColumns.VERSION_CODE, }; @@ -183,7 +183,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest { assertEquals("a hash type", apk.hashType); String[] projection = { - ApkProvider.DataColumns.APK_ID, + ApkProvider.DataColumns.PACKAGE_NAME, ApkProvider.DataColumns.HASH, }; diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java index 8339f158d..0d3810f77 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java @@ -251,7 +251,7 @@ public class ApkProviderTest extends BaseApkProviderTest { // And now we should be able to recover these values from the apk // value object (because the queryAllApks() helper asks for VERSION_CODE and - // APK_ID. + // PACKAGE_NAME. cursor.moveToFirst(); Apk toCheck = new Apk(cursor); cursor.close(); diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java index 05ecaa1d1..6b6dfacf2 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java @@ -37,7 +37,7 @@ public class AppProviderTest extends FDroidProviderTest { @Override protected String[] getMinimalProjection() { return new String[] { - AppProvider.DataColumns.APP_ID, + AppProvider.DataColumns.PACKAGE_NAME, AppProvider.DataColumns.NAME, }; } @@ -209,7 +209,7 @@ public class AppProviderTest extends FDroidProviderTest { assertResultCount(10, AppProvider.getContentUri()); - String[] projection = {AppProvider.DataColumns.APP_ID}; + String[] projection = {AppProvider.DataColumns.PACKAGE_NAME}; List ignoredApps = AppProvider.Helper.findIgnored(getMockContext(), projection); String[] expectedIgnored = { @@ -278,7 +278,7 @@ public class AppProviderTest extends FDroidProviderTest { // And now we should be able to recover these values from the app // value object (because the queryAllApps() helper asks for NAME and - // APP_ID. + // PACKAGE_NAME. cursor.moveToFirst(); App app = new App(cursor); cursor.close(); diff --git a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java index c242a03cb..641732963 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java @@ -26,7 +26,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest { @Override protected String[] getMinimalProjection() { return new String[] { - ApkProvider.DataColumns.APK_ID, + ApkProvider.DataColumns.PACKAGE_NAME, ApkProvider.DataColumns.VERSION_CODE, ApkProvider.DataColumns.NAME, ApkProvider.DataColumns.REPO_ID, diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java index 680221dee..57b2e946f 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java @@ -71,7 +71,7 @@ public class InstalledAppCacheTest extends FDroidProviderTest Date: Mon, 21 Dec 2015 07:07:59 +1100 Subject: [PATCH 2/3] Renamed App.id to App.packageName --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 50 +++++++++---------- .../src/org/fdroid/fdroid/RepoXMLHandler.java | 6 +-- .../org/fdroid/fdroid/data/ApkProvider.java | 8 +-- F-Droid/src/org/fdroid/fdroid/data/App.java | 12 ++--- .../org/fdroid/fdroid/data/AppProvider.java | 4 +- .../fdroid/data/InstalledAppProvider.java | 2 +- .../org/fdroid/fdroid/data/RepoPersister.java | 4 +- .../fdroid/fdroid/data/TempAppProvider.java | 2 +- .../fdroid/localrepo/LocalRepoManager.java | 8 +-- .../views/fragments/AppListFragment.java | 2 +- .../fragments/SearchResultsFragment.java | 2 +- .../fdroid/views/swap/SwapAppsView.java | 10 ++-- .../views/swap/SwapWorkflowActivity.java | 4 +- .../org/fdroid/fdroid/AppProviderTest.java | 8 +-- .../org/fdroid/fdroid/RepoXMLHandlerTest.java | 2 +- .../src/org/fdroid/fdroid/mock/MockApp.java | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 89c6d0548..56a283633 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -171,7 +171,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A ApkListAdapter(Context context, App app) { super(context, 0); - final List apks = ApkProvider.Helper.findByApp(context, app.id); + final List apks = ApkProvider.Helper.findByApp(context, app.packageName); for (final Apk apk : apks) { if (apk.compatible || Preferences.get().showIncompatibleVersions()) { add(apk); @@ -192,9 +192,9 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A // Installed the same version, but from someplace else. final String installerPkgName; try { - installerPkgName = mPm.getInstallerPackageName(app.id); + installerPkgName = mPm.getInstallerPackageName(app.packageName); } catch (IllegalArgumentException e) { - Log.w(TAG, "Application " + app.id + " is not installed anymore"); + Log.w(TAG, "Application " + app.packageName + " is not installed anymore"); return getString(R.string.app_not_installed); } if (TextUtils.isEmpty(installerPkgName)) { @@ -431,13 +431,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A localBroadcastManager = LocalBroadcastManager.getInstance(this); // Check if a download is running for this app - if (AsyncDownloaderFromAndroid.isDownloading(this, app.id) >= 0) { + if (AsyncDownloaderFromAndroid.isDownloading(this, app.packageName) >= 0) { // call install() to re-setup the listeners and downloaders // the AsyncDownloader will not restart the download since the download is running, // and thus the version we pass to install() is not important refreshHeader(); refreshApkList(); - final Apk apkToInstall = ApkProvider.Helper.find(this, app.id, app.suggestedVercode); + final Apk apkToInstall = ApkProvider.Helper.find(this, app.packageName, app.suggestedVercode); install(apkToInstall); } @@ -449,7 +449,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A // register observer to know when install status changes myAppObserver = new AppObserver(new Handler()); getContentResolver().registerContentObserver( - AppProvider.getContentUri(app.id), + AppProvider.getContentUri(app.packageName), true, myAppObserver); } @@ -510,7 +510,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A if (app != null && (app.ignoreAllUpdates != startingIgnoreAll || app.ignoreThisUpdate != startingIgnoreThis)) { Utils.debugLog(TAG, "Updating 'ignore updates', as it has changed since we started the activity..."); - setIgnoreUpdates(app.id, app.ignoreAllUpdates, app.ignoreThisUpdate); + setIgnoreUpdates(app.packageName, app.ignoreAllUpdates, app.ignoreThisUpdate); } localBroadcastManager.unregisterReceiver(downloaderProgressReceiver); @@ -531,7 +531,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A }; private void onAppChanged() { - if (!reset(app.id)) { + if (!reset(app.packageName)) { AppDetails.this.finish(); return; } @@ -622,7 +622,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A if (app == null) return true; - if (mPm.getLaunchIntentForPackage(app.id) != null && app.canAndWantToUpdate()) { + if (mPm.getLaunchIntentForPackage(app.packageName) != null && app.canAndWantToUpdate()) { MenuItemCompat.setShowAsAction(menu.add( Menu.NONE, LAUNCH, 1, R.string.menu_launch) .setIcon(R.drawable.ic_play_arrow_white), @@ -749,7 +749,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A return true; case LAUNCH: - launchApk(app.id); + launchApk(app.packageName); return true; case SHARE: @@ -759,13 +759,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A case INSTALL: // Note that this handles updating as well as installing. if (app.suggestedVercode > 0) { - final Apk apkToInstall = ApkProvider.Helper.find(this, app.id, app.suggestedVercode); + final Apk apkToInstall = ApkProvider.Helper.find(this, app.packageName, app.suggestedVercode); install(apkToInstall); } return true; case UNINSTALL: - removeApk(app.id); + removeApk(app.packageName); return true; case IGNOREALL: @@ -880,7 +880,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A private void installApk(File file) { try { - installer.installPackage(file, app.id); + installer.installPackage(file, app.packageName); } catch (AndroidNotCompatibleException e) { Log.e(TAG, "Android not compatible with this Installer!", e); } @@ -903,7 +903,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A @Override public void run() { if (operation == Installer.InstallerCallback.OPERATION_INSTALL) { - PackageManagerCompat.setInstaller(mPm, app.id); + PackageManagerCompat.setInstaller(mPm, app.packageName); } onAppChanged(); @@ -962,7 +962,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A shareIntent.setType("text/plain"); shareIntent.putExtra(Intent.EXTRA_SUBJECT, app.name); - shareIntent.putExtra(Intent.EXTRA_TEXT, app.name + " (" + app.summary + ") - https://f-droid.org/app/" + app.id); + shareIntent.putExtra(Intent.EXTRA_TEXT, app.name + " (" + app.summary + ") - https://f-droid.org/app/" + app.packageName); startActivity(Intent.createChooser(shareIntent, getString(R.string.menu_share))); } @@ -1016,7 +1016,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A switch (requestCode) { case REQUEST_ENABLE_BLUETOOTH: - fdroidApp.sendViaBluetooth(this, resultCode, app.id); + fdroidApp.sendViaBluetooth(this, resultCode, app.packageName); break; } } @@ -1210,7 +1210,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A // App ID final TextView appIdView = (TextView) view.findViewById(R.id.appid); if (prefs.expertMode()) - appIdView.setText(app.id); + appIdView.setText(app.packageName); else appIdView.setVisibility(View.GONE); @@ -1567,13 +1567,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } else if (app.isInstalled()) { installed = true; statusView.setText(getString(R.string.details_installed, app.installedVersionName)); - NfcHelper.setAndroidBeam(activity, app.id); + NfcHelper.setAndroidBeam(activity, app.packageName); if (app.canAndWantToUpdate()) { updateWanted = true; btMain.setText(R.string.menu_upgrade); } else { updateWanted = false; - if (activity.mPm.getLaunchIntentForPackage(app.id) != null) { + if (activity.mPm.getLaunchIntentForPackage(app.packageName) != null) { btMain.setText(R.string.menu_launch); } else { btMain.setText(R.string.menu_uninstall); @@ -1601,7 +1601,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A AppDetails activity = (AppDetails) getActivity(); if (updateWanted) { if (app.suggestedVercode > 0) { - final Apk apkToInstall = ApkProvider.Helper.find(activity, app.id, app.suggestedVercode); + final Apk apkToInstall = ApkProvider.Helper.find(activity, app.packageName, app.suggestedVercode); activity.install(apkToInstall); return; } @@ -1609,16 +1609,16 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A // If installed if (installed) { // If "launchable", launch - if (activity.mPm.getLaunchIntentForPackage(app.id) != null) { - activity.launchApk(app.id); + if (activity.mPm.getLaunchIntentForPackage(app.packageName) != null) { + activity.launchApk(app.packageName); } else { - activity.removeApk(app.id); + activity.removeApk(app.packageName); } // If not installed, install } else if (app.suggestedVercode > 0) { btMain.setEnabled(false); btMain.setText(R.string.system_install_installing); - final Apk apkToInstall = ApkProvider.Helper.find(activity, app.id, app.suggestedVercode); + final Apk apkToInstall = ApkProvider.Helper.find(activity, app.packageName, app.suggestedVercode); activity.install(apkToInstall); } } @@ -1647,7 +1647,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } protected void remove() { - installListener.removeApk(getApp().id); + installListener.removeApk(getApp().packageName); } protected App getApp() { diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java index 5994b39e7..c52e91a64 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java @@ -222,7 +222,7 @@ public class RepoXMLHandler extends DefaultHandler { receiver.receiveApp(curapp, apksList); curapp = null; apksList = new ArrayList<>(); - // If the app id is already present in this apps list, then it + // If the app packageName is already present in this apps list, then it // means the same index file has a duplicate app, which should // not be allowed. // However, I'm thinking that it should be undefined behaviour, @@ -249,10 +249,10 @@ public class RepoXMLHandler extends DefaultHandler { repoDescription = cleanWhiteSpace(attributes.getValue("", "description")); } else if ("application".equals(localName) && curapp == null) { curapp = new App(); - curapp.id = attributes.getValue("", "id"); + curapp.packageName = attributes.getValue("", "id"); } else if ("package".equals(localName) && curapp != null && curapk == null) { curapk = new Apk(); - curapk.id = curapp.id; + curapk.id = curapp.packageName; curapk.repo = repo.getId(); currentApkHashType = null; diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java index 80417840f..b9dfcbcfd 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java @@ -22,7 +22,7 @@ public class ApkProvider extends FDroidProvider { /** * SQLite has a maximum of 999 parameters in a query. Each apk we add - * requires two (id and vercode) so we can only query half of that. Then, + * requires two (packageName and vercode) so we can only query half of that. Then, * we may want to add additional constraints, so we give our self some * room by saying only 450 apks can be queried at once. */ @@ -62,7 +62,7 @@ public class ApkProvider extends FDroidProvider { public static void deleteApksByApp(Context context, App app) { ContentResolver resolver = context.getContentResolver(); - final Uri uri = getAppUri(app.id); + final Uri uri = getAppUri(app.packageName); resolver.delete(uri, null, null); } @@ -135,7 +135,7 @@ public class ApkProvider extends FDroidProvider { } /** - * Returns apks in the database, which have the same id and version as + * Returns apks in the database, which have the same packageName and version as * one of the apks in the "apks" argument. */ public static List knownApks(Context context, List apks, String[] fields) { @@ -340,7 +340,7 @@ public class ApkProvider extends FDroidProvider { if (i != 0) { builder.append(','); } - builder.append(apks.get(i).id); + builder.append(apks.get(i).packageName); } 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 c483eaaf5..43fac7e8b 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -31,7 +31,7 @@ public class App extends ValueObject implements Comparable { // True if compatible with the device (i.e. if at least one apk is) public boolean compatible; - public String id = "unknown"; + public String packageName = "unknown"; public String name = "Unknown"; public String summary = "Unknown application"; public String icon; @@ -125,7 +125,7 @@ public class App extends ValueObject implements Comparable { compatible = cursor.getInt(i) == 1; break; case AppProvider.DataColumns.PACKAGE_NAME: - id = cursor.getString(i); + packageName = cursor.getString(i); break; case AppProvider.DataColumns.NAME: name = cursor.getString(i); @@ -252,7 +252,7 @@ public class App extends ValueObject implements Comparable { this.summary = "(installed by " + installerPackageLabel + ")"; else this.summary = (String) appDescription.subSequence(0, 40); - this.id = appInfo.packageName; + this.packageName = appInfo.packageName; this.added = new Date(packageInfo.firstInstallTime); this.lastUpdated = new Date(packageInfo.lastUpdateTime); this.description = "

"; @@ -273,7 +273,7 @@ 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.id; + apk.id = this.packageName; apk.installedFile = apkFile; apk.permissions = Utils.CommaSeparatedList.make(packageInfo.requestedPermissions); apk.apkName = apk.id + "_" + apk.vercode + ".apk"; @@ -352,7 +352,7 @@ public class App extends ValueObject implements Comparable { public boolean isValid() { if (TextUtils.isEmpty(this.name) - || TextUtils.isEmpty(this.id)) + || TextUtils.isEmpty(this.packageName)) return false; if (this.installedApk == null) @@ -369,7 +369,7 @@ public class App extends ValueObject implements Comparable { public ContentValues toContentValues() { final ContentValues values = new ContentValues(); - values.put(AppProvider.DataColumns.PACKAGE_NAME, id); + values.put(AppProvider.DataColumns.PACKAGE_NAME, packageName); values.put(AppProvider.DataColumns.NAME, name); values.put(AppProvider.DataColumns.SUMMARY, summary); values.put(AppProvider.DataColumns.ICON, icon); diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index 55d218710..bf685e0ee 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -523,7 +523,7 @@ public class AppProvider extends FDroidProvider { if (i != 0) { builder.append(','); } - builder.append(apps.get(i).id); + builder.append(apps.get(i).packageName); } return getContentUri().buildUpon() .appendPath(PATH_APPS) @@ -532,7 +532,7 @@ public class AppProvider extends FDroidProvider { } public static Uri getContentUri(App app) { - return getContentUri(app.id); + return getContentUri(app.packageName); } public static Uri getContentUri(String appId) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java index 181bc8aa6..fb46ed6a5 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java @@ -109,7 +109,7 @@ public class InstalledAppProvider extends FDroidProvider { } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) { Utils.debugLog(TAG, "Could not get application label", e); } - return packageName; // all else fails, return id + return packageName; // all else fails, return packageName } public static String getPackageSig(PackageInfo info) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java index 6fdd45733..4f8b1cc22 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java +++ b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java @@ -73,7 +73,7 @@ public class RepoPersister { public void saveToDb(App app, List packages) throws RepoUpdater.UpdateException { appsToSave.add(app); - apksToSave.put(app.id, packages); + apksToSave.put(app.packageName, packages); if (appsToSave.size() >= MAX_APP_BUFFER) { flushBufferToDb(); @@ -217,7 +217,7 @@ public class RepoPersister { */ private boolean isAppInDatabase(App app) { String[] fields = {AppProvider.DataColumns.PACKAGE_NAME}; - App found = AppProvider.Helper.findById(context.getContentResolver(), app.id, fields); + App found = AppProvider.Helper.findById(context.getContentResolver(), app.packageName, fields); return found != null; } diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java index e60a8271e..221af6df4 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java @@ -48,7 +48,7 @@ public class TempAppProvider extends AppProvider { } public static Uri getAppUri(App app) { - return Uri.withAppendedPath(getContentUri(), app.id); + return Uri.withAppendedPath(getContentUri(), app.packageName); } public static class Helper { diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java index 85037e049..24215bef6 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java @@ -282,8 +282,8 @@ public final class LocalRepoManager { for (final App app : apps.values()) { if (app.installedApk != null) { try { - appInfo = pm.getApplicationInfo(app.id, PackageManager.GET_META_DATA); - copyIconToRepo(appInfo.loadIcon(pm), app.id, app.installedApk.vercode); + appInfo = pm.getApplicationInfo(app.packageName, PackageManager.GET_META_DATA); + copyIconToRepo(appInfo.loadIcon(pm), app.packageName, app.installedApk.vercode); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "Error getting app icon", e); } @@ -413,9 +413,9 @@ public final class LocalRepoManager { private void tagApplication(App app) throws IOException { serializer.startTag("", "application"); - serializer.attribute("", "id", app.id); + serializer.attribute("", "id", app.packageName); - tag("id", app.id); + tag("id", app.packageName); tag("added", app.added); tag("lastupdated", app.lastUpdated); tag("name", app.name); diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java index ac24f55bb..708f94f81 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -156,7 +156,7 @@ public abstract class AppListFragment extends ListFragment implements if (cursor != null) { final App app = new App(cursor); Intent intent = getAppDetailsIntent(); - intent.putExtra(AppDetails.EXTRA_APPID, app.id); + intent.putExtra(AppDetails.EXTRA_APPID, app.packageName); intent.putExtra(AppDetails.EXTRA_FROM, getFromTitle()); startActivityForResult(intent, REQUEST_APPDETAILS); } diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java index c9e5799a4..d3d47d88e 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java @@ -110,7 +110,7 @@ public class SearchResultsFragment extends ListFragment implements LoaderManager final App app = new App((Cursor) adapter.getItem(position)); Intent intent = new Intent(getActivity(), AppDetails.class); - intent.putExtra(AppDetails.EXTRA_APPID, app.id); + intent.putExtra(AppDetails.EXTRA_APPID, app.packageName); intent.putExtra(AppDetails.EXTRA_HINT_SEARCHING, true); startActivityForResult(intent, REQUEST_APPDETAILS); super.onListItemClick(l, v, position, id); diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java index 1cab0b43d..a9bc70fdb 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java @@ -125,7 +125,7 @@ public class SwapAppsView extends ListView implements private void pollForUpdates() { if (adapter.getCount() > 1 || - (adapter.getCount() == 1 && !new App((Cursor) adapter.getItem(0)).id.equals("org.fdroid.fdroid"))) { + (adapter.getCount() == 1 && !new App((Cursor) adapter.getItem(0)).packageName.equals("org.fdroid.fdroid"))) { Utils.debugLog(TAG, "Not polling for new apps from swap repo, because we already have more than one."); return; } @@ -333,7 +333,7 @@ public class SwapAppsView extends ListView implements public void onChange(boolean selfChange) { Activity activity = getActivity(); if (activity != null) { - app = AppProvider.Helper.findById(getActivity().getContentResolver(), app.id); + app = AppProvider.Helper.findById(getActivity().getContentResolver(), app.packageName); apkToInstall = null; // Force lazy loading to fetch correct apk next time. resetView(); } @@ -350,7 +350,7 @@ public class SwapAppsView extends ListView implements } public void setApp(@NonNull App app) { - if (this.app == null || !this.app.id.equals(app.id)) { + if (this.app == null || !this.app.packageName.equals(app.packageName)) { this.app = app; apkToInstall = null; // Force lazy loading to fetch the correct apk next time. @@ -361,7 +361,7 @@ public class SwapAppsView extends ListView implements // implemented on API-16, so leaving like this for now. getActivity().getContentResolver().unregisterContentObserver(appObserver); getActivity().getContentResolver().registerContentObserver( - AppProvider.getContentUri(this.app.id), true, appObserver); + AppProvider.getContentUri(this.app.packageName), true, appObserver); } resetView(); } @@ -372,7 +372,7 @@ public class SwapAppsView extends ListView implements */ private Apk getApkToInstall() { if (apkToInstall == null) { - apkToInstall = ApkProvider.Helper.find(getActivity(), app.id, app.suggestedVercode); + apkToInstall = ApkProvider.Helper.find(getActivity(), app.packageName, app.suggestedVercode); } return apkToInstall; } diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 39f889f55..3c1dc267b 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -781,14 +781,14 @@ public class SwapWorkflowActivity extends AppCompatActivity { } public void install(@NonNull final App app) { - final Apk apkToInstall = ApkProvider.Helper.find(this, app.id, app.suggestedVercode); + final Apk apkToInstall = ApkProvider.Helper.find(this, app.packageName, app.suggestedVercode); final ApkDownloader downloader = new ApkDownloader(this, app, apkToInstall, apkToInstall.repoAddress); downloader.setProgressListener(new ProgressListener() { @Override public void onProgress(Event event) { switch (event.type) { case ApkDownloader.EVENT_APK_DOWNLOAD_COMPLETE: - handleDownloadComplete(downloader.localFile(), app.id); + handleDownloadComplete(downloader.localFile(), app.packageName); break; case ApkDownloader.EVENT_ERROR: break; diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java index 6b6dfacf2..b2168025c 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java @@ -93,7 +93,7 @@ public class AppProviderTest extends FDroidProviderTest { assertValidUri(AppProvider.getCanUpdateUri()); App app = new App(); - app.id = "org.fdroid.fdroid"; + app.packageName = "org.fdroid.fdroid"; List apps = new ArrayList<>(1); apps.add(app); @@ -178,7 +178,7 @@ public class AppProviderTest extends FDroidProviderTest { canUpdateCursor.moveToFirst(); List canUpdateIds = new ArrayList<>(canUpdateCursor.getCount()); while (!canUpdateCursor.isAfterLast()) { - canUpdateIds.add(new App(canUpdateCursor).id); + canUpdateIds.add(new App(canUpdateCursor).packageName); canUpdateCursor.moveToNext(); } canUpdateCursor.close(); @@ -230,7 +230,7 @@ public class AppProviderTest extends FDroidProviderTest { private void assertContainsOnlyIds(List actualApps, String[] expectedIds) { List actualIds = new ArrayList<>(actualApps.size()); for (App app : actualApps) { - actualIds.add(app.id); + actualIds.add(app.packageName); } TestUtils.assertContainsOnly(actualIds, expectedIds); } @@ -282,7 +282,7 @@ public class AppProviderTest extends FDroidProviderTest { cursor.moveToFirst(); App app = new App(cursor); cursor.close(); - assertEquals("org.fdroid.fdroid", app.id); + assertEquals("org.fdroid.fdroid", app.packageName); assertEquals("F-Droid", app.name); } diff --git a/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java b/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java index 21bab2c5f..3e70b0b22 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java @@ -596,7 +596,7 @@ public class RepoXMLHandlerTest extends AndroidTestCase { for (String id : expctedAppIds) { boolean thisAppMissing = true; for (App app : actualApps) { - if (TextUtils.equals(app.id, id)) { + if (TextUtils.equals(app.packageName, id)) { thisAppMissing = false; break; } diff --git a/F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java b/F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java index 1a983865c..39e649981 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java +++ b/F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java @@ -9,7 +9,7 @@ public class MockApp extends App { } public MockApp(String id, String name) { - this.id = id; + this.packageName = id; this.name = name; } From 038816e32ab12ffec68da9930678bd22616cc94b Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Mon, 21 Dec 2015 21:07:45 +1100 Subject: [PATCH 3/3] 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; }