CCCT-2687 Migrate Connect Network Stack To ConnectRepository

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

@@ -16,14 +16,13 @@
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
 import org.commcare.android.database.connect.models.ConnectJobRecord;
-import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.connect.ConnectConstants;
+import org.commcare.connect.repository.ConnectRepository;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.connect.PersonalIdManager;
 import org.commcare.personalId.UnlockPolicy;
+import org.commcare.connect.database.ConnectJobUtils;
 import org.commcare.connect.database.ConnectUserDatabaseUtil;
-import org.commcare.connect.network.PersonalIdOrConnectApiErrorHandler;
-import org.commcare.connect.network.connect.ConnectApiHandler;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.dalvik.R;
 import org.commcare.engine.resource.AppInstallStatus;
@@ -999,30 +998,24 @@ public void checkManagedConfiguration() {
     }
 
     private void refreshOpportunities() {
-        CommCareActivity activity = this;
-        ConnectUserRecord user = ConnectUserDatabaseUtil.getUser(activity);
-        new ConnectApiHandler<List<ConnectJobRecord>>() {
-
-            @Override
-            public void onFailure(@NonNull PersonalIdOrConnectApiErrorCodes errorCode, @Nullable Throwable t) {
-                String error = PersonalIdOrConnectApiErrorHandler.handle(activity, errorCode, t);
-                Toast.makeText(activity, error, Toast.LENGTH_LONG).show();
-            }
-
-            @Override
-            public void onSuccess(List<ConnectJobRecord> jobs) {
-                boolean connectAccess = !jobs.isEmpty();
-                String toastMessage = getString(R.string.setup_refresh_opportunities_no_jobs);
-                if (connectAccess) {
-                    ConnectUserDatabaseUtil.turnOnConnectAccess(activity);
-
-                    updateConnectButton();
-                    refreshDrawer();
-
-                    toastMessage = getString(R.string.setup_refresh_opportunities_with_jobs);
+        ConnectRepository.getInstance(this).retrieveOpportunitiesForJava(
+                (success, error) -> {
+                    if (success) {
+                        boolean connectAccess = !ConnectJobUtils.getCompositeJobs(
+                                this, ConnectJobRecord.STATUS_ALL_JOBS, null).isEmpty();
+                        if (connectAccess) {
+                            ConnectUserDatabaseUtil.turnOnConnectAccess(this);
+                            updateConnectButton();
+                            refreshDrawer();
+                        }
+                        String toastMessage = connectAccess
+                                ? getString(R.string.setup_refresh_opportunities_with_jobs)
+                                : getString(R.string.setup_refresh_opportunities_no_jobs);
+                        Toast.makeText(this, toastMessage, Toast.LENGTH_LONG).show();
+                    } else {
+                        Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+                    }
                 }
-                Toast.makeText(activity, toastMessage, Toast.LENGTH_LONG).show();
-            }
-        }.getConnectOpportunities(activity, user);
+        );
     }
 }

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

@@ -13,7 +13,7 @@
 import org.commcare.android.database.connect.models.ConnectJobRecord;
 import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.android.database.user.models.SessionStateDescriptor;
-import org.commcare.connect.ConnectJobHelper;
+import org.commcare.connect.database.ConnectJobUtils;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.connect.utils.DeepLinkHelper;
 import org.commcare.dalvik.R;
