fix: prevent bypassing pattern, pin or biometric lock with the back gesture

Signed-off-by: Jorge Aguado Recio <jaguado@izertis.com>

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt

@@ -39,6 +39,7 @@ import android.view.View
 import android.view.WindowManager
 import android.widget.EditText
 import android.widget.LinearLayout
+import androidx.activity.OnBackPressedCallback
 import com.owncloud.android.BuildConfig
 import com.owncloud.android.R
 import com.owncloud.android.databinding.PasscodeLockActivityBinding
@@ -76,6 +77,15 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
     private var confirmingPassCode = false
     private val resultIntent = Intent()
 
+    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            if ((ACTION_CREATE == intent.action && intent.extras?.getBoolean(EXTRAS_LOCK_ENFORCED) != true) || ACTION_REMOVE == intent.action) {
+                PassCodeManager.onActivityStopped(this@PassCodeActivity)
+                finish()
+            }
+        }
+    }
+
     /**
      * Initializes the activity.
      *
@@ -92,6 +102,8 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
 
         subscribeToViewModel()
 
+        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
+
         _binding = PasscodeLockActivityBinding.inflate(layoutInflater)
 
         // protection against screen recording
@@ -180,7 +192,7 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        onBackPressed()
+        onBackPressedDispatcher.onBackPressed()
         return true
     }
 
@@ -189,11 +201,6 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
         outState.putString(STATE_PASSCODE, passCodeViewModel.passcode.value.orEmpty())
     }
 
-    override fun onBackPressed() {
-        PassCodeManager.onActivityStopped(this)
-        super.onBackPressed()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean = false
 
     private fun inflatePasscodeTxtLine() {
@@ -382,27 +389,6 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
         passCodeEditTexts.first()?.requestFocus()
     }
 
-    /**
-     * Overrides click on the BACK arrow to correctly cancel ACTION_ENABLE or ACTION_DISABLE, while
-     * preventing than ACTION_CHECK may be worked around.
-     *
-     * @param keyCode       Key code of the key that triggered the down event.
-     * @param event         Event triggered.
-     * @return              'True' when the key event was processed by this method.
-     */
-    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-        if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
-            if ((ACTION_CREATE == intent.action &&
-                        intent.extras?.getBoolean(EXTRAS_LOCK_ENFORCED) != true) ||
-                ACTION_REMOVE == intent.action
-            ) {
-                finish()
-            } // else, do nothing, but report that the key was consumed to stay alive
-            return true
-        }
-        return super.onKeyDown(keyCode, event)
-    }
-
     /**
      * Saves the pass code input by the user as the current pass code.
      */
@@ -462,8 +448,7 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
             }
 
             KeyEvent.KEYCODE_ESCAPE -> {
-                PassCodeManager.onActivityStopped(this)
-                super.onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 true
             }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/security/pattern/PatternActivity.kt

@@ -28,11 +28,11 @@ package com.owncloud.android.presentation.security.pattern
 import android.content.Intent
 import android.os.Bundle
 import android.os.SystemClock
-import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.WindowManager
+import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isVisible
 import com.andrognito.patternlockview.PatternLockView.Dot
 import com.andrognito.patternlockview.listener.PatternLockViewListener
@@ -70,13 +70,25 @@ class PatternActivity : ToolbarActivity(), EnableBiometrics {
 
     val resultIntent = Intent()
 
+    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            if (ACTION_REQUEST_WITH_RESULT == intent.action && intent.extras?.getBoolean(EXTRAS_LOCK_ENFORCED) != true ||
+                ACTION_CHECK_WITH_RESULT == intent.action) {
+                PatternManager.onActivityStopped(this@PatternActivity)
+                finish()
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         if (!BuildConfig.DEBUG) {
             window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
         }
 
+        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
+
         _binding = PatternLockActivityBinding.inflate(layoutInflater)
 
         setContentView(binding.root)
@@ -157,15 +169,10 @@ class PatternActivity : ToolbarActivity(), EnableBiometrics {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        onBackPressed()
+        onBackPressedDispatcher.onBackPressed()
         return true
     }
 
-    override fun onBackPressed() {
-        PatternManager.onActivityStopped(this)
-        super.onBackPressed()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean = false
 
     /**
@@ -323,27 +330,6 @@ class PatternActivity : ToolbarActivity(), EnableBiometrics {
         }
     }
 
-    /**
-     * Overrides click on the BACK arrow to correctly cancel ACTION_ENABLE or ACTION_DISABLE, while
-     * preventing than ACTION_CHECK may be worked around.
-     *
-     * @param keyCode       Key code of the key that triggered the down event.
-     * @param event         Event triggered.
-     * @return              'True' when the key event was processed by this method.
-     */
-    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-        if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
-            if (ACTION_REQUEST_WITH_RESULT == intent.action &&
-                intent.extras?.getBoolean(EXTRAS_LOCK_ENFORCED) != true ||
-                ACTION_CHECK_WITH_RESULT == intent.action
-            ) {
-                finish()
-            } // else, do nothing, but report that the key was consumed to stay alive
-            return true
-        }
-        return super.onKeyDown(keyCode, event)
-    }
-
     override fun onOptionSelected(optionSelected: BiometricStatus) {
         when (optionSelected) {
             BiometricStatus.ENABLED_BY_USER -> {