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

Renamed Java constant APP_ID to PACKAGE_NAME

Browse Source 
In both the ApkProvider and the AppProvider.

Left the underlying database name as 'id' for now because it is
not as important or visible.
This commit is contained in:
Peter Serwylo 2015-12-19 09:21:24 +11:00
parent 6d7d19433e
commit 756df4d635
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
F-Droid/src/org/fdroid/fdroid/data/Apk.java
View File

@ -64,7 +64,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
case ApkProvider.DataColumns.FEATURES: case ApkProvider.DataColumns.FEATURES:
features = Utils.CommaSeparatedList.make(cursor.getString(i)); features = Utils.CommaSeparatedList.make(cursor.getString(i));
break; break;
case ApkProvider.DataColumns.APK_ID: case ApkProvider.DataColumns.PACKAGE_NAME:
id = cursor.getString(i); id = cursor.getString(i);
break; break;
case ApkProvider.DataColumns.IS_COMPATIBLE: case ApkProvider.DataColumns.IS_COMPATIBLE:
@ -123,7 +123,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
public ContentValues toContentValues() { public ContentValues toContentValues() {
ContentValues values = new ContentValues(); 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, version);
values.put(ApkProvider.DataColumns.VERSION_CODE, vercode); values.put(ApkProvider.DataColumns.VERSION_CODE, vercode);
values.put(ApkProvider.DataColumns.REPO_ID, repo); values.put(ApkProvider.DataColumns.REPO_ID, repo);

10
F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
View File

@ -194,7 +194,7 @@ public class ApkProvider extends FDroidProvider {
String _COUNT_DISTINCT_ID = "countDistinct"; String _COUNT_DISTINCT_ID = "countDistinct";
String APK_ID = "id"; String PACKAGE_NAME = "id";
String VERSION = "version"; String VERSION = "version";
String REPO_ID = "repo"; String REPO_ID = "repo";
String HASH = "hash"; String HASH = "hash";
@ -216,7 +216,7 @@ public class ApkProvider extends FDroidProvider {
String REPO_ADDRESS = "repoAddress"; String REPO_ADDRESS = "repoAddress";
String[] ALL = { 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, SIGNATURE, SOURCE_NAME, MIN_SDK_VERSION, MAX_SDK_VERSION,
PERMISSIONS, FEATURES, NATIVE_CODE, HASH_TYPE, ADDED_DATE, PERMISSIONS, FEATURES, NATIVE_CODE, HASH_TYPE, ADDED_DATE,
IS_COMPATIBLE, REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS, IS_COMPATIBLE, REPO_VERSION, REPO_ADDRESS, INCOMPATIBLE_REASONS,
@ -395,7 +395,7 @@ public class ApkProvider extends FDroidProvider {
} }
private QuerySelection queryApp(String appId) { private QuerySelection queryApp(String appId) {
final String selection = DataColumns.APK_ID + " = ? "; final String selection = DataColumns.PACKAGE_NAME + " = ? ";
final String[] args = {appId}; final String[] args = {appId};
return new QuerySelection(selection, args); return new QuerySelection(selection, args);
} }
@ -418,7 +418,7 @@ public class ApkProvider extends FDroidProvider {
} }
private QuerySelection queryRepoApps(long repoId, String appIds) { 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) { protected QuerySelection queryApks(String apkKeys) {
@ -512,7 +512,7 @@ public class ApkProvider extends FDroidProvider {
getContext().getContentResolver().notifyChange(uri, null); getContext().getContentResolver().notifyChange(uri, null);
} }
return getContentUri( return getContentUri(
values.getAsString(DataColumns.APK_ID), values.getAsString(DataColumns.PACKAGE_NAME),
values.getAsInteger(DataColumns.VERSION_CODE)); values.getAsInteger(DataColumns.VERSION_CODE));
} }

4
F-Droid/src/org/fdroid/fdroid/data/App.java
View File

@ -124,7 +124,7 @@ public class App extends ValueObject implements Comparable<App> {
case AppProvider.DataColumns.IS_COMPATIBLE: case AppProvider.DataColumns.IS_COMPATIBLE:
compatible = cursor.getInt(i) == 1; compatible = cursor.getInt(i) == 1;
break; break;
case AppProvider.DataColumns.APP_ID: case AppProvider.DataColumns.PACKAGE_NAME:
id = cursor.getString(i); id = cursor.getString(i);
break; break;
case AppProvider.DataColumns.NAME: case AppProvider.DataColumns.NAME:
@ -369,7 +369,7 @@ public class App extends ValueObject implements Comparable<App> {
public ContentValues toContentValues() { public ContentValues toContentValues() {
final ContentValues values = new ContentValues(); 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.NAME, name);
values.put(AppProvider.DataColumns.SUMMARY, summary); values.put(AppProvider.DataColumns.SUMMARY, summary);
values.put(AppProvider.DataColumns.ICON, icon); values.put(AppProvider.DataColumns.ICON, icon);

6
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -173,7 +173,7 @@ public class AppProvider extends FDroidProvider {
String _ID = "rowid as _id"; // Required for CursorLoaders String _ID = "rowid as _id"; // Required for CursorLoaders
String _COUNT = "_count"; String _COUNT = "_count";
String IS_COMPATIBLE = "compatible"; String IS_COMPATIBLE = "compatible";
String APP_ID = "id"; String PACKAGE_NAME = "id";
String NAME = "name"; String NAME = "name";
String SUMMARY = "summary"; String SUMMARY = "summary";
String ICON = "icon"; String ICON = "icon";
@ -211,7 +211,7 @@ public class AppProvider extends FDroidProvider {
} }
String[] ALL = { 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, LICENSE, WEB_URL, TRACKER_URL, SOURCE_URL, CHANGELOG_URL, DONATE_URL,
BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID, BITCOIN_ADDR, LITECOIN_ADDR, FLATTR_ID,
UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED, UPSTREAM_VERSION, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED,
@ -851,7 +851,7 @@ public class AppProvider extends FDroidProvider {
if (!isApplyingBatch()) { if (!isApplyingBatch()) {
getContext().getContentResolver().notifyChange(uri, null); getContext().getContentResolver().notifyChange(uri, null);
} }
return getContentUri(values.getAsString(DataColumns.APP_ID)); return getContentUri(values.getAsString(DataColumns.PACKAGE_NAME));
} }
@Override @Override

6
F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
View File

@ -161,7 +161,7 @@ public class RepoPersister {
*/ */
private ArrayList<ContentProviderOperation> insertOrUpdateApks(List<Apk> packages) { private ArrayList<ContentProviderOperation> insertOrUpdateApks(List<Apk> packages) {
String[] projection = new String[]{ String[] projection = new String[]{
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.PACKAGE_NAME,
ApkProvider.DataColumns.VERSION_CODE, ApkProvider.DataColumns.VERSION_CODE,
}; };
List<Apk> existingApks = ApkProvider.Helper.knownApks(context, packages, projection); List<Apk> existingApks = ApkProvider.Helper.knownApks(context, packages, projection);
@ -216,7 +216,7 @@ public class RepoPersister {
* array. * array.
*/ */
private boolean isAppInDatabase(App app) { 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); App found = AppProvider.Helper.findById(context.getContentResolver(), app.id, fields);
return found != null; return found != null;
} }
@ -247,7 +247,7 @@ public class RepoPersister {
*/ */
@Nullable @Nullable
private ContentProviderOperation deleteOrphanedApks(List<App> apps, Map<String, List<Apk>> packages) { private ContentProviderOperation deleteOrphanedApks(List<App> apps, Map<String, List<Apk>> 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<Apk> existing = ApkProvider.Helper.find(context, repo, apps, projection); List<Apk> existing = ApkProvider.Helper.find(context, repo, apps, projection);
List<Apk> toDelete = new ArrayList<>(); List<Apk> toDelete = new ArrayList<>();

2
F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
View File

@ -35,7 +35,7 @@ public abstract class AppListFragment extends ListFragment implements
public static final String[] APP_PROJECTION = { public static final String[] APP_PROJECTION = {
AppProvider.DataColumns._ID, // Required for cursor loader to work. AppProvider.DataColumns._ID, // Required for cursor loader to work.
AppProvider.DataColumns.APP_ID, AppProvider.DataColumns.PACKAGE_NAME,
AppProvider.DataColumns.NAME, AppProvider.DataColumns.NAME,
AppProvider.DataColumns.SUMMARY, AppProvider.DataColumns.SUMMARY,
AppProvider.DataColumns.IS_COMPATIBLE, AppProvider.DataColumns.IS_COMPATIBLE,

4
F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java
View File

@ -56,7 +56,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
Collections.addAll(apksToCheck, unknown); Collections.addAll(apksToCheck, unknown);
String[] projection = { String[] projection = {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.PACKAGE_NAME,
ApkProvider.DataColumns.VERSION_CODE, ApkProvider.DataColumns.VERSION_CODE,
}; };
@ -183,7 +183,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
assertEquals("a hash type", apk.hashType); assertEquals("a hash type", apk.hashType);
String[] projection = { String[] projection = {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.PACKAGE_NAME,
ApkProvider.DataColumns.HASH, ApkProvider.DataColumns.HASH,
}; };

2
F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java
View File

@ -251,7 +251,7 @@ public class ApkProviderTest extends BaseApkProviderTest {
// And now we should be able to recover these values from the apk // And now we should be able to recover these values from the apk
// value object (because the queryAllApks() helper asks for VERSION_CODE and // value object (because the queryAllApks() helper asks for VERSION_CODE and
// APK_ID. // PACKAGE_NAME.
cursor.moveToFirst(); cursor.moveToFirst();
Apk toCheck = new Apk(cursor); Apk toCheck = new Apk(cursor);
cursor.close(); cursor.close();

6
F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
View File

@ -37,7 +37,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
@Override @Override
protected String[] getMinimalProjection() { protected String[] getMinimalProjection() {
return new String[] { return new String[] {
AppProvider.DataColumns.APP_ID, AppProvider.DataColumns.PACKAGE_NAME,
AppProvider.DataColumns.NAME, AppProvider.DataColumns.NAME,
}; };
} }
@ -209,7 +209,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
assertResultCount(10, AppProvider.getContentUri()); assertResultCount(10, AppProvider.getContentUri());
String[] projection = {AppProvider.DataColumns.APP_ID}; String[] projection = {AppProvider.DataColumns.PACKAGE_NAME};
List<App> ignoredApps = AppProvider.Helper.findIgnored(getMockContext(), projection); List<App> ignoredApps = AppProvider.Helper.findIgnored(getMockContext(), projection);
String[] expectedIgnored = { String[] expectedIgnored = {
@ -278,7 +278,7 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
// And now we should be able to recover these values from the app // And now we should be able to recover these values from the app
// value object (because the queryAllApps() helper asks for NAME and // value object (because the queryAllApps() helper asks for NAME and
// APP_ID. // PACKAGE_NAME.
cursor.moveToFirst(); cursor.moveToFirst();
App app = new App(cursor); App app = new App(cursor);
cursor.close(); cursor.close();

2
F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java
View File

@ -26,7 +26,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest<ApkProvider> {
@Override @Override
protected String[] getMinimalProjection() { protected String[] getMinimalProjection() {
return new String[] { return new String[] {
ApkProvider.DataColumns.APK_ID, ApkProvider.DataColumns.PACKAGE_NAME,
ApkProvider.DataColumns.VERSION_CODE, ApkProvider.DataColumns.VERSION_CODE,
ApkProvider.DataColumns.NAME, ApkProvider.DataColumns.NAME,
ApkProvider.DataColumns.REPO_ID, ApkProvider.DataColumns.REPO_ID,

4
F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java
View File

@ -71,7 +71,7 @@ public class InstalledAppCacheTest extends FDroidProviderTest<InstalledAppProvid
private String[] getInstalledAppIdsFromProvider() { private String[] getInstalledAppIdsFromProvider() {
Uri uri = InstalledAppProvider.getContentUri(); Uri uri = InstalledAppProvider.getContentUri();
String[] projection = { InstalledAppProvider.DataColumns.APP_ID }; String[] projection = { InstalledAppProvider.DataColumns.PACKAGE_NAME };
Cursor result = getMockContext().getContentResolver().query(uri, projection, null, null, null); Cursor result = getMockContext().getContentResolver().query(uri, projection, null, null, null);
if (result == null) { if (result == null) {
return new String[0]; return new String[0];
@ -81,7 +81,7 @@ public class InstalledAppCacheTest extends FDroidProviderTest<InstalledAppProvid
result.moveToFirst(); result.moveToFirst();
int i = 0; int i = 0;
while (!result.isAfterLast()) { while (!result.isAfterLast()) {
installedAppIds[i] = result.getString(result.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID)); installedAppIds[i] = result.getString(result.getColumnIndex(InstalledAppProvider.DataColumns.PACKAGE_NAME));
result.moveToNext(); result.moveToNext();
i ++; i ++;
} }

4
F-Droid/test/src/org/fdroid/fdroid/TestUtils.java
View File

@ -101,7 +101,7 @@ public class TestUtils {
public static void insertApp(ContentResolver resolver, String id, String name, ContentValues additionalValues) { public static void insertApp(ContentResolver resolver, String id, String name, ContentValues additionalValues) {
ContentValues values = new ContentValues(); 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.NAME, name);
// Required fields (NOT NULL in the database). // Required fields (NOT NULL in the database).
@ -127,7 +127,7 @@ public class TestUtils {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(ApkProvider.DataColumns.APK_ID, id); values.put(ApkProvider.DataColumns.PACKAGE_NAME, id);
values.put(ApkProvider.DataColumns.VERSION_CODE, versionCode); values.put(ApkProvider.DataColumns.VERSION_CODE, versionCode);
// Required fields (NOT NULL in the database). // Required fields (NOT NULL in the database).