@@ -247,7 +247,7 @@ private void dispatch() {
                     handleShortcutLaunch();
                 } else if (redirectToConnectOpportunityInfo) {
                     redirectToConnectOpportunityInfo = false;
-                    ConnectJobRecord job = ConnectJobHelper.INSTANCE.getJobForSeatedApp(this);
+                    ConnectJobRecord job = ConnectJobUtils.getJobForSeatedApp(this);
                     ConnectNavHelper.INSTANCE.goToActiveInfoForJob(this, job, true);
                 } else {
                     launchHomeScreen();

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

@@ -29,7 +29,7 @@
 import org.commcare.appupdate.AppUpdateControllerFactory;
 import org.commcare.appupdate.AppUpdateState;
 import org.commcare.appupdate.FlexibleAppUpdateController;
-import org.commcare.connect.ConnectJobHelper;
+import org.commcare.connect.database.ConnectJobUtils;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.core.process.CommCareInstanceInitializer;
 import org.commcare.dalvik.BuildConfig;
@@ -632,7 +632,7 @@ protected void userPressedOpportunityStatus() {
         // Launch the seated app's job status page on top of this (still-live) Home so the app
         // session is preserved and backing out of the status page returns here.
         ConnectJobRecord job = Objects.requireNonNull(
-                ConnectJobHelper.INSTANCE.getJobForSeatedApp(this),
+                ConnectJobUtils.getJobForSeatedApp(this),
                 "View Job Status pressed but no Connect job was found for the seated app"
         );
         ConnectNavHelper.INSTANCE.goToActiveInfoForJob(this, job, true);

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

@@ -11,8 +11,9 @@
 
 import org.commcare.CommCareApplication;
 import org.commcare.CommCareNoficationManager;
-import org.commcare.connect.ConnectJobHelper;
+import org.commcare.connect.database.ConnectJobUtils;
 import org.commcare.android.database.connect.models.ConnectJobRecord;
+import org.commcare.connect.repository.ConnectRepository;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.connect.EmailOfferHelper;
 import org.commcare.dalvik.R;
@@ -369,7 +370,7 @@ void refreshCCUpdateOption() {
     public void fetchJobProgressOverNetwork() {
         ConnectJobRecord job = getActiveJob();
         if(job != null && job.getStatus() == ConnectJobRecord.STATUS_DELIVERING) {
-            ConnectJobHelper.INSTANCE.updateDeliveryProgress(this, job, (success, error) -> {
+            ConnectRepository.getInstance(this).updateDeliveryProgressForJava(job, (success, error) -> {
                 if (success) {
                     uiController.updateConnectJobProgress();
                 }
@@ -378,6 +379,6 @@ public void fetchJobProgressOverNetwork() {
     }
 
     public ConnectJobRecord getActiveJob() {
-        return ConnectJobHelper.INSTANCE.getJobForSeatedApp(this);
+        return ConnectJobUtils.getJobForSeatedApp(this);
     }
 }

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

@@ -25,7 +25,6 @@
 import org.commcare.android.database.connect.models.ConnectJobRecord;
 import org.commcare.android.database.connect.models.ConnectTaskRecord;
 import org.commcare.connect.ConnectDateUtils;
-import org.commcare.connect.ConnectJobHelper;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.connect.database.ConnectJobUtils;
 import org.commcare.connect.database.ConnectTaskUtils;
@@ -262,7 +261,7 @@ private Vector<String> getHiddenButtons() {
         if (!CommCareApplication.instance().getCurrentApp().hasVisibleTrainingContent()) {
             hiddenButtons.add("training");
         }
-        if (!ConnectJobHelper.INSTANCE.shouldShowJobStatus(activity, ccApp.getUniqueId())) {
+        if (!ConnectJobUtils.shouldShowJobStatus(activity, ccApp.getUniqueId())) {
             hiddenButtons.add("connect");
         }
         return hiddenButtons;

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

@@ -27,7 +27,6 @@
 import org.commcare.activities.NavigationHostCommCareActivity;
 import org.commcare.connect.ConnectConstants;
 import org.commcare.android.database.connect.models.ConnectJobRecord;
-import org.commcare.connect.ConnectJobHelper;
 import org.commcare.connect.ConnectNavHelper;
 import org.commcare.connect.MessageManager;
 import org.commcare.connect.PersonalIdManager;
@@ -161,7 +160,7 @@ private int handleSecureRedirect(Bundle startArgs) {
             );
         }
 
-        redirectionAction = ConnectJobHelper.INSTANCE.resolveGenericOpportunityDestination(
+        redirectionAction = ConnectJobUtils.resolveGenericOpportunityDestination(
                 redirectionAction, job, getIntent().getStringExtra(PAYMENT_UUID));