javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases 5 Wiki Activity

Migrate some RxSharedPreferences to FlowSharedPreferences

Browse Source
This commit is contained in:
arkon
2020-04-17 09:28:58 -04:00
parent f7b3450d65
commit beb81b657e
7 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
-6
View File
@@ -77,10 +77,4 @@ abstract class BaseActivity : AppCompatActivity() {
secureActivityDelegate.onResume()
}
override fun onDestroy() {
secureActivityDelegate.onDestroy()
super.onDestroy()
}
}
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt
-6
View File
@@ -27,10 +27,4 @@ abstract class BaseRxActivity<P : BasePresenter<*>> : NucleusAppCompatActivity<P
secureActivityDelegate.onResume()
}
override fun onDestroy() {
secureActivityDelegate.onDestroy()
super.onDestroy()
}
}
app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
+16 -17
View File
@@ -5,30 +5,33 @@ import android.view.WindowManager
import androidx.biometric.BiometricManager
import androidx.fragment.app.FragmentActivity
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault
import java.util.Date
import rx.Subscription
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import uy.kohesive.injekt.injectLazy
class SecureActivityDelegate(private val activity: FragmentActivity) {
private val preferences by injectLazy<PreferencesHelper>()
private var secureScreenSubscription: Subscription? = null
private val uiScope = CoroutineScope(Dispatchers.Main)
fun onCreate() {
secureScreenSubscription = preferences.secureScreen().asObservable()
.subscribe {
if (it) {
activity.window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
} else {
activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
preferences.secureScreen().asFlow()
.onEach {
if (it) {
activity.window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
} else {
activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
}
.launchIn(uiScope)
}
fun onResume() {
val lockApp = preferences.useBiometricLock().getOrDefault()
val lockApp = preferences.useBiometricLock().get()
if (lockApp && BiometricManager.from(activity).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS) {
if (isAppLocked()) {
val intent = Intent(activity, BiometricUnlockActivity::class.java)
@@ -40,14 +43,10 @@ class SecureActivityDelegate(private val activity: FragmentActivity) {
}
}
fun onDestroy() {
secureScreenSubscription?.unsubscribe()
}
private fun isAppLocked(): Boolean {
return locked &&
(preferences.lockAppAfter().getOrDefault() <= 0 ||
Date().time >= preferences.lastAppUnlock().getOrDefault() + 60 * 1000 * preferences.lockAppAfter().getOrDefault())
(preferences.lockAppAfter().get() <= 0 ||
Date().time >= preferences.lastAppUnlock().get() + 60 * 1000 * preferences.lockAppAfter().get())
}
companion object {
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
+10 -2
View File
@@ -9,9 +9,15 @@ import eu.kanade.tachiyomi.util.preference.intListPreference
import eu.kanade.tachiyomi.util.preference.summaryRes
import eu.kanade.tachiyomi.util.preference.switchPreference
import eu.kanade.tachiyomi.util.preference.titleRes
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
class SettingsSecurityController : SettingsController() {
private val uiScope = CoroutineScope(Dispatchers.Main)
override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
titleRes = R.string.pref_category_security
@@ -36,8 +42,10 @@ class SettingsSecurityController : SettingsController() {
defaultValue = "0"
summary = "%s"
preferences.useBiometricLock().asObservable()
.subscribeUntilDestroy { isVisible = it }
isVisible = preferences.useBiometricLock().get()
preferences.useBiometricLock().asFlow()
.onEach { isVisible = it }
.launchIn(uiScope)
}
}