-handled connect manager removed unused code for now

dimagi · Feb 26, 2025 · 0e4b430 · 0e4b430
1 parent 838f48d
commit 0e4b430
Show file tree

Hide file tree

Showing 19 changed files with 437 additions and 1,149 deletions.
diff --git a/app/src/org/commcare/activities/CommCareSetupActivity.java b/app/src/org/commcare/activities/CommCareSetupActivity.java
@@ -24,7 +24,7 @@
 import org.commcare.AppUtils;
 import org.commcare.CommCareApp;
 import org.commcare.CommCareApplication;
-import org.commcare.connect.ConnectManager;
+import org.commcare.connectId.ConnectIDManager;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.dalvik.R;
 import org.commcare.engine.resource.AppInstallStatus;
@@ -170,7 +170,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
         if(!fromManager) {
-            ConnectManager.init(this);
+            ConnectIDManager.getInstance().init(this);
         }
         loadIntentAndInstanceState(savedInstanceState);
         persistCommCareAppState();
@@ -424,7 +424,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 finish();
                 return;
             default:
-                ConnectManager.handleFinishedActivity(this, requestCode, resultCode, data);
+                ConnectIDManager.getInstance().handleFinishedActivity(this, requestCode, resultCode, data);
                 return;
 
         }
@@ -495,12 +495,12 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
         MenuItem item = menu.findItem(MENU_CONNECT_SIGN_IN);
         if (item != null) {
-            item.setVisible(!fromManager && !fromExternal && ConnectManager.shouldShowSignInMenuOption());
+            item.setVisible(!fromManager && !fromExternal && !ConnectIDManager.isLoggedIN());
         }
 
         item = menu.findItem(MENU_CONNECT_FORGET);
         if (item != null) {
-            item.setVisible(!fromManager && !fromExternal && ConnectManager.shouldShowSignOutMenuOption());
+            item.setVisible(!fromManager && !fromExternal && ConnectIDManager.isLoggedIN());
         }
         return true;
     }
@@ -628,24 +628,24 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
             case MENU_CONNECT_SIGN_IN:
                 //Setup ConnectID and proceed to jobs page if successful
