Remove unnecessary bookmarks DB code (#1870)

We are already using AC for bookmarks so this code along with the migration code shouldn't be necessary anymore and should be safe to remove.
MozillaReality · Sep 26, 2019 · 5e4d0fc · 5e4d0fc
1 parent b1ccb24
commit 5e4d0fc
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 460 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,12 +51,6 @@ android {
                 arguments "-DANDROID_STL=c++_shared"
             }
         }
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
     }
 
     if (gradle.hasProperty('userProperties.taskclusterBuild')) {
@@ -418,8 +412,6 @@ dependencies {
 
     // Common
     // implementation deps.google_vr.sdk_audio
-    implementation deps.room.runtime
-    annotationProcessor deps.room.compiler
     implementation deps.lifecycle.runtime
     implementation deps.lifecycle.extensions
     implementation deps.support.cardview
@@ -453,7 +445,6 @@ dependencies {
     testImplementation deps.junit
     androidTestImplementation deps.atsl.runner
     androidTestImplementation deps.espresso.core
-    testImplementation deps.room.testing
 
     // Daydream
     googlevrImplementation deps.google_vr.sdk_base

diff --git a/app/schemas/org.mozilla.vrbrowser.db.AppDatabase/1.json b/app/schemas/org.mozilla.vrbrowser.db.AppDatabase/1.json
diff --git a/app/schemas/org.mozilla.vrbrowser.db.BookmarkDatabase/1.json b/app/schemas/org.mozilla.vrbrowser.db.BookmarkDatabase/1.json
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/DataRepository.java b/app/src/common/shared/org/mozilla/vrbrowser/DataRepository.java
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -212,7 +212,6 @@ protected void onCreate(Bundle savedInstanceState) {
         Bundle extras = getIntent() != null ? getIntent().getExtras() : null;
         SessionStore.get().setContext(this, extras);
         SessionStore.get().initializeStores(this);
-        ((VRBrowserApplication)getApplication()).getRepository().migrateOldBookmarks();
 
         // Create broadcast receiver for getting crash messages from crash process
         IntentFilter intentFilter = new IntentFilter();

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserApplication.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserApplication.java
@@ -10,7 +10,6 @@
 import android.content.res.Configuration;
 
 import org.mozilla.vrbrowser.browser.Places;
-import org.mozilla.vrbrowser.db.AppDatabase;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
 import org.mozilla.vrbrowser.utils.LocaleUtils;
 
@@ -41,14 +40,6 @@ public void onConfigurationChanged(Configuration newConfig) {
         LocaleUtils.setLocale(this);
     }
 
-    public AppDatabase getDatabase() {
-        return AppDatabase.getInstance(this, mAppExecutors);
-    }
-
-    public DataRepository getRepository() {
-        return DataRepository.getInstance(getDatabase(), mAppExecutors);
-    }
-
     public Places getPlaces() {
         return mPlaces;
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/db/AppDatabase.java b/app/src/common/shared/org/mozilla/vrbrowser/db/AppDatabase.java
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/db/converter/DateConverter.java b/app/src/common/shared/org/mozilla/vrbrowser/db/converter/DateConverter.java