From 668cc27d29555a005561847d486ddf607c847aff Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 30 Jun 2016 17:09:01 +1000
Subject: [PATCH] Replaced DBHelper.TABLE_INSTALLED_APP with
 Schema.InstalledAppTable.NAME

---
 app/src/main/java/org/fdroid/fdroid/data/AppProvider.java    | 4 ++--
 app/src/main/java/org/fdroid/fdroid/data/DBHelper.java       | 5 ++---
 .../java/org/fdroid/fdroid/data/InstalledAppProvider.java    | 3 ++-
 app/src/main/java/org/fdroid/fdroid/data/Schema.java         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 03be2c19b..f1d5e0b8d 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -274,7 +274,7 @@ public class AppProvider extends FDroidProvider {
         public void naturalJoinToInstalledTable() {
             if (!requiresInstalledTable) {
                 join(
-                        DBHelper.TABLE_INSTALLED_APP,
+                        InstalledAppTable.NAME,
                         "installed",
                         "installed." + InstalledAppTable.Cols.PACKAGE_NAME + " = " + getTableName() + ".id");
                 requiresInstalledTable = true;
@@ -284,7 +284,7 @@ public class AppProvider extends FDroidProvider {
         public void leftJoinToInstalledTable() {
             if (!requiresInstalledTable) {
                 leftJoin(
-                        DBHelper.TABLE_INSTALLED_APP,
+                        InstalledAppTable.NAME,
                         "installed",
                         "installed." + InstalledAppTable.Cols.PACKAGE_NAME + " = " + getTableName() + ".id");
                 requiresInstalledTable = true;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index 34a79d938..294dee31c 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -93,8 +93,7 @@ class DBHelper extends SQLiteOpenHelper {
             + "iconUrlLarge text, "
             + "primary key(id));";
 
-    public static final String TABLE_INSTALLED_APP = "fdroid_installedApp";
-    private static final String CREATE_TABLE_INSTALLED_APP = "CREATE TABLE " + TABLE_INSTALLED_APP
+    private static final String CREATE_TABLE_INSTALLED_APP = "CREATE TABLE " + InstalledAppTable.NAME
             + " ( "
             + InstalledAppTable.Cols.PACKAGE_NAME + " TEXT NOT NULL PRIMARY KEY, "
             + 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 + " 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;
 
diff --git a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
index c9d93b696..0bfeccee9 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java
@@ -13,6 +13,7 @@ import android.util.Log;
 
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.data.Schema.InstalledAppTable;
 import org.fdroid.fdroid.data.Schema.InstalledAppTable.Cols;
 
 import java.util.HashMap;
@@ -99,7 +100,7 @@ public class InstalledAppProvider extends FDroidProvider {
 
     @Override
     protected String getTableName() {
-        return DBHelper.TABLE_INSTALLED_APP;
+        return InstalledAppTable.NAME;
     }
 
     @Override
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
index f2c2bf3fb..2a8cbbc91 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
@@ -145,7 +145,7 @@ public interface Schema {
 
     interface InstalledAppTable {
 
-        String NAME = DBHelper.TABLE_INSTALLED_APP;
+        String NAME = "fdroid_installedApp";
 
         interface Cols {
             String _ID = "rowid as _id"; // Required for CursorLoaders