-                ConnectManager.registerUser(this, success -> {
+                ConnectIDManager.getInstance().registerUser(this, success -> {
                     updateConnectButton();
                     if(success) {
 //                        ConnectManager.goToConnectJobsList(this);
                     }
                 });
                 break;
             case MENU_CONNECT_FORGET:
-                ConnectManager.forgetUser("User initiated from setup page");
+                ConnectIDManager.forgetUser("User initiated from setup page");
                 updateConnectButton();
                 break;
         }
         return true;
     }
 
     private void updateConnectButton() {
-        installFragment.updateConnectButton(!fromManager && !fromExternal && ConnectManager.isConnectIdConfigured(), v -> {
-            ConnectManager.unlockConnect(this, success -> {
+        installFragment.updateConnectButton(!fromManager && !fromExternal && ConnectIDManager.isLoggedIN(), v -> {
+            ConnectIDManager.getInstance().unlockConnect(this, success -> {
 //                ConnectManager.goToConnectJobsList(this);
             });
         });

diff --git a/app/src/org/commcare/activities/LoginActivity.java b/app/src/org/commcare/activities/LoginActivity.java
@@ -22,7 +22,7 @@
 import org.commcare.CommCareApplication;
 import org.commcare.android.database.app.models.UserKeyRecord;
 import org.commcare.android.database.global.models.ApplicationRecord;
-import org.commcare.connect.ConnectManager;
+import org.commcare.connectId.ConnectIDManager;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.dalvik.R;
 import org.commcare.engine.resource.AppInstallStatus;
@@ -124,10 +124,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         uiController.setupUI();
         formAndDataSyncer = new FormAndDataSyncer();
-        ConnectManager.init(this);
-        uiController.updateConnectLoginState();
+        ConnectIDManager.getInstance().init(this);
         presetAppId = getIntent().getStringExtra(EXTRA_APP_ID);
-        appLaunchedFromConnect = ConnectManager.wasAppLaunchedFromConnect(presetAppId);
+        appLaunchedFromConnect = ConnectIDManager.getInstance().wasAppLaunchedFromConnect(presetAppId);
         connectLaunchPerformed = false;
 
         if (savedInstanceState == null) {
@@ -258,10 +257,8 @@ protected void onResume() {
 
         // Otherwise, refresh the activity for current conditions
         uiController.refreshView();
-        uiController.updateConnectLoginState();
         checkForSavedCredentials();
-
-        ConnectManager.setParent(this);
+        ConnectIDManager.getInstance().setParent(this);
     }
 
     protected boolean checkForSeatedAppChange() {
@@ -326,7 +323,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
             invalidateOptionsMenu();
             usernameBeforeRotation = passwordOrPinBeforeRotation = null;
         } else {
-            ConnectManager.handleFinishedActivity(this, requestCode, resultCode, intent);
+            ConnectIDManager.getInstance().handleFinishedActivity(this, requestCode, resultCode, intent);
         }
         super.onActivityResult(requestCode, resultCode, intent);
     }
@@ -436,8 +433,8 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         menu.findItem(MENU_PERMISSIONS).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
         menu.findItem(MENU_PASSWORD_MODE).setVisible(uiController.getLoginMode() == LoginMode.PIN);
-        menu.findItem(MENU_CONNECT_SIGN_IN).setVisible(ConnectManager.shouldShowSignInMenuOption());
-        menu.findItem(MENU_CONNECT_FORGET).setVisible(ConnectManager.shouldShowSignOutMenuOption());
+        menu.findItem(MENU_CONNECT_SIGN_IN).setVisible(!ConnectIDManager.isLoggedIN());
+        menu.findItem(MENU_CONNECT_FORGET).setVisible(ConnectIDManager.isLoggedIN());
         return true;
     }
 
@@ -466,7 +463,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 registerConnectIdUser();
                 return true;
             case MENU_CONNECT_FORGET:
-                ConnectManager.forgetUser("User initiated from login page");
+                ConnectIDManager.forgetUser("User initiated from login page");
                 uiController.setPasswordOrPin("");
                 uiController.refreshView();
                 uiController.setConnectIdLoginState(false);
@@ -793,14 +790,14 @@ protected String getPresetAppID() {
 
     public void registerConnectIdUser() {
         selectedAppIndex = -1;
-        ConnectManager.registerUser(this, success -> {
+        ConnectIDManager.getInstance().registerUser(this, success -> {
             //Do nothing, just return to login page
         });
     }
 
     private void checkForSavedCredentials() {
         boolean loginWithConnectIDVisible = false;
-        if (ConnectManager.isConnectIdConfigured()) {
+        if (ConnectIDManager.isLoggedIN()) {
             if (appLaunchedFromConnect && !connectLaunchPerformed) {
                 loginWithConnectIDVisible = true;
                 uiController.setConnectButtonVisible(false);
@@ -817,7 +814,7 @@ private void checkForSavedCredentials() {
                     String selectedAppId = appIdDropdownList.size() > 0 ? appIdDropdownList.get(selectorIndex) : "";
                     String seatedAppId = CommCareApplication.instance().getCurrentApp().getUniqueId();
                     if (!uiController.isAppSelectorVisible() || selectedAppId.equals(seatedAppId)) {
-                        loginWithConnectIDVisible = ConnectManager.isLoginManagedByConnectId(seatedAppId,
+                        loginWithConnectIDVisible = ConnectIDManager.getInstance().isLoginManagedByConnectId(seatedAppId,
                                 uiController.getEnteredUsername());
                     }
                 } else {
@@ -834,7 +831,7 @@ protected String getPresetAppId() {
         return presetAppId;
     }
     private boolean isConnectJobsSelected() {
-        return ConnectManager.isConnectIdConfigured() && uiController.getSelectedAppIndex() == 0;
+        return ConnectIDManager.isLoggedIN() && uiController.getSelectedAppIndex() == 0;
     }
 
 }
diff --git a/app/src/org/commcare/activities/LoginActivityUIController.java b/app/src/org/commcare/activities/LoginActivityUIController.java
@@ -24,7 +24,7 @@
 import org.commcare.android.database.app.models.UserKeyRecord;
 import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.android.database.global.models.ApplicationRecord;
-import org.commcare.connect.ConnectManager;
+import org.commcare.connectId.ConnectIDManager;
 import org.commcare.connect.database.ConnectUserDatabaseUtil;
 import org.commcare.dalvik.R;
 import org.commcare.interfaces.CommCareActivityUIController;
@@ -198,15 +198,14 @@ private void setBannerLayoutLogic() {
     @Override
     public void refreshView() {
         updateBanner();
-
         activity.restoreEnteredTextFromRotation();
 
         // Decide whether or not to show the app selection spinner based upon # of usable apps
         ArrayList<ApplicationRecord> readyApps = MultipleAppsUtil.getUsableAppRecords();
         ApplicationRecord presetAppRecord = getPresetAppRecord(readyApps);
         boolean noApps = readyApps.isEmpty();
         setLoginInputsVisibility(!noApps);
-        if (!ConnectManager.isConnectIdConfigured() && readyApps.size() == 1 || presetAppRecord != null) {
+        if (!ConnectIDManager.isLoggedIN() && readyApps.size() == 1 || presetAppRecord != null) {
             setLoginInputsVisibility(true);
             // Set this app as the last selected app, for use in choosing what app to initialize
             // on first startup
@@ -543,12 +542,12 @@ public void setLoginInputsVisibility(boolean visible) {
     }
 
     public void updateConnectLoginState() {
-        setConnectButtonVisible(ConnectManager.shouldShowConnectButton());
+        setConnectButtonVisible(ConnectIDManager.isLoggedIN());
         if(activity==null){
             return;
         }
 
-        if (ConnectManager.isConnectIdConfigured()) {
+        if (ConnectIDManager.isLoggedIN()) {
             ConnectUserRecord user = ConnectUserDatabaseUtil.getUser(activity);
             if (user == null || user.getName() == null) {
                 welcomeMessage.setText(activity.getString(R.string.default_welcome_message));

diff --git a/app/src/org/commcare/activities/connect/ConnectIdActivity.java b/app/src/org/commcare/activities/connect/ConnectIdActivity.java
@@ -7,8 +7,7 @@
 import org.commcare.activities.CommCareActivity;
 import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.connect.ConnectConstants;
-import org.commcare.connect.database.ConnectDatabaseHelper;
-import org.commcare.connect.ConnectManager;
+import org.commcare.connectId.ConnectIDManager;
 import org.commcare.connect.database.ConnectUserDatabaseUtil;
 import org.commcare.dalvik.R;
 import org.commcare.fragments.connectId.ConnectIDSignupFragmentDirections;
@@ -85,7 +84,7 @@ public void beginRegistration(Context parent) {
         forgotPassword = false;
         forgotPin = false;
         NavDirections navDirections = null;
-        switch (ConnectManager.getStatus()) {
+        switch (ConnectIDManager.getInstance().getStatus()) {
             case NotIntroduced :
                 navDirections = ConnectIDSignupFragmentDirections.actionConnectidSignupFragmentSelf()
                         .setCallingClass(ConnectConstants.CONNECT_REGISTRATION_PRIMARY_PHONE);