settings: smoother clear data (fixes #3755) (#3756)

Co-authored-by: dogi <[email protected]>

Author: Okuro3499

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1644
-        versionName "0.16.44"
+        versionCode 1645
+        versionName "0.16.45"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/org/ole/planet/myplanet/ui/SettingActivity.kt

@@ -25,6 +25,9 @@ import org.ole.planet.myplanet.service.UserProfileDbHandler
 import org.ole.planet.myplanet.ui.dashboard.DashboardActivity
 import org.ole.planet.myplanet.ui.dashboard.DashboardFragment
 import org.ole.planet.myplanet.ui.sync.LoginActivity
+import org.ole.planet.myplanet.ui.sync.SyncActivity.Companion.clearRealmDb
+import org.ole.planet.myplanet.ui.sync.SyncActivity.Companion.clearSharedPref
+import org.ole.planet.myplanet.ui.sync.SyncActivity.Companion.restartApp
 import org.ole.planet.myplanet.utilities.Constants.PREFS_NAME
 import org.ole.planet.myplanet.utilities.DialogUtils
 import org.ole.planet.myplanet.utilities.FileUtils.availableOverTotalMemoryFormattedString
@@ -100,15 +103,9 @@ class SettingActivity : AppCompatActivity() {
                 preference.onPreferenceClickListener = OnPreferenceClickListener {
                     AlertDialog.Builder(requireActivity()).setTitle(R.string.are_you_sure)
                         .setPositiveButton(R.string.yes) { _: DialogInterface?, _: Int ->
-                            BaseResourceFragment.settings?.edit()?.clear()?.apply()
-                            mRealm.executeTransactionAsync(
-                                Realm.Transaction { realm: Realm -> realm.deleteAll() },
-                                Realm.Transaction.OnSuccess {
-                                    Utilities.toast(requireActivity(), R.string.data_cleared.toString())
-                                    startActivity(Intent(requireActivity(), LoginActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK))
-                                    openDashboard = false
-                                    requireActivity().finish()
-                                })
+                            clearRealmDb()
+                            clearSharedPref()
+                            restartApp()
                         }.setNegativeButton(R.string.no, null).show()
                     false
                 }

app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BaseDashboardFragment.kt

@@ -262,25 +262,26 @@ open class BaseDashboardFragment : BaseDashboardFragmentPlugin(), NotificationCa
 
     private fun setUpMyLife(userId: String?) {
         val realm = DatabaseService(requireContext()).realmInstance
-        val realmObjects = RealmMyLife.getMyLifeByUserId(mRealm, settings)
-        if (realmObjects.isEmpty()) {
-            if (!realm.isInTransaction) {
-                realm.beginTransaction()
-            }
-            val myLifeListBase = getMyLifeListBase(userId)
-            var ml: RealmMyLife
-            var weight = 1
-            for (item in myLifeListBase) {
-                ml = realm.createObject(RealmMyLife::class.java, UUID.randomUUID().toString())
-                ml.title = item.title
-                ml.imageId = item.imageId
-                ml.weight = weight
-                ml.userId = item.userId
-                ml.isVisible = true
-                weight++
+        realm.executeTransactionAsync({ realmTransaction ->
+            val realmObjects = RealmMyLife.getMyLifeByUserId(realmTransaction, settings)
+            if (realmObjects.isEmpty()) {
+                val myLifeListBase = getMyLifeListBase(userId)
+                var weight = 1
+                for (item in myLifeListBase) {
+                    val ml = realmTransaction.createObject(RealmMyLife::class.java, UUID.randomUUID().toString())
+                    ml.title = item.title
+                    ml.imageId = item.imageId
+                    ml.weight = weight
+                    ml.userId = item.userId
+                    ml.isVisible = true
+                    weight++
+                }
             }
-            realm.commitTransaction()
-        }
+        }, {
+            realm.close()
+        }, {
+            realm.close()
+        })
     }
 
     private fun myLibraryItemClickAction(textView: TextView, items: RealmMyLibrary?) {

app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt

@@ -134,35 +134,6 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
             .show()
     }
 
-    private fun clearSharedPref() {
-        val keysToKeep = setOf(prefData.FIRSTLAUNCH)
-        val tempStorage = HashMap<String, Boolean>()
-        for (key in keysToKeep) {
-            tempStorage[key] = settings.getBoolean(key, false)
-        }
-        editor.clear().commit()
-        val editor = editor
-        for ((key, value) in tempStorage) {
-            editor.putBoolean(key, value)
-        }
-        editor.commit()
-    }
-
-    private fun clearRealmDb(){
-        val realm = Realm.getDefaultInstance()
-        realm.executeTransaction { transactionRealm ->
-            transactionRealm.deleteAll()
-        }
-        realm.close()
-    }
-
-    private fun restartApp() {
-        val intent = packageManager.getLaunchIntentForPackage(packageName)
-        val mainIntent = Intent.makeRestartActivityTask(intent?.component)
-        startActivity(mainIntent)
-        Runtime.getRuntime().exit(0)
-    }
-
     private fun clearInternalStorage() {
         val myDir = File(Utilities.SD_PATH)
         if (myDir.isDirectory) {
@@ -763,5 +734,35 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
     companion object {
         lateinit var cal_today: Calendar
         lateinit var cal_last_Sync: Calendar
+
+        fun clearRealmDb() {
+            val realm = Realm.getDefaultInstance()
+            realm.executeTransaction { transactionRealm ->
+                transactionRealm.deleteAll()
+            }
+            realm.close()
+        }
+
+        fun clearSharedPref() {
+            val settings = context.getSharedPreferences(PREFS_NAME, MODE_PRIVATE)
+            val editor = settings.edit()
+            val keysToKeep = setOf(SharedPrefManager(context).FIRSTLAUNCH)
+            val tempStorage = HashMap<String, Boolean>()
+            for (key in keysToKeep) {
+                tempStorage[key] = settings.getBoolean(key, false)
+            }
+            editor.clear().commit()
+            for ((key, value) in tempStorage) {
+                editor.putBoolean(key, value)
+            }
+            editor.commit()
+        }
+
+        fun restartApp() {
+            val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            val mainIntent = Intent.makeRestartActivityTask(intent?.component)
+            context.startActivity(mainIntent)
+            Runtime.getRuntime().exit(0)
+        }
     }
 }