Merge pull request #474 from PhenoApps/v5.2/hotfix_sort_quotes

fix for #473
PhenoApps · Aug 1, 2022 · 2d28c4c · 2d28c4c
2 parents 41e3918 + 6c8b5e2
commit 2d28c4c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 33 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         applicationId "com.fieldbook.tracker"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode = 523
+        versionCode = 524
         versionName = '5.2.0'
         multiDexEnabled true
     }

diff --git a/app/src/main/java/com/fieldbook/tracker/database/DataHelper.java b/app/src/main/java/com/fieldbook/tracker/database/DataHelper.java
@@ -2149,7 +2149,6 @@ public void deleteDatabase() {
 
     public void importDatabase(DocumentFile file) {
         String internalDbPath = getDatabasePath(this.context);
-        String internalSpPath = "/data/data/com.fieldbook.tracker/shared_prefs/Settings.xml";
 
         close();
 
@@ -2159,46 +2158,35 @@ public void importDatabase(DocumentFile file) {
 
             Log.w("File to copy", file.getName());
 
-            int extIndex = fileName.indexOf(".");
-            String stemName = fileName.substring(0, extIndex);
-            DocumentFile parent = file.getParentFile();
-
-            if (parent != null && parent.exists()) {
-
-                DocumentFile newSharedPrefsFile = parent.createFile("*/*", stemName + "_sharedpref.xml");
+            File oldDb = new File(internalDbPath);
 
-                File oldDb = new File(internalDbPath);
-                File oldSp = new File(internalSpPath);
+            try {
 
-                try {
+                BaseDocumentTreeUtil.Companion.copy(context, file, DocumentFile.fromFile(oldDb));
 
-                    BaseDocumentTreeUtil.Companion.copy(context, file, DocumentFile.fromFile(oldDb));
+            } catch (Exception e) {
 
-                    BaseDocumentTreeUtil.Companion.copy(context, newSharedPrefsFile, DocumentFile.fromFile(oldSp));
+                Log.d("Database", e.toString());
 
-                } catch (Exception e) {
-
-                    Log.d("Database", e.toString());
+            }
 
-                }
+            open();
 
-                open();
+            if (!isTableExists(Migrator.Study.tableName)) {
 
-                if (!isTableExists(Migrator.Study.tableName)) {
+                Migrator.Companion.migrateSchema(db, getAllTraitObjects());
 
-                    Migrator.Companion.migrateSchema(db, getAllTraitObjects());
+            }
 
-                }
+            SharedPreferences.Editor edit = ep.edit();
 
-                SharedPreferences.Editor edit = ep.edit();
+            edit.putInt(GeneralKeys.SELECTED_FIELD_ID, -1);
+            edit.putString(GeneralKeys.UNIQUE_NAME, "");
+            edit.putString(GeneralKeys.PRIMARY_NAME, "");
+            edit.putString(GeneralKeys.SECONDARY_NAME, "");
+            edit.putBoolean(GeneralKeys.IMPORT_FIELD_FINISHED, false);
+            edit.apply();
 
-                edit.putInt(GeneralKeys.SELECTED_FIELD_ID, -1);
-                edit.putString(GeneralKeys.UNIQUE_NAME, "");
-                edit.putString(GeneralKeys.PRIMARY_NAME, "");
-                edit.putString(GeneralKeys.SECONDARY_NAME, "");
-                edit.putBoolean(GeneralKeys.IMPORT_FIELD_FINISHED, false);
-                edit.apply();
-            }
         }
     }
 

diff --git a/app/src/main/java/com/fieldbook/tracker/database/dao/ObservationUnitPropertyDao.kt b/app/src/main/java/com/fieldbook/tracker/database/dao/ObservationUnitPropertyDao.kt
@@ -38,7 +38,7 @@ class ObservationUnitPropertyDao {
 
             sortCols = if(sortCols != null && sortCols != "") {
                 val sortColsSplit = sortCols.split(',')
-                val sortColsList = sortColsSplit.map{ "cast($it as integer),$it" }.toList()
+                val sortColsList = sortColsSplit.map{ "cast(`$it` as integer),`$it`" }.toList()
                 "${sortColsList.joinToString ( "," )}, id"
             } else {
                 "id"

diff --git a/app/src/main/java/com/fieldbook/tracker/preferences/DatabasePreferencesFragment.java b/app/src/main/java/com/fieldbook/tracker/preferences/DatabasePreferencesFragment.java
@@ -147,6 +147,8 @@ protected Integer doInBackground(Integer... params) {
 
             if (file != null && file.getName() != null) {
 
+                dt.close();
+
                 //first check if the file to import is just a .db file
                 if (file.getName().endsWith(".db")) { //if it is import it old-style
 
@@ -200,7 +202,9 @@ protected void onPostExecute(Integer result) {
                 dialog.dismiss();
 
             if (fail) {
+
                 Utils.makeToast(getContext(), getString(R.string.import_error_general));
+
             }
 
             CollectActivity.reloadData = true;

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed May 04 16:02:28 CDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME