From 3077dc24eccc67bc20cf276fae39adfc5f5fa481 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 3 Apr 2021 11:38:01 -0400 Subject: [PATCH] Move BiometricUtil to correct package (cherry picked from commit 1237af1ff328702c6f8a02187f0bb51917008633) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt --- .../eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt | 2 +- .../eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt | 2 +- .../kanade/tachiyomi/ui/setting/SettingsSecurityController.kt | 2 +- .../kanade/tachiyomi/{widget => util/system}/BiometricUtil.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/java/eu/kanade/tachiyomi/{widget => util/system}/BiometricUtil.kt (95%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt index c3e0c51fc..e346c3d67 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricUnlockActivity.kt @@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.biometric.BiometricPrompt import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.widget.BiometricUtil +import eu.kanade.tachiyomi.util.system.BiometricUtil import uy.kohesive.injekt.injectLazy import java.util.Date import java.util.concurrent.Executors diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt index aee89e9ba..7425bc708 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt @@ -6,7 +6,7 @@ import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.category.biometric.TimeRange -import eu.kanade.tachiyomi.widget.BiometricUtil +import eu.kanade.tachiyomi.util.system.BiometricUtil import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt index 826baf0cf..148d48566 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt @@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.util.preference.preference import eu.kanade.tachiyomi.util.preference.summaryRes import eu.kanade.tachiyomi.util.preference.switchPreference import eu.kanade.tachiyomi.util.preference.titleRes -import eu.kanade.tachiyomi.widget.BiometricUtil +import eu.kanade.tachiyomi.util.system.BiometricUtil import kotlinx.coroutines.flow.launchIn import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/BiometricUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/BiometricUtil.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/widget/BiometricUtil.kt rename to app/src/main/java/eu/kanade/tachiyomi/util/system/BiometricUtil.kt index ebc091200..1f42f3d7d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/BiometricUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/BiometricUtil.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.widget +package eu.kanade.tachiyomi.util.system import android.content.Context import androidx.biometric.BiometricManager