Merge pull request #150 from amitshekhariitbhu/development

Fix query & class not found error
amitshekhariitbhu · Mar 7, 2019 · 1cb6137 · 1cb6137
2 parents d14adf9 + cfdf936
commit 1cb6137
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Change Log
 ==========
 
+Version 1.0.6 *(2019-03-07)*
+----------------------------
+
+* Fix: Fix query error
+* Fix: Fix DebugDb class not found error
+
+
 Version 1.0.5 *(2019-02-18)*
 ----------------------------
 

diff --git a/README.md b/README.md
@@ -40,13 +40,13 @@
 Add this to your app's build.gradle
 
 ```groovy
-debugImplementation 'com.amitshekhar.android:debug-db:1.0.5'
+debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 ```
 
 Using the Android Debug Database with encrypted database
 
 ```groovy
-debugImplementation 'com.amitshekhar.android:debug-db-encrypt:1.0.5'
+debugImplementation 'com.amitshekhar.android:debug-db-encrypt:1.0.6'
 ```
 
 Use `debugImplementation` so that it will only compile in your debug build and not in your release build.

diff --git a/debug-db-base/debug-db-base-upload.gradle b/debug-db-base/debug-db-base-upload.gradle
@@ -24,7 +24,7 @@ def siteUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database'
 def gitUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database.git'
 
 group = "com.amitshekhar.android"
-version = '1.0.5'
+version = '1.0.6'
 
 install {
  repositories.mavenInstaller {

diff --git a/debug-db-base/src/main/java/com/amitshekhar/utils/DatabaseHelper.java b/debug-db-base/src/main/java/com/amitshekhar/utils/DatabaseHelper.java
@@ -124,6 +124,25 @@ public static TableDataResponse getTableData(SQLiteDB db, String selectQuery, St
 
  tableData.isSuccessful = true;
  tableData.rows = new ArrayList<>();
+
+ String[] columnNames = cursor.getColumnNames();
+
+ List<TableDataResponse.TableInfo> tableInfoListModified = new ArrayList<>();
+
+ for (String columnName : columnNames) {
+ for (TableDataResponse.TableInfo tableInfo : tableData.tableInfos) {
+ if (columnName.equals(tableInfo.title)) {
+ tableInfoListModified.add(tableInfo);
+ break;
+ }
+ }
+ }
+
+ if (tableData.tableInfos.size() != tableInfoListModified.size()) {
+ tableData.tableInfos = tableInfoListModified;
+ tableData.isEditable = false;
+ }
+
  if (cursor.getCount() > 0) {
 
  do {

diff --git a/debug-db-encrypt/build.gradle b/debug-db-encrypt/build.gradle
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
- implementation project(':debug-db-base')
+ api project(':debug-db-base')
  implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
  testImplementation 'junit:junit:4.12'
  androidTestImplementation 'com.android.support.test:runner:1.0.2'

diff --git a/debug-db-encrypt/debug-db-encrypt-upload.gradle b/debug-db-encrypt/debug-db-encrypt-upload.gradle
@@ -24,7 +24,7 @@ def siteUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database'
 def gitUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database.git'
 
 group = "com.amitshekhar.android"
-version = '1.0.5'
+version = '1.0.6'
 
 install {
  repositories.mavenInstaller {

diff --git a/debug-db/build.gradle b/debug-db/build.gradle
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
- implementation project(':debug-db-base')
+ api project(':debug-db-base')
  testImplementation 'junit:junit:4.12'
  androidTestImplementation 'com.android.support.test:runner:1.0.2'
  androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

diff --git a/debug-db/debug-db-upload.gradle b/debug-db/debug-db-upload.gradle
@@ -24,7 +24,7 @@ def siteUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database'
 def gitUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database.git'
 
 group = "com.amitshekhar.android"
-version = '1.0.5'
+version = '1.0.6'
 
 install {
  repositories.mavenInstaller {