ConnectID Initial Implementation

app/build.gradle

@@ -31,6 +31,7 @@ configurations {
 }
 
 dependencies {
+    implementation 'androidx.security:security-crypto:1.0.0'
     testImplementation 'junit:junit:4.12'
     testImplementation('org.robolectric:robolectric:4.8.2') {
         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')
@@ -249,7 +250,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 23
         targetSdkVersion 31
         multiDexEnabled true
         applicationId "org.commcare.dalvik"

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

@@ -6,15 +6,26 @@
 import android.content.SharedPreferences;
 import android.widget.Toast;
 
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteException;
+
 import org.commcare.CommCareApplication;
+import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.core.network.AuthInfo;
+import org.commcare.models.database.AndroidDbHelper;
+import org.commcare.models.database.MigrationException;
+import org.commcare.models.database.SqlStorage;
+import org.commcare.models.database.connect.DatabaseConnectOpenHelper;
+import org.commcare.modern.database.Table;
+import org.commcare.utils.EncryptionUtils;
 import org.commcare.views.dialogs.DialogChoiceItem;
 import org.commcare.views.dialogs.PaneledChoiceDialog;
 import org.javarosa.core.services.locale.Localization;
+import org.javarosa.core.services.storage.Persistable;
 
 public class ConnectIDManager {
     //ConnectID UI elements hidden from user when this is set to false
-    public static final boolean ENABLE_CONNECT_ID = false;
+    public static final boolean ENABLE_CONNECT_ID = true;
 
     public enum ConnectIDStatus {
         NotIntroduced,
@@ -41,15 +52,24 @@ public interface ConnectActivityCompleteListener {
     private static final int CONNECT_PICTURES_ACTIVITY = 1005;
     private static final int CONNECT_PHONE_VERIFY_ACTIVITY = 1006;
 
+    private static final int STATE_UNINSTALLED = 0;
+    private static final int STATE_READY = 2;
+    public static final int STATE_CORRUPTED = 4;
+    public static final int STATE_LEGACY_DETECTED = 8;
+    public static final int STATE_MIGRATION_FAILED = 16;
+    public static final int STATE_MIGRATION_QUESTIONABLE = 32;
+
+
     private static ConnectIDManager manager = null;
+    private final Object connectDbHandleLock = new Object();
+    private SQLiteDatabase connectDatabase;
+//    private int dbState;
     private ConnectIDStatus connectStatus = ConnectIDStatus.NotIntroduced;
     private CommCareActivity<?> parentActivity;
     private ConnectActivityCompleteListener loginListener;
     private ConnectActivityCompleteListener registrationListener;
     private RegistrationPhase phase = RegistrationPhase.Initial;
 
-    private ConnectIDUser user = null;
-
     private ConnectIDManager() {
     }
 
@@ -61,27 +81,71 @@ private static ConnectIDManager getInstance() {
         return manager;
     }
 
-    public static void loadUserFromPreferences() {
-        ConnectIDManager manager= getInstance();
-        SharedPreferences prefs = CommCareApplication.instance().getCurrentApp().getAppPreferences();
-        manager.user = ConnectIDUser.getUserFromPreferences(prefs);
-        if(manager.user != null && manager.connectStatus == ConnectIDStatus.NotIntroduced) {
+    public static void init(CommCareActivity<?> parent) {
+        ConnectIDManager manager = getInstance();
+        manager.parentActivity = parent;
+        manager.initConnectDb();
+
+        ConnectUserRecord user = getUser();
+        if(user != null && manager.connectStatus == ConnectIDStatus.NotIntroduced) {
             manager.connectStatus = ConnectIDStatus.LoggedOut;
         }
     }
 
-    public static void storeUserInPreferences() {
-        SharedPreferences prefs = CommCareApplication.instance().getCurrentApp().getAppPreferences();
-        ConnectIDUser.storeUserInPreferences(getInstance().user, prefs);
+    private int initConnectDb() {
+        SQLiteDatabase database;
+        try {
+            database = new DatabaseConnectOpenHelper(parentActivity).getWritableDatabase(EncryptionUtils.GetConnectDbPassphrase(parentActivity));
+            database.close();
+            return STATE_READY;
+        } catch (SQLiteException e) {
+            // Only thrown if DB isn't there
+            return STATE_UNINSTALLED;
+        } catch (MigrationException e) {
+            if (e.isDefiniteFailure()) {
+                return STATE_MIGRATION_FAILED;
+            } else {
+                return STATE_MIGRATION_QUESTIONABLE;
+            }
+        }
     }
 
-    public static void loadUserFromIntent(Intent intent) {
-        getInstance().user = ConnectIDUser.getUserFromIntent(intent);
-        storeUserInPreferences();
+    public <T extends Persistable> SqlStorage<T> getConnectStorage(Class<T> c) {
+        return getConnectStorage(c.getAnnotation(Table.class).value(), c);
+    }
+
+    public <T extends Persistable> SqlStorage<T> getConnectStorage(String table, Class<T> c) {
+        return new SqlStorage<>(table, c, new AndroidDbHelper(parentActivity.getApplicationContext()) {
+            @Override
+            public SQLiteDatabase getHandle() {
+                synchronized (connectDbHandleLock) {
+                    if (connectDatabase == null || !connectDatabase.isOpen()) {
+                        connectDatabase = new DatabaseConnectOpenHelper(this.c).getWritableDatabase(EncryptionUtils.GetConnectDbPassphrase(parentActivity));
+                    }
+                    return connectDatabase;
+                }
+            }
+        });
     }
 
-    public static ConnectIDUser getUser() {
-        return getInstance().user;
+    public static ConnectUserRecord getUser() {
+        ConnectUserRecord user = null;
+        ConnectIDManager manager= getInstance();
+        for (ConnectUserRecord r : manager.getConnectStorage(ConnectUserRecord.class)) {
+            user = r;
+            break;
+        }
+
+        return user;
+    }
+
+    public static void storeUser(ConnectUserRecord user) {
+        getInstance().getConnectStorage(ConnectUserRecord.class).write(user);
+    }
+
+    public static void loadUserFromIntent(Intent intent) {
+        ConnectUserRecord user = ConnectUserRecord.getUserFromIntent(intent);
+        storeUser(user);
     }
 
     public static boolean isConnectIDIntroduced() {
@@ -174,9 +238,9 @@ public static void signOut() {
     }
 
     public static void forgetUser() {
-        getInstance().connectStatus = ConnectIDStatus.NotIntroduced;
-        getInstance().user = null;
-        storeUserInPreferences();
+        ConnectIDManager manager = getInstance();
+        manager.connectStatus = ConnectIDStatus.NotIntroduced;
+        manager.getConnectStorage(ConnectUserRecord.class).remove(getUser().getID());
     }
 
     public static void beginRegistrationWorkflow(CommCareActivity<?> activity, ConnectActivityCompleteListener listener) {
@@ -255,9 +319,10 @@ public static void handleFinishedActivity(int requestCode, int resultCode, Inten
         if(nextActivity != null) {
             Intent i = new Intent(manager.parentActivity, nextActivity);
 
-            if(manager.user != null) {
-                i.putExtra(ConnectIDPhoneVerificationActivity.USERNAME, manager.user.Username);
-                i.putExtra(ConnectIDPhoneVerificationActivity.PASSWORD, manager.user.Password);
+            ConnectUserRecord user = getUser();
+            if(user != null) {
+                i.putExtra(ConnectIDPhoneVerificationActivity.USERNAME, user.getUserID());
+                i.putExtra(ConnectIDPhoneVerificationActivity.PASSWORD, user.getPassword());
             }
 
             manager.parentActivity.startActivityForResult(i, nextRequestCode);

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

@@ -7,6 +7,7 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.gson.Gson;
 
+import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.core.network.AuthInfo;
 import org.commcare.core.network.HTTPMethod;
 import org.commcare.dalvik.R;
@@ -37,7 +38,7 @@ public class ConnectIDRegistrationActivity extends CommCareActivity<ConnectIDReg
 
     private ConnectIDRegistrationActivityUIController uiController;
 
-    private ConnectIDUser user;
+    private ConnectUserRecord user;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,28 +86,25 @@ private String generatePassword() {
     public void createAccount() {
         String url = getString(R.string.ConnectURL) + "/users/register";
 
-        user = new ConnectIDUser();
-        user.Username = uiController.getUserIdText();
-        user.Name = uiController.getNameText();
-        user.DOB = uiController.getDOBText();
-        user.Phone = uiController.getPhoneText();
-        user.AltPhone = uiController.getAltPhoneText();
-        user.Password = generatePassword();
+        user = new ConnectUserRecord(uiController.getUserIdText(),
+                generatePassword(), uiController.getNameText());
+        String dob = uiController.getDOBText();
+        String phone = uiController.getPhoneText();
+        String altPhone = uiController.getAltPhoneText();
 
         HashMap<String, String> params = new HashMap<>();
         //params.put("device_id", CommCareApplication.instance().getPhoneId());
-        params.put("username", user.Username);
-        params.put("password", user.Password);
-        params.put("name", user.Name);
-        params.put("dob", user.DOB);
-        params.put("phone_number", user.Phone);
-        //params.put("recovery_phone", user.AltPhone);
+        params.put("username", user.getUserID());
+        params.put("password", user.getPassword());
+        params.put("name", user.getName());
+        params.put("dob", dob);
+        params.put("phone_number", phone);
+        params.put("recovery_phone", altPhone);
 
         Gson gson = new Gson();
         String json = gson.toJson(params);
 
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), json);
-        //RequestBody requestBody = ModernHttpRequester.getPostBody(params);
         ModernHttpTask postTask =
                 new ModernHttpTask(this, url,
                         ImmutableMultimap.of(),

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

@@ -109,8 +109,6 @@ public class LoginActivity extends CommCareActivity<LoginActivity>
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ConnectIDManager.loadUserFromPreferences();
-
         checkManagedConfiguration();
 
         if (shouldFinish()) {
@@ -122,6 +120,7 @@ protected void onCreate(Bundle savedInstanceState) {
         uiController.setupUI();
         formAndDataSyncer = new FormAndDataSyncer();
 
+        ConnectIDManager.init(this);
         if(ConnectIDManager.ENABLE_CONNECT_ID && ConnectIDManager.isConnectIDIntroduced()) {
             uiController.showConnectIDButton();
             updateConnectButton();

app/src/org/commcare/android/database/connect/models/ConnectLinkedAppRecord.java

@@ -0,0 +1,22 @@
+package org.commcare.android.database.connect.models;
+
+import org.commcare.android.storage.framework.Persisted;
+import org.commcare.models.framework.Persisting;
+import org.commcare.modern.database.Table;
+
+@Table(org.commcare.android.database.connect.models.ConnectUserRecord.STORAGE_KEY)
+public class ConnectLinkedAppRecord extends Persisted {
+    /**
+     * Name of database that stores Connect user records
+     */
+    public static final String STORAGE_KEY = "app_info";
+
+    @Persisting(1)
+    private String appID;
+
+    @Persisting(2)
+    private String userID;
+
+    @Persisting(3)
+    private String password;
+}