fix potential import / export issue

Helium314 · Apr 27, 2023 · b0a1791 · b0a1791
1 parent 509e0c4
commit b0a1791
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Removed
 - Not applicable
 
+## [1.2.8] - 2023-04-27
+### Changed
+- Fix potential import / export issue
+
 ## [1.2.7] - 2023-04-25
 ### Changed
 - Crash fix

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "helium314.localbackend"
         minSdkVersion 18
         targetSdkVersion 33
-        versionCode 35
-        versionName "1.2.7"
+        versionCode 36
+        versionName "1.2.8"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/org/fitchfamily/android/dejavu/SettingsActivity.kt b/app/src/main/java/org/fitchfamily/android/dejavu/SettingsActivity.kt
@@ -97,8 +97,8 @@ class SettingsActivity : PreferenceActivity() {
         prefs.unregisterOnSharedPreferenceChangeListener(listener)
         if (!importExportRunning) // avoid unpausing the backend while database is used
             BackendService.instance?.reloadSettings()
-        if (BackendService.instance == null)
-            Database.instance?.close()
+        // never close database here, this will happen automatically by GC if BackendService
+        // is not running: https://stackoverflow.com/a/35648781
     }
 
     private fun onClickCull() {
@@ -574,7 +574,7 @@ class SettingsActivity : PreferenceActivity() {
                 addView(t)
             })
         }
-        layout.setPadding(30,10,30,10)
+        layout.setPadding(30, 10, 30, 10)
         d = AlertDialog.Builder(this)
             .setTitle(R.string.show_scan_results)
             .setView(ScrollView(this).apply { addView(layout) })