Merge pull request #1725 from AzureAD/nichbop/fix-application-cancelled

Fix APPLICATION_CANCELLED by handling back button press

Author: iamgusain

changelog.txt

@@ -7,6 +7,7 @@ V.Next
 - [MINOR] Implement cert loader for both multiple and legacy WPJ data store in PKeyAuth (#1711)
 - [PATCH] Fix SDK Cancel when using authorization in current task (#1743)
 - [MINOR] Added support for broadcasting to applications installed on the device. (#1744)
+- [PATCH] Fix APPLICATION_CANCELLED by handling back button press (#1725)
 
 Version 4.1.0
 ----------

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationActivity.java

@@ -51,11 +51,4 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         }
         setFragment(mFragment);
     }
-
-    @Override
-    public void onBackPressed() {
-        if (!mFragment.onBackPressed()) {
-            super.onBackPressed();
-        }
-    }
 }

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationFragment.java

@@ -23,7 +23,9 @@
 package com.microsoft.identity.common.internal.providers.oauth2;
 
 import android.os.Bundle;
+import android.view.View;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -103,9 +105,21 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                handleBackButtonPressed();
+            }
+        });
+    }
+
     void finish() {
         final String methodName = "#finish";
         LocalBroadcaster.INSTANCE.unregisterCallback(CANCEL_AUTHORIZATION_REQUEST);
+
         final FragmentActivity activity = getActivity();
         if (activity instanceof AuthorizationActivity) {
             activity.finish();
@@ -189,12 +203,8 @@ public void onDestroy() {
         super.onDestroy();
     }
 
-    /**
-     * NOTE: Fragment-only mode will not support this, as we don't own the activity.
-     * This must be invoked by AuthorizationActivity.onBackPressed().
-     */
-    public boolean onBackPressed() {
-        return false;
+    public void handleBackButtonPressed() {
+        cancelAuthorization(true);
     }
 
     void sendResult(final RawAuthorizationResult.ResultCode resultCode) {

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationActivity.java

@@ -115,13 +115,6 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        if (!mFragment.onBackPressed()) {
-            super.onBackPressed();
-        }
-    }
-
     /**
      * This is invoked when an existing activity is re-used and provided with a new intent with additional information
      * NOTE: It's important that you use setIntent to update the intent associated with the activity.  Otherwise subsequent calls to

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/WebViewAuthorizationFragment.java

@@ -200,13 +200,9 @@ public void run() {
         return view;
     }
 
-    /**
-     * NOTE: Fragment-only mode will not support this, as we don't own the activity.
-     * This must be invoked by AuthorizationActivity.onBackPressed().
-     */
     @Override
-    public boolean onBackPressed() {
-        final String methodTag = TAG + ":onBackPressed";
+    public void handleBackButtonPressed() {
+        final String methodTag = TAG + ":handleBackButtonPressed";
         Logger.info(methodTag, "Back button is pressed");
 
         if (mWebView.canGoBack()) {
@@ -223,8 +219,6 @@ public boolean onBackPressed() {
         } else {
             cancelAuthorization(true);
         }
-
-        return true;
     }
 
     /**

gradle/versions.gradle

@@ -21,7 +21,7 @@ ext {
     androidxTestCoreVersion = "1.2.0"
     androidxJunitVersion = "1.1.1"
     annotationVersion = "1.0.0"
-    appCompatVersion = "1.0.2"
+    appCompatVersion = "1.1.0"
     browserVersion = "1.0.0"
     constraintLayoutVersion = "1.1.3"
     dexmakerMockitoVersion = "2.19.0"