corrected user cancel flow code to show message on connect ui

Author: JohnMAustin

app/src/main/java/com/microsoft/graph/connect/AuthenticationManager.java

@@ -160,6 +160,8 @@ public void onError(MsalException exception) {
             public void onCancel() {
             /* User canceled the authentication */
                 Log.d(TAG, "User cancelled login.");
+                if (mActivityCallback != null)
+                    mActivityCallback.onCancel();
             }
         };
     }

app/src/main/java/com/microsoft/graph/connect/ConnectActivity.java

@@ -75,7 +75,6 @@ public void onClick(View v) {
     }
 
     private void connect() {
-        try {
 
         // The sample app is having the PII enable setting on the MainActivity. Ideally, app should decide to enable Pii or not,
         // if it's enabled, it should be  the setting when the application is onCreate.
@@ -119,16 +118,13 @@ private void connect() {
             Log.d(TAG, "User at this position does not exist: " + e.toString());
             showConnectErrorUI(e.getMessage());
 
-        }
-
-        } catch (IllegalStateException e) {
-            Log.d(TAG, "MSAL Exception Generated: " + e.toString());
-            showConnectErrorUI(e.getMessage());
+        }catch (IllegalStateException e) {
+                Log.d(TAG, "MSAL Exception Generated: " + e.toString());
+                showConnectErrorUI(e.getMessage());
 
         } catch (Exception e) {
             showConnectErrorUI();
         }
-
     }
 
     /**
@@ -277,9 +273,16 @@ public void onError(MsalException exception) {
 
     }
 
+    @Override
+    public void onError(Exception exception) {
+        showMessage(exception.getMessage());
+        showConnectErrorUI(exception.getMessage());
+    }
+
     @Override
     public void onCancel() {
         showMessage("User cancelled the flow.");
+        showConnectErrorUI("User cancelled the flow.");
 
     }
 

app/src/main/java/com/microsoft/graph/connect/MSALAuthenticationCallback.java

@@ -10,5 +10,6 @@
 interface MSALAuthenticationCallback {
     void onSuccess(AuthenticationResult authenticationResult);
     void onError(MsalException exception);
+    void onError(Exception exception);
     void onCancel();
 }