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

Replaced DBHelper.TABLE_INSTALLED_APP with Schema.InstalledAppTable.NAME

Browse Source
This commit is contained in:
Peter Serwylo 2016-06-30 17:09:01 +10:00
parent 6fb23d2efa
commit 668cc27d29
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -274,7 +274,7 @@ public class AppProvider extends FDroidProvider {
public void naturalJoinToInstalledTable() { public void naturalJoinToInstalledTable() {
if (!requiresInstalledTable) { if (!requiresInstalledTable) {
join( join(
DBHelper.TABLE_INSTALLED_APP, InstalledAppTable.NAME,
"installed", "installed",
"installed." + InstalledAppTable.Cols.PACKAGE_NAME + " = " + getTableName() + ".id"); "installed." + InstalledAppTable.Cols.PACKAGE_NAME + " = " + getTableName() + ".id");
requiresInstalledTable = true; requiresInstalledTable = true;
@ -284,7 +284,7 @@ public class AppProvider extends FDroidProvider {
public void leftJoinToInstalledTable() { public void leftJoinToInstalledTable() {
if (!requiresInstalledTable) { if (!requiresInstalledTable) {
leftJoin( leftJoin(
DBHelper.TABLE_INSTALLED_APP, InstalledAppTable.NAME,
"installed", "installed",
"installed." + InstalledAppTable.Cols.PACKAGE_NAME + " = " + getTableName() + ".id"); "installed." + InstalledAppTable.Cols.PACKAGE_NAME + " = " + getTableName() + ".id");
requiresInstalledTable = true; requiresInstalledTable = true;

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

@ -93,8 +93,7 @@ class DBHelper extends SQLiteOpenHelper {
+ "iconUrlLarge text, " + "iconUrlLarge text, "
+ "primary key(id));"; + "primary key(id));";
public static final String TABLE_INSTALLED_APP = "fdroid_installedApp"; private static final String CREATE_TABLE_INSTALLED_APP = "CREATE TABLE " + InstalledAppTable.NAME
private static final String CREATE_TABLE_INSTALLED_APP = "CREATE TABLE " + TABLE_INSTALLED_APP
+ " ( " + " ( "
+ InstalledAppTable.Cols.PACKAGE_NAME + " TEXT NOT NULL PRIMARY KEY, " + InstalledAppTable.Cols.PACKAGE_NAME + " TEXT NOT NULL PRIMARY KEY, "
+ InstalledAppTable.Cols.VERSION_CODE + " INT NOT NULL, " + InstalledAppTable.Cols.VERSION_CODE + " INT NOT NULL, "
@ -105,7 +104,7 @@ class DBHelper extends SQLiteOpenHelper {
+ InstalledAppTable.Cols.HASH_TYPE + " TEXT NOT NULL, " + InstalledAppTable.Cols.HASH_TYPE + " TEXT NOT NULL, "
+ InstalledAppTable.Cols.HASH + " TEXT NOT NULL" + InstalledAppTable.Cols.HASH + " TEXT NOT NULL"
+ " );"; + " );";
private static final String DROP_TABLE_INSTALLED_APP = "DROP TABLE " + TABLE_INSTALLED_APP + ";"; private static final String DROP_TABLE_INSTALLED_APP = "DROP TABLE " + InstalledAppTable.NAME + ";";
private static final int DB_VERSION = 57; private static final int DB_VERSION = 57;

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

@ -13,6 +13,7 @@ import android.util.Log;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Schema.InstalledAppTable;
import org.fdroid.fdroid.data.Schema.InstalledAppTable.Cols; import org.fdroid.fdroid.data.Schema.InstalledAppTable.Cols;
import java.util.HashMap; import java.util.HashMap;
@ -99,7 +100,7 @@ public class InstalledAppProvider extends FDroidProvider {
@Override @Override
protected String getTableName() { protected String getTableName() {
return DBHelper.TABLE_INSTALLED_APP; return InstalledAppTable.NAME;
} }
@Override @Override

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

@ -145,7 +145,7 @@ public interface Schema {
interface InstalledAppTable { interface InstalledAppTable {
String NAME = DBHelper.TABLE_INSTALLED_APP; String NAME = "fdroid_installedApp";
interface Cols { interface Cols {
String _ID = "rowid as _id"; // Required for CursorLoaders String _ID = "rowid as _id"; // Required for CursorLoaders