From 1af7af6e18b7c7fab6e1d76161f2f8748967beef Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Mon, 6 Sep 2021 12:07:18 +0200
Subject: [PATCH] Adapted all uses of PassCodeManager

---
 owncloudApp/src/main/java/com/owncloud/android/MainApp.kt   | 4 ++--
 .../owncloud/android/authentication/BiometricManager.java   | 4 ++--
 .../com/owncloud/android/ui/activity/BiometricActivity.java | 6 +++---
 .../com/owncloud/android/ui/activity/FileDisplayActivity.kt | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt b/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt
index ed763ecaa5e8..11654afbf773 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt
@@ -122,7 +122,7 @@ class MainApp : Application() {
 
             override fun onActivityStarted(activity: Activity) {
                 Timber.v("${activity.javaClass.simpleName} onStart() starting")
-                PassCodeManager.getPassCodeManager().onActivityStarted(activity)
+                PassCodeManager.getPassCodeManager()!!.onActivityStarted(activity)
                 PatternManager.getPatternManager().onActivityStarted(activity)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     BiometricManager.getBiometricManager(activity).onActivityStarted(activity)
@@ -139,7 +139,7 @@ class MainApp : Application() {
 
             override fun onActivityStopped(activity: Activity) {
                 Timber.v("${activity.javaClass.simpleName} onStop() ending")
-                PassCodeManager.getPassCodeManager().onActivityStopped(activity)
+                PassCodeManager.getPassCodeManager()!!.onActivityStopped(activity)
                 PatternManager.getPatternManager().onActivityStopped(activity)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     BiometricManager.getBiometricManager(activity).onActivityStopped(activity)
diff --git a/owncloudApp/src/main/java/com/owncloud/android/authentication/BiometricManager.java b/owncloudApp/src/main/java/com/owncloud/android/authentication/BiometricManager.java
index 80663ac24063..b368894130be 100755
--- a/owncloudApp/src/main/java/com/owncloud/android/authentication/BiometricManager.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/authentication/BiometricManager.java
@@ -84,9 +84,9 @@ public void onActivityStarted(Activity activity) {
                     // Use biometric lock
                     Intent i = new Intent(MainApp.Companion.getAppContext(), BiometricActivity.class);
                     activity.startActivity(i);
-                } else if (PassCodeManager.getPassCodeManager().isPassCodeEnabled()) {
+                } else if (PassCodeManager.Companion.getPassCodeManager().isPassCodeEnabled()) {
                     // Cancel biometric lock and use passcode unlock method
-                    PassCodeManager.getPassCodeManager().onBiometricCancelled(activity);
+                    PassCodeManager.Companion.getPassCodeManager().onBiometricCancelled(activity);
                     mVisibleActivitiesCounter++;
                 } else if (PatternManager.getPatternManager().isPatternEnabled()) {
                     // Cancel biometric lock and use pattern unlock method
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BiometricActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BiometricActivity.java
index a67a0c673f99..bc6bf2cee492 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BiometricActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BiometricActivity.java
@@ -33,8 +33,8 @@
 import androidx.biometric.BiometricPrompt;
 
 import com.owncloud.android.R;
-import com.owncloud.android.presentation.ui.security.PassCodeManager;
 import com.owncloud.android.authentication.PatternManager;
+import com.owncloud.android.presentation.ui.security.PassCodeManager;
 import timber.log.Timber;
 
 import javax.crypto.Cipher;
@@ -140,8 +140,8 @@ public void onAuthenticationFailed() {
     }
 
     private void authError() {
-        if (PassCodeManager.getPassCodeManager().isPassCodeEnabled()) {
-            PassCodeManager.getPassCodeManager().onBiometricCancelled(mActivity);
+        if (PassCodeManager.Companion.getPassCodeManager().isPassCodeEnabled()) {
+            PassCodeManager.Companion.getPassCodeManager().onBiometricCancelled(mActivity);
         } else if (PatternManager.getPatternManager().isPatternEnabled()) {
             PatternManager.getPatternManager().onBiometricCancelled(mActivity);
         }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
index d46cfbe9c7e4..6abb549dc543 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -519,7 +519,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             BiometricManager.getBiometricManager(this).bayPassUnlockOnce()
         }
-        PassCodeManager.getPassCodeManager().bayPassUnlockOnce()
+        PassCodeManager.getPassCodeManager()!!.bayPassUnlockOnce()
         PatternManager.getPatternManager().bayPassUnlockOnce()
 
         // Hanndle calls form internal activities.