Tidepool: update handling

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/tidepool/AuthFlowIn.java

@@ -38,23 +38,45 @@ public class AuthFlowIn extends AppCompatActivity {
     private static final String PREF_TIDEPOOL_USER_NAME = "tidepool_username";
     private static final String PREF_TIDEPOOL_SUB_NAME = "tidepool_subname";
 
+    private static final boolean DEBUG = false;
+
     final AtomicReference<JSONObject> userInfo = new AtomicReference<>();
 
     public void onCreate(final Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
+        val intent = getIntent();
         Log.d(TAG, "Got response");
-        Inevitable.task("tidepool-process-auth", 10, () -> processIntent(getIntent()));
+        if (DEBUG) {
+            val extras = intent.getExtras();
+            if (extras != null) {
+                for (String key : extras.keySet()) {
+                    Object value = extras.get(key);
+                    Log.d(TAG, key + " = " + value + " (" + (value != null ? value.getClass().getName() : "null") + ")");
+                }
+            } else {
+                Log.d(TAG, "No extras found in intent.");
+            }
+        }
+        Inevitable.task("tidepool-process-auth", 10, () -> processIntent(intent));
         this.finish();
     }
 
     private void processIntent(final Intent intent) {
+        if (intent == null) {
+            Log.wtf(TAG, "Intent is null when trying to process intent");
+            return;
+        }
         val authorizationResponse = AuthorizationResponse.fromIntent(intent);
         val authorizationException = AuthorizationException.fromIntent(intent);
         val state = AuthFlowOut.getAuthState();
         if (state == null) {
             Log.wtf(TAG, "Could not get auth state");
             return;
         }
+        if (authorizationResponse == null && authorizationException == null) {
+            Log.wtf(TAG, "Both response and exception are null when processing intent?");
+            return;
+        }
         state.update(authorizationResponse, authorizationException);
         if (authorizationException != null) {
             Log.d(TAG, "Got authorization error - resetting state: " + authorizationException);

app/src/main/java/com/eveningoutpost/dexdrip/tidepool/AuthFlowOut.java

@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Base64;
-import android.util.Log;
+import com.eveningoutpost.dexdrip.models.UserError.Log;
 
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.utilitymodels.Pref;
@@ -159,11 +159,16 @@ public static void doTidePoolInitialLogin(boolean full) {
                     val authRequest = authRequestBuilder.build();
 
                     Log.d(TAG, "Firing off request");
-                    getAuthService().performAuthorizationRequest(
-                            authRequest,
-                            // TODO will need mutability flag in later target sdk versions
-                            PendingIntent.getActivity(context, 0, new Intent(context, AuthFlowIn.class), 0),
-                            PendingIntent.getActivity(context, 0, new Intent(context, AuthFlowIn.class), 0));
+                    try {
+                        getAuthService().performAuthorizationRequest(
+                                authRequest,
+                                PendingIntent.getActivity(context, 0, new Intent(context, AuthFlowIn.class), PendingIntent.FLAG_MUTABLE),
+                                PendingIntent.getActivity(context, 0, new Intent(context, AuthFlowIn.class), PendingIntent.FLAG_MUTABLE));
+                    } catch (Exception e) {
+                        val msg = "Tidepool: exception when trying to perform authorization. Is Chrome installed? "+e;
+                        Log.wtf(TAG, msg);
+                        JoH.static_toast_long(msg);
+                    }
                 });
     }
 }