added IllegalStateException catch block for incorrectly formatted client id

Author: JohnMAustin

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

@@ -24,6 +24,7 @@
 import com.microsoft.identity.client.User;
 
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 /**
  * Starting Activity of the app. Handles the connection to Office 365.
@@ -51,29 +52,30 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
 
-        Bundle extras = getIntent().getExtras();
-        setContentView(R.layout.activity_connect);
-        setTitle(R.string.app_name);
+            Bundle extras = getIntent().getExtras();
+            setContentView(R.layout.activity_connect);
+            setTitle(R.string.app_name);
 
-        // set up our views
-        mConnectButton = (Button) findViewById(R.id.connectButton);
-        mConnectProgressBar = (ProgressBar) findViewById(R.id.connectProgressBar);
-        mTitleTextView = (TextView) findViewById(R.id.titleTextView);
-        mDescriptionTextView = (TextView) findViewById(R.id.descriptionTextView);
+            // set up our views
+            mConnectButton = (Button) findViewById(R.id.connectButton);
+            mConnectProgressBar = (ProgressBar) findViewById(R.id.connectProgressBar);
+            mTitleTextView = (TextView) findViewById(R.id.titleTextView);
+            mDescriptionTextView = (TextView) findViewById(R.id.descriptionTextView);
 
-        Connect.getInstance().setConnectActivity(this);
-        // add click listener
-        mConnectButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showConnectingInProgressUI();
-                connect();
-            }
-        });
+            Connect.getInstance().setConnectActivity(this);
+            // add click listener
+            mConnectButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    showConnectingInProgressUI();
+                    connect();
+                }
+            });
 
     }
 
     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.
@@ -110,11 +112,22 @@ private void connect() {
             }
         } catch (MsalClientException e) {
             Log.d(TAG, "MSAL Exception Generated while getting users: " + e.toString());
+            showConnectErrorUI(e.getMessage());
+
 
         } catch (IndexOutOfBoundsException e) {
             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 (Exception e) {
+            showConnectErrorUI();
+        }
 
     }
 
@@ -166,6 +179,18 @@ private void showConnectErrorUI() {
                 R.string.connect_toast_text_error,
                 Toast.LENGTH_LONG).show();
     }
+    private void showConnectErrorUI(String errorMessage) {
+        mConnectButton.setVisibility(View.VISIBLE);
+        mConnectProgressBar.setVisibility(View.GONE);
+        mTitleTextView.setText(R.string.title_text_error);
+        mTitleTextView.setVisibility(View.VISIBLE);
+        mDescriptionTextView.setText(errorMessage);
+        mDescriptionTextView.setVisibility(View.VISIBLE);
+        Toast.makeText(
+                ConnectActivity.this,
+                R.string.connect_toast_text_error,
+                Toast.LENGTH_LONG).show();
+    }
 
     private void showMessage(final String msg) {
         getHandler().post(new Runnable() {
@@ -235,10 +260,12 @@ public void onError(MsalException exception) {
             // This means errors happened in the sdk itself, could be network, Json parse, etc. Check MsalError.java
             // for detailed list of the errors.
             showMessage(exception.getMessage());
+            showConnectErrorUI(exception.getMessage());
         } else if (exception instanceof MsalServiceException) {
             // This means something is wrong when the sdk is communication to the service, mostly likely it's the client
             // configuration.
             showMessage(exception.getMessage());
+            showConnectErrorUI(exception.getMessage());
         } else if (exception instanceof MsalUiRequiredException) {
             // This explicitly indicates that developer needs to prompt the user, it could be refresh token is expired, revoked
             // or user changes the password; or it could be that no token was found in the token cache.