Merge pull request #3395 from owncloud/new_arch/biometric

[New arch] Biometric activity
owncloud · Oct 5, 2021 · a2c0f2b · a2c0f2b
2 parents a34fef5 + 914120b
commit a2c0f2b
Show file tree

Hide file tree

Showing 16 changed files with 416 additions and 398 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         appCompat = "1.2.0"
         sqliteVersion = "2.1.0"
         lifecycleLiveData = "2.3.1"
-        biometricVersion="1.0.1"
+        biometricVersion="1.1.0"
 
         // Kotlin
         kotlinVersion = "1.5.21"

diff --git a/...c/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt b/...c/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt
@@ -37,18 +37,18 @@ import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.platform.app.InstrumentationRegistry
 import com.owncloud.android.R
-import com.owncloud.android.authentication.BiometricManager
+import com.owncloud.android.presentation.ui.security.BiometricManager
 import com.owncloud.android.presentation.ui.security.PREFERENCE_LOCK_TIMEOUT
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment
 import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityViewModel
-import com.owncloud.android.ui.activity.BiometricActivity
+import com.owncloud.android.presentation.ui.security.BiometricActivity
 import com.owncloud.android.presentation.ui.security.PassCodeActivity
 import com.owncloud.android.presentation.ui.security.PatternActivity
 import com.owncloud.android.utils.matchers.verifyPreference
 import com.owncloud.android.utils.mockIntent
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkStatic
+import io.mockk.mockkObject
 import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Assert.assertFalse
@@ -72,8 +72,6 @@ class SettingsSecurityFragmentTest {
     private lateinit var prefLockApplication: ListPreference
     private lateinit var prefTouchesWithOtherVisibleWindows: CheckBoxPreference
 
-    private lateinit var biometricManager: BiometricManager
-
     private lateinit var securityViewModel: SettingsSecurityViewModel
     private lateinit var context: Context
 
@@ -83,10 +81,7 @@ class SettingsSecurityFragmentTest {
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
         securityViewModel = mockk(relaxUnitFun = true)
-        mockkStatic(BiometricManager::class)
-        biometricManager = mockk(relaxUnitFun = true)
-
-        every { BiometricManager.getBiometricManager(any()) } returns biometricManager
+        mockkObject(BiometricManager)
 
         stopKoin()
 
@@ -111,7 +106,7 @@ class SettingsSecurityFragmentTest {
     }
 
     private fun launchTest(withBiometrics: Boolean = true) {
-        every { biometricManager.isHardwareDetected } returns withBiometrics
+        every { BiometricManager.isHardwareDetected() } returns withBiometrics
 
         fragmentScenario = launchFragmentInContainer(themeResId = R.style.Theme_ownCloud)
         fragmentScenario.onFragment { fragment ->
@@ -311,7 +306,7 @@ class SettingsSecurityFragmentTest {
 
     @Test
     fun enableBiometricLockWithPasscodeEnabled() {
-        every { biometricManager.hasEnrolledBiometric() } returns true
+        every { BiometricManager.hasEnrolledBiometric() } returns true
 
         launchTest()
 
@@ -322,7 +317,7 @@ class SettingsSecurityFragmentTest {
 
     @Test
     fun enableBiometricLockWithPatternEnabled() {
-        every { biometricManager.hasEnrolledBiometric() } returns true
+        every { BiometricManager.hasEnrolledBiometric() } returns true
 
         launchTest()
 
@@ -333,7 +328,7 @@ class SettingsSecurityFragmentTest {
 
     @Test
     fun enableBiometricLockNoEnrolledBiometric() {
-        every { biometricManager.hasEnrolledBiometric() } returns false
+        every { BiometricManager.hasEnrolledBiometric() } returns false
 
         launchTest()
 
@@ -345,7 +340,7 @@ class SettingsSecurityFragmentTest {
 
     @Test
     fun disableBiometricLock() {
-        every { biometricManager.hasEnrolledBiometric() } returns true
+        every { BiometricManager.hasEnrolledBiometric() } returns true
 
         launchTest()
 

diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml
@@ -238,7 +238,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.ownCloud.Fullscreen" />
         <activity android:name=".presentation.ui.security.PatternActivity" />
-        <activity android:name=".ui.activity.BiometricActivity" />
+        <activity android:name=".presentation.ui.security.BiometricActivity" />
         <activity
             android:name=".presentation.ui.authentication.LoginActivity"
             android:exported="true"

diff --git a/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt b/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt
@@ -30,7 +30,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
-import com.owncloud.android.authentication.BiometricManager
+import com.owncloud.android.presentation.ui.security.BiometricManager
 import com.owncloud.android.presentation.ui.security.PassCodeManager
 import com.owncloud.android.presentation.ui.security.PatternManager
 import com.owncloud.android.datamodel.ThumbnailsCacheManager
@@ -46,7 +46,7 @@ import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.SingleSessionManager
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsLogsFragment
 import com.owncloud.android.providers.LogsProvider
-import com.owncloud.android.ui.activity.BiometricActivity
+import com.owncloud.android.presentation.ui.security.BiometricActivity
 import com.owncloud.android.presentation.ui.security.PassCodeActivity
 import com.owncloud.android.presentation.ui.security.PatternActivity
 import com.owncloud.android.ui.activity.WhatsNewActivity
@@ -118,7 +118,7 @@ class MainApp : Application() {
                 PassCodeManager.onActivityStarted(activity)
                 PatternManager.onActivityStarted(activity)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    BiometricManager.getBiometricManager(activity).onActivityStarted(activity)
+                    BiometricManager.onActivityStarted(activity)
                 }
             }
 
@@ -135,7 +135,7 @@ class MainApp : Application() {
                 PassCodeManager.onActivityStopped(activity)
                 PatternManager.onActivityStopped(activity)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    BiometricManager.getBiometricManager(activity).onActivityStopped(activity)
+                    BiometricManager.onActivityStopped(activity)
                 }
                 if (activity is PassCodeActivity ||
                     activity is PatternActivity ||

diff --git a/owncloudApp/src/main/java/com/owncloud/android/authentication/BiometricManager.java b/owncloudApp/src/main/java/com/owncloud/android/authentication/BiometricManager.java
diff --git a/owncloudApp/src/main/java/com/owncloud/android/db/PreferenceManager.java b/owncloudApp/src/main/java/com/owncloud/android/db/PreferenceManager.java
@@ -26,7 +26,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.owncloud.android.ui.activity.BiometricActivity;
+import com.owncloud.android.presentation.ui.security.BiometricActivity;
 import com.owncloud.android.utils.FileStorageUtils;
 
 /**

diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt
@@ -25,6 +25,7 @@ import com.owncloud.android.presentation.viewmodels.authentication.OCAuthenticat
 import com.owncloud.android.presentation.viewmodels.capabilities.OCCapabilityViewModel
 import com.owncloud.android.presentation.viewmodels.drawer.DrawerViewModel
 import com.owncloud.android.presentation.viewmodels.oauth.OAuthViewModel
+import com.owncloud.android.presentation.viewmodels.security.BiometricViewModel
 import com.owncloud.android.presentation.viewmodels.security.PassCodeViewModel
 import com.owncloud.android.presentation.viewmodels.security.PatternViewModel
 import com.owncloud.android.presentation.viewmodels.settings.SettingsLogsViewModel
@@ -61,4 +62,5 @@ val viewModelModule = module {
     viewModel { RemoveAccountDialogViewModel(get(), get(), get(), get()) }
     viewModel { PassCodeViewModel(get()) }
     viewModel { PatternViewModel(get()) }
+    viewModel { BiometricViewModel(get()) }
 }