[feat] Adjust settings download dir logic.

Author: tanpengcheng

app/src/main/java/com/tans/tfiletransporter/Settings.kt

@@ -10,6 +10,7 @@ import io.reactivex.rxjava3.subjects.Subject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asExecutor
 import java.io.File
+import java.io.IOException
 import java.util.concurrent.Executor
 import java.util.concurrent.atomic.AtomicReference
 
@@ -27,11 +28,11 @@ object Settings : Stateable<Settings.SettingsData> {
         AtomicReference(null)
     }
 
-    private val defaultDownloadDir by lazy {
+    val defaultDownloadDir: String by lazy {
         File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "tFileTransfer").canonicalPath
     }
 
-    private const val defaultConnectionSize = 4
+    private const val defaultConnectionSize = 6
 
 
     const val minConnectionSize = 1
@@ -41,8 +42,19 @@ object Settings : Stateable<Settings.SettingsData> {
             val sp = context.getSharedPreferences(SP_FILE_NAME, Context.MODE_PRIVATE)
             this.sp.set(sp)
             val s = updateState {
+                val storedDownloadDir = sp.getString(DOWNLOAD_DIR_KEY, defaultDownloadDir)?.let {
+                    if (isDirWriteable(it)) {
+                        it
+                    } else {
+                        sp.edit().let { et ->
+                            et.putString(DOWNLOAD_DIR_KEY, defaultDownloadDir)
+                            et.apply()
+                        }
+                        defaultDownloadDir
+                    }
+                }
                 SettingsData(
-                    downloadDir = sp.getString(DOWNLOAD_DIR_KEY, defaultDownloadDir) ?: defaultDownloadDir,
+                    downloadDir =  storedDownloadDir ?: defaultDownloadDir,
                     shareMyDir = sp.getBoolean(SHARE_MY_DIR_KEY, true),
                     transferFileMaxConnection = sp.getInt(MAX_CONNECTION_KEY, defaultConnectionSize),
                 )
@@ -59,29 +71,39 @@ object Settings : Stateable<Settings.SettingsData> {
     fun transferFileMaxConnection(): Single<Int> = stateStore.firstOrError()
         .map { fixTransferFileConnectionSize(it.transferFileMaxConnection) }
 
-    fun updateDownloadDir(dir: String) = updateState { s ->
-        sp.get()?.edit()?.let {
-            it.putString(DOWNLOAD_DIR_KEY, dir)
-            it.apply()
+    fun updateDownloadDir(dir: String): Single<Unit>  {
+        return if (isDirWriteable(dir)) {
+            updateState { s ->
+                if (dir != s.downloadDir) {
+                    sp.get()?.edit()?.let {
+                        it.putString(DOWNLOAD_DIR_KEY, dir)
+                        it.apply()
+                    }
+                    s.copy(downloadDir = dir)
+                } else {
+                    s
+                }
+            }.map { }
+        } else {
+            Single.error(IOException("$dir is not writeable dir."))
         }
-        s.copy(downloadDir = dir)
     }
 
-    fun updateShareDir(shareDir: Boolean) = updateState { s ->
+    fun updateShareDir(shareDir: Boolean): Single<Unit> = updateState { s ->
         sp.get()?.edit()?.let {
             it.putBoolean(SHARE_MY_DIR_KEY, shareDir)
             it.apply()
         }
         s.copy(shareMyDir = shareDir)
-    }
+    }.map {  }
 
-    fun updateTransferFileMaxConnection(maxConnection: Int) = updateState { s ->
+    fun updateTransferFileMaxConnection(maxConnection: Int): Single<Unit> = updateState { s ->
         sp.get()?.edit()?.let {
             it.putInt(MAX_CONNECTION_KEY, maxConnection)
             it.apply()
         }
         s.copy(transferFileMaxConnection = maxConnection)
-    }
+    }.map { }
 
     fun fixTransferFileConnectionSize(needToFix: Int): Int {
         return if (needToFix in minConnectionSize .. maxConnectionSize) {
@@ -91,6 +113,11 @@ object Settings : Stateable<Settings.SettingsData> {
         }
     }
 
+    fun isDirWriteable(dir: String): Boolean {
+        val f = File(dir)
+        return f.isDirectory && f.canWrite()
+    }
+
     data class SettingsData(
         val downloadDir: String = defaultDownloadDir,
         val shareMyDir: Boolean = true,

app/src/main/java/com/tans/tfiletransporter/ui/activity/commomdialog/SettingsDialog.kt

@@ -1,5 +1,6 @@
 package com.tans.tfiletransporter.ui.activity.commomdialog
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import com.jakewharton.rxbinding4.view.clicks
 import com.jakewharton.rxbinding4.widget.checkedChanges
@@ -8,34 +9,54 @@ import com.tans.tfiletransporter.R
 import com.tans.tfiletransporter.Settings
 import com.tans.tfiletransporter.databinding.SettingsDialogBinding
 import com.tans.tfiletransporter.ui.activity.BaseCustomDialog
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.rx3.await
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
 
 class SettingsDialog(context: Activity) : BaseCustomDialog<SettingsDialogBinding, Unit>(
     context = context,
     layoutId = R.layout.settings_dialog,
     defaultState = Unit,
 ) {
+    @SuppressLint("ClickableViewAccessibility")
     override fun bindingStart(binding: SettingsDialogBinding) {
-        launch {
-            binding.downloadDirTv.text = Settings.getDownloadDir().await()
-            binding.shareMyDirSt.isChecked = Settings.isShareMyDir().await()
-            binding.maxConnectionSb.min = Settings.minConnectionSize
-            binding.maxConnectionSb.max = Settings.maxConnectionSize
-            val connection = Settings.transferFileMaxConnection().await()
-            binding.maxConnectionSb.progress = connection
-            binding.maxConnectionTv.text = connection.toString()
+        // To solve seekbar in dialog ui problem.
+        binding.root.setOnTouchListener { _, _ -> true }
+        binding.maxConnectionSb.min = Settings.minConnectionSize
+        binding.maxConnectionSb.max = Settings.maxConnectionSize
+
+        fun <T : Any> observeSingleFromUI(map: (Settings.SettingsData) -> T): Observable<T> {
+            return Settings.bindState()
+                .map(map)
+                .distinctUntilChanged()
+                .observeOn(AndroidSchedulers.mainThread())
         }
 
+        observeSingleFromUI { it.downloadDir }
+            .doOnNext { binding.downloadDirTv.text = it }
+            .bindLife()
+
+        observeSingleFromUI { it.shareMyDir }
+            .doOnNext { binding.shareMyDirSt.isChecked = it }
+            .bindLife()
+
+        observeSingleFromUI { it.transferFileMaxConnection }
+            .doOnNext {
+                binding.maxConnectionSb.progress = it
+                binding.maxConnectionTv.text = it.toString()
+            }
+            .bindLife()
+
         binding.downloadDirEditIv.clicks()
             .doOnNext {
                 // TODO:
             }
             .bindLife()
 
         binding.downloadDirResetIv.clicks()
-            .doOnNext {
-                // TODO:
+            .flatMapSingle {
+                Settings.updateDownloadDir(Settings.defaultDownloadDir)
+                    .onErrorResumeNext { Single.just(Unit) }
             }
             .bindLife()
 

app/src/main/java/com/tans/tfiletransporter/ui/activity/qrcodescan/ScanQrCodeActivity.kt

@@ -101,6 +101,7 @@ class ScanQrCodeActivity : BaseActivity<ScanQrcodeActivityBinding, Unit>(
                                             i.putExtra(QR_CODE_RESULT_KEY, barcodeStrings)
                                             setResult(Activity.RESULT_OK, i)
                                             finish()
+                                            this@ScanQrCodeActivity.overridePendingTransition(0, 0)
                                         }
                                     }
                                 }