Minor changes, lint from connect branch

app/src/org/commcare/activities/CommCareSetupActivity.java

@@ -73,7 +73,7 @@
  * Responsible for identifying the state of the application (uninstalled,
  * installed) and performing any necessary setup to get to a place where
  * CommCare can load normally.
- * <p>
+ *
  * If the startup activity identifies that the app is installed properly it
  * should not ever require interaction or be visible to the user.
  *
@@ -86,8 +86,7 @@ public class CommCareSetupActivity extends CommCareActivity<CommCareSetupActivit
         RuntimePermissionRequester {
 
     private static final String TAG = CommCareSetupActivity.class.getSimpleName();
-    private static final int MENU_CONNECT_SIGN_IN = Menu.FIRST + 4;
-    private static final int MENU_CONNECT_FORGET = Menu.FIRST + 5;
+
     private static final String KEY_UI_STATE = "current_install_ui_state";
     private static final String KEY_LAST_INSTALL_MODE = "offline_install";
     private static final String KEY_FROM_EXTERNAL = "from_external";
@@ -121,6 +120,8 @@ public enum UiState {
     public static final int MENU_ARCHIVE = Menu.FIRST;
     private static final int MENU_SMS = Menu.FIRST + 2;
     private static final int MENU_FROM_LIST = Menu.FIRST + 3;
+    private static final int MENU_CONNECT_SIGN_IN = Menu.FIRST + 4;
+    private static final int MENU_CONNECT_FORGET = Menu.FIRST + 5;
 
     // Activity request codes
     public static final int BARCODE_CAPTURE = 1;
@@ -510,8 +511,8 @@ public boolean onPrepareOptionsMenu(Menu menu) {
      * UPDATE: 16/Jan/2019: This code path is no longer in use, since we have turned off sms install
      * in response to Google play console policies for now. We are going to watch out for a while
      * for any changes in policies in near future before completely removing the surrounding code
-     * <p>
-     * <p>
+     *
+     *
      * Scan SMS messages for texts with profile references.
      *
      * @param installTriggeredManually if scan was triggered manually, then
@@ -639,7 +640,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     private void updateConnectButton() {
         installFragment.updateConnectButton(!fromManager && !fromExternal && ConnectIDManager.getInstance().isloggedIn(), v -> {
             ConnectIDManager.getInstance().unlockConnect(this, success -> {
-//                ConnectManager.goToConnectJobsList(this);
+                ConnectIDManager.getInstance().goToConnectJobsList(this);
             });
         });
     }
@@ -740,11 +741,7 @@ public void failInvalidReference(InvalidReferenceException e, AppInstallStatus s
 
     @Override
     public void failBadReqs(String versionRequired, String versionAvailable, boolean majorIsProblem) {
-        String versionMismatch = Localization.get("install.version.mismatch", new String[]{versionRequired, versionAvailable});
-        Intent intent = new Intent(this, PromptApkUpdateActivity.class);
-        intent.putExtra(PromptApkUpdateActivity.REQUIRED_VERSION, versionRequired);
-        intent.putExtra(PromptApkUpdateActivity.CUSTOM_PROMPT_TITLE, versionMismatch);
-        startActivity(intent);
+        ResourceInstallUtils.showApkUpdatePrompt(this, versionRequired, versionAvailable);
     }
 
     @Override
@@ -780,8 +777,7 @@ public void failWithNotification(AppInstallStatus statusFailState, NotificationA
 
     @Override
     public void failTargetMismatch() {
-        Intent intent = new Intent(this, TargetMismatchErrorActivity.class);
-        startActivity(intent);
+        ResourceInstallUtils.showTargetMismatchError(this);
     }
 
 

app/src/org/commcare/activities/DispatchActivity.java

@@ -49,14 +49,11 @@ public class DispatchActivity extends AppCompatActivity {
     public static final String START_FROM_LOGIN = "process_successful_login";
     public static final String EXECUTE_RECOVERY_MEASURES = "execute_recovery_measures";
     public static final String SESSION_REBUILD_REQUEST = "session_rebuild_request";
-
     public static final String REDIRECT_TO_CONNECT_OPPORTUNITY_INFO = "redirect-to-connect-opportunity-info";
     private static final int LOGIN_USER = 0;
     private static final int HOME_SCREEN = 1;
     public static final int INIT_APP = 2;
     public static final int RECOVERY_MEASURES = 3;
-    private boolean connectIdManagedLogin;
-    private boolean connectManagedLogin;
 
 
     /**
@@ -68,7 +65,8 @@ public class DispatchActivity extends AppCompatActivity {
     private boolean startFromLogin;
     private LoginMode lastLoginMode;
     private boolean userManuallyEnteredPasswordMode;
-
+    private boolean connectIdManagedLogin;
+    private boolean connectManagedLogin;
     private boolean shouldFinish;
     private boolean userTriggeredLogout;
     private boolean shortcutExtraWasConsumed;

app/src/org/commcare/activities/FormEntryActivity.java

@@ -1168,7 +1168,7 @@ private void handleFormLoadCompletion(AndroidFormController fc) {
             String localeKey =
                     (fc.getInterruptedFormState() == null
                             || fc.getInterruptedFormState().isInterruptedDueToSessionExpiration())
-                    ? "form.entry.restart.after.expiration" : "form.entry.restart.after.session.pause";
+                            ? "form.entry.restart.after.expiration" : "form.entry.restart.after.session.pause";
             Toast.makeText(this, Localization.get(localeKey), Toast.LENGTH_LONG).show();
         }
     }

app/src/org/commcare/activities/FormEntryActivityUIController.java

@@ -331,7 +331,7 @@ protected void showPreviousView(boolean showSwipeAnimation) {
 
                 //Did we jump at all? (not sure how we could have, but there might be a mismatch)
                 if (lastValidIndex.equals(startIndex)) {
-                    //If not, don't even bother changing the view. 
+                    //If not, don't even bother changing the view.
                     //NOTE: This needs to be the same as the
                     //exit condition below, in case either changes
                     activity.triggerUserQuitInput();

app/src/org/commcare/activities/FullscreenVideoViewActivity.kt

@@ -82,4 +82,4 @@ class FullscreenVideoViewActivity : AppCompatActivity() {
         }
         return -1
     }
-}
+}

app/src/org/commcare/activities/GlobalPrivilegeClaimingActivity.java

@@ -55,10 +55,10 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onResume() {
         super.onResume();
-        refreshUI();
+        refreshUi();
     }
 
-    private void refreshUI() {
+    private void refreshUi() {
         TextView enabledTextView = findViewById(R.id.enabled_textview);
         TextView notEnabledTextView = findViewById(R.id.not_enabled_textview);
         Button claimButton = findViewById(R.id.claim_button);
@@ -108,7 +108,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                                 GlobalPrivilegesManager.enablePrivilege(p, activatedPrivileges.first);
                             }
                         }
-                        refreshUI();
+                        refreshUi();
 
                     } catch (PrivilegesUtility.UnrecognizedPayloadVersionException e) {
                         e.printStackTrace();
@@ -158,7 +158,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 for (String privilege : GlobalPrivilegesManager.getEnabledPrivileges()) {
                     GlobalPrivilegesManager.disablePrivilege(privilege);
                 }
-                refreshUI();
+                refreshUi();
                 return true;
             // Respond to the action bar's Up/Home button
             case android.R.id.home:

app/src/org/commcare/activities/HomeButtons.java

@@ -28,7 +28,7 @@
 public class HomeButtons {
 
     private final static String[] buttonNames =
-            new String[]{"start", "training", "saved", "incomplete","connect", "sync", "report", "logout"};
+            new String[]{"start", "training", "saved", "incomplete", "connect", "sync", "report", "logout"};
 
     /**
      * Note: The order in which home cards are returned by this method should be consistent with

app/src/org/commcare/activities/SettingsHelper.java

@@ -7,6 +7,7 @@ public class SettingsHelper {
     public static void launchDateSettings(Context context) {
         context.startActivity(new Intent(android.provider.Settings.ACTION_DATE_SETTINGS));
     }
+
     public static void launchSecuritySettings(Context context) {
         context.startActivity(new Intent(android.provider.Settings.ACTION_SECURITY_SETTINGS));
     }

app/src/org/commcare/activities/connect/ConnectIdActivity.java

@@ -45,7 +45,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == ConnectConstants.CONNECT_UNLOCK_PIN) {
             //PIN unlock should only be requested while BiometricConfig fragment is active, else this will crash
             getCurrentFragment().handleFinishedPinActivity(requestCode, resultCode, data);
-        } else if (requestCode == ConnectConstants.CONNECTID_REQUEST_CODE) {
+        } else if (requestCode == ConnectConstants.CONNECT_JOB_INFO) {
             handleRedirection(data);
         }
         if (requestCode == RESULT_OK) {

app/src/org/commcare/adapters/EntityListAdapter.java

@@ -236,7 +236,7 @@ private View getTileView(Entity<TreeReference> entity, EntityViewTile tile) {
         int[] titleColor = AndroidUtil.getThemeColorIDs(commCareActivity, new int[]{R.attr.entity_select_title_text_color});
         if (tile == null) {
             tile = EntityViewTile.createTileForEntitySelectDisplay(commCareActivity, detail, entity,
-                        currentSearchTerms, mImageLoader, mFuzzySearchEnabled, selectActivityInAwesomeMode);
+                    currentSearchTerms, mImageLoader, mFuzzySearchEnabled, selectActivityInAwesomeMode);
         } else {
             tile.setSearchTerms(currentSearchTerms);
             tile.addFieldViews(commCareActivity, detail, entity);
@@ -437,4 +437,4 @@ public void saveCalloutDataToSession() {
         }
     }
 
-}
+}

app/src/org/commcare/android/database/user/models/FormRecord.java

@@ -468,4 +468,4 @@ public void setUuid(String uuid) {
     public void setLastModified(Date lastModified) {
         this.lastModified = lastModified;
     }
-}
+}

app/src/org/commcare/android/logging/ReportingUtils.java

@@ -7,6 +7,7 @@
 import org.commcare.AppUtils;
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
+import org.commcare.connect.ConnectIDManager;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.preferences.ServerUrls;
@@ -141,4 +142,18 @@ public static String getAppBuildProfileId() {
             return "";
         }
     }
+
+    public static String getUserForCrashes() {
+        String user = getUser();
+        if(user.isEmpty()) {
+            try {
+                if (ConnectIDManager.getInstance().isloggedIn()) {
+                    return ConnectIDManager.getInstance().getUser(CommCareApplication.instance()).getUserId();
+                }
+            } catch (Exception ignored) {
+            }
+        }
+
+        return null;
+    }
 }

app/src/org/commcare/connect/ConnectConstants.java

@@ -8,10 +8,10 @@
 public class ConnectConstants {
     public static final int CONNECT_ID_TASK_ID_OFFSET = 1000;
     public final static int CREDENTIAL_PICKER_REQUEST = 2000;
-    public static final int CONNECTID_REQUEST_CODE = 1034;
     public static final int LOGIN_CONNECT_LAUNCH_REQUEST_CODE = 1050;
     public static final int COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE = 1051;
     public static final int STANDARD_HOME_CONNECT_LAUNCH_REQUEST_CODE = 1052;
+    public static final int CONFIGURE_BIOMETRIC_REQUEST_CODE = 1053;
     public static final int NETWORK_ACTIVITY_ID = 7000;
     public static final String USERNAME = "USERNAME";
     public static final String PASSWORD = "PASSWORD";
@@ -28,6 +28,10 @@ public class ConnectConstants {
     public static final String METHOD_CHANGE_PRIMARY = "CHANGE_PRIMARY";
     public static final String METHOD_CHANGE_ALTERNATE = "CHANGE_ALTERNATE";
     public static final String METHOD_RECOVER_PRIMARY = "RECOVER_PRIMARY";
+    public static final String CCC_DEST_OPPORTUNITY_SUMMARY_PAGE = "ccc_opportunity_summary_page";
+    public static final String CCC_DEST_LEARN_PROGRESS = "ccc_learn_progress";
+    public static final String CCC_DEST_DELIVERY_PROGRESS = "ccc_delivery_progress";
+    public static final String CCC_DEST_PAYMENTS = "ccc_payment";
     public static final String CONNECT_KEY_USERNAME = "username";
     public static final String CONNECT_KEY_NAME = "name";
     public static final String CONNECT_KEY_SECRET = "secret";

app/src/org/commcare/connect/ConnectIDManager.java

@@ -218,7 +218,7 @@ public void onAuthenticationFailed() {
     public void completeSignin() {
         connectStatus = ConnectIdStatus.LoggedIn;
         scheduleHearbeat();
-        CrashUtil.registerConnectUser();
+        CrashUtil.registerUserData();
     }
 
     public void handleFinishedActivity(CommCareActivity<?> activity, int resultCode) {

app/src/org/commcare/engine/references/JavaHttpReference.java

@@ -73,6 +73,7 @@ public InputStream getStream(Map<String, String> params) throws IOException {
             }
             throw e;
         }
+
         if (response.isSuccessful()) {
             responseHeaders = response.headers();
             return response.body().byteStream();

app/src/org/commcare/engine/resource/ResourceInstallUtils.java

@@ -1,9 +1,13 @@
 package org.commcare.engine.resource;
 
+import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
+import org.commcare.activities.PromptApkUpdateActivity;
+import org.commcare.activities.TargetMismatchErrorActivity;
 import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.core.network.CaptivePortalRedirectException;
 import org.commcare.engine.resource.installers.SingleAppInstallation;
@@ -26,6 +30,7 @@
 import org.commcare.utils.SessionUnavailableException;
 import org.commcare.views.notifications.NotificationActionButtonInfo;
 import org.javarosa.core.services.Logger;
+import org.javarosa.core.services.locale.Localization;
 import org.javarosa.core.util.PropertyUtils;
 
 import java.net.MalformedURLException;
@@ -145,6 +150,29 @@ public static void handleAppInstallResult(ResourceEngineTask resourceEngineTask,
         }
     }
 
+    /**
+     * Shows Apk update prompt to user
+     * @param context current context
+     * @param versionRequired apk version required
+     * @param versionAvailable apk version available
+     */
+    public static void showApkUpdatePrompt(Context context, String versionRequired, String versionAvailable) {
+        String versionMismatch = Localization.get("install.version.mismatch", new String[]{versionRequired, versionAvailable});
+        Intent intent = new Intent(context, PromptApkUpdateActivity.class);
+        intent.putExtra(PromptApkUpdateActivity.REQUIRED_VERSION, versionRequired);
+        intent.putExtra(PromptApkUpdateActivity.CUSTOM_PROMPT_TITLE, versionMismatch);
+        context.startActivity(intent);
+    }
+
+    /**
+     * Show target mismatch error during CC App installation
+     * @param context current context
+     */
+    public static void showTargetMismatchError(Context context) {
+        Intent intent = new Intent(context, TargetMismatchErrorActivity.class);
+        context.startActivity(intent);
+    }
+
     /**
      * @return Version from profile in the app's upgrade table; -1 if upgrade
      * profile not found.

app/src/org/commcare/fragments/BreadcrumbBarHelper.java

@@ -59,10 +59,12 @@ public class BreadcrumbBarHelper {
     public void attachBreadcrumbBar(CommCareActivity activity) {
         boolean breadCrumbsEnabled = !DeveloperPreferences.isActionBarEnabled();
         ActionBar actionBar = activity.getSupportActionBar();
-        if (!breadCrumbsEnabled) {
-            configureSimpleNav(activity, actionBar);
-        } else {
-            attachBreadcrumbBar(activity, actionBar);
+        if (actionBar != null) {
+            if (!breadCrumbsEnabled) {
+                configureSimpleNav(activity, actionBar);
+            } else {
+                attachBreadcrumbBar(activity, actionBar);
+            }
         }
 
         try {

app/src/org/commcare/heartbeat/HeartbeatRequester.java

@@ -25,10 +25,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
 import androidx.work.WorkManager;
 
 import com.google.common.collect.ArrayListMultimap;

app/src/org/commcare/interfaces/CommcareRequestEndpoints.java

@@ -4,7 +4,6 @@
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

app/src/org/commcare/logic/AndroidFormController.java

@@ -97,4 +97,4 @@ public FormDef getFormDef() {
     public InterruptedFormState getInterruptedFormState(){
         return interruptedFormState;
     }
-}
+}

app/src/org/commcare/models/AndroidSessionWrapper.java

@@ -49,7 +49,7 @@
  */
 public class AndroidSessionWrapper implements SessionWrapperInterface {
     private static final String TAG = AndroidSessionWrapper.class.getSimpleName();
-    //The state descriptor will need these 
+    //The state descriptor will need these
     private final SessionWrapper session;
     private int formRecordId = -1;
     private int sessionStateRecordId = -1;
@@ -394,4 +394,4 @@ public void executeEndpointStack(Endpoint endpoint, HashMap args) {
         Endpoint.populateEndpointArgumentsToEvaluationContext(endpoint, args, evaluationContext);
         executeStackActions(endpoint.getStackOperations(), evaluationContext);
     }
-}
+}

app/src/org/commcare/sync/ExternalDataUpdateHelper.java

@@ -59,4 +59,4 @@ public static void sendBroadcastFailSafe(Context context, Intent intent, @Nullab
             Logger.exception("Exception when sending a broadcast with intent " + intent, e);
         }
     }
-}
+}

app/src/org/commcare/sync/FirebaseMessagingDataSyncer.java

@@ -194,6 +194,7 @@ private void informUserAboutPendingSync(FCMMessageData fcmMessageData) {
         Bundle b = new Bundle();
         b.putSerializable(FCM_MESSAGE_DATA, FirebaseMessagingUtil.serializeFCMMessageData(fcmMessageData));
         intent.putExtra(FCM_MESSAGE_DATA_KEY, b);
+
         ExternalDataUpdateHelper.sendBroadcastFailSafe(context, intent, null);
     }