Merge pull request #117 from amitshekhariitbhu/fix-room-1.1.0

Fix room 1.1.0
amitshekhariitbhu · Jun 23, 2018 · 0d6e118 · 0d6e118
2 parents 9f085dd + 52ba8b4
commit 0d6e118
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,10 +47,10 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:27.0.0'
+    compile 'com.android.support:appcompat-v7:27.1.1'
     testCompile 'junit:junit:4.12'
     compile 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
-    compile "android.arch.persistence.room:runtime:1.0.0"
-    annotationProcessor "android.arch.persistence.room:compiler:1.0.0"
+    compile "android.arch.persistence.room:runtime:1.1.0"
+    annotationProcessor "android.arch.persistence.room:compiler:1.1.0"
     debugCompile project(':debug-db')
 }
diff --git a/debug-db/build.gradle b/debug-db/build.gradle
@@ -48,9 +48,9 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-    compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.google.code.gson:gson:2.8.2'
     compile 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
-    compile "android.arch.persistence.room:runtime:1.0.0"
+    compile "android.arch.persistence.room:runtime:1.1.0"
 }
 
 //apply from: 'debug-db-upload.gradle'
diff --git a/debug-db/src/main/assets/app.js b/debug-db/src/main/assets/app.js
@@ -72,7 +72,7 @@ function getDBList() {
              var isEncrypted = dbList[count][1];
              var isDownloadable = dbList[count][2];
              var dbAttribute = isEncrypted == "true" ? ' <span class="glyphicon glyphicon-lock" aria-hidden="true" style="color:blue"></span>' : "";
-             if(dbName.indexOf("journal") == -1){
+             if(dbName.indexOf("journal") == -1 && dbName.indexOf("-wal") == -1 && dbName.indexOf("-shm") == -1){
                 $("#db-list").append("<a href='#' id=" + dbName + " class='list-group-item' onClick='openDatabaseAndGetTableList(\""+ dbName + "\", \""+ isDownloadable + "\");'>" + dbName + dbAttribute + "</a>");
                 if(!isSelectionDone){
                     isSelectionDone = true;