Feature/connect

app/build.gradle

@@ -85,9 +85,14 @@ dependencies {
     implementation 'joda-time:joda-time:2.9.4'
     implementation 'net.zetetic:android-database-sqlcipher:4.5.3@aar'
     implementation 'androidx.sqlite:sqlite:2.2.0'
+    implementation 'com.google.android.gms:play-services-auth:21.3.0'
+    implementation 'com.google.android.gms:play-services-auth-api-phone:18.1.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.google.android.gms:play-services-identity:18.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.5.0'
+
     implementation('org.apache.james:apache-mime4j:0.7.2') {
         exclude module: 'commons-io'
     }
@@ -419,7 +424,6 @@ android {
             resValue 'string', 'application_name', applicationName
         }
 
-
         cccStaging {
             buildConfigField 'String', 'CCC_HOST', "\"connect-staging.dimagi.com\""
 
@@ -607,7 +611,7 @@ static def numbersToLetters(String version) {
             case '8': words.append('eight'); break
             case '9': words.append('nine'); break
             case '0': words.append('zero'); break
-            default: break // skip non-numeric'
+            default: break // skip non-numeric
         }
     }
     return words.toString()

app/res/drawable-night/ic_connect_message_large.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M26.31,6.84C27.03,6.83 27.75,6.83 28.48,6.82C30.85,6.81 33.21,6.8 35.58,6.8C36.8,6.79 36.8,6.79 38.04,6.79C42.33,6.77 46.63,6.76 50.93,6.76C55.35,6.75 59.76,6.73 64.18,6.7C67.6,6.68 71.01,6.68 74.43,6.68C76.06,6.67 77.68,6.67 79.31,6.65C90.28,6.57 100.05,6.55 108.59,14.39C110,16 110,16 111.38,19.06C113.2,22.36 114.04,22.72 117.31,24.31C122.68,27.05 125.44,30.59 128,36C128.79,39.65 128.82,43.15 128.76,46.88C128.77,48.4 128.77,48.4 128.77,49.94C128.77,52.07 128.76,54.19 128.73,56.32C128.69,59.56 128.71,62.79 128.73,66.03C128.72,68.1 128.71,70.18 128.7,72.25C128.71,73.21 128.71,74.17 128.72,75.16C128.58,81.66 127.14,85.94 123,91C117.11,96.6 111.96,97.26 104.18,97.1C102.43,97.09 100.68,97.09 98.93,97.09C96.19,97.08 93.46,97.06 90.72,97C77.71,96.75 70.69,97.74 61,107C59.42,108.25 57.83,109.48 56.21,110.69C54.05,112.36 51.88,114.04 49.72,115.73C49.02,116.27 48.31,116.82 47.59,117.38C46.97,117.86 46.35,118.34 45.71,118.84C44,120 44,120 41,121C40.01,120.34 39.02,119.68 38,119C37.66,116.75 37.66,116.75 37.71,113.99C37.72,112.51 37.72,112.51 37.74,111C37.76,109.97 37.79,108.94 37.81,107.88C37.83,106.31 37.83,106.31 37.85,104.72C37.89,102.15 37.94,99.57 38,97C36.77,97.03 35.53,97.07 34.26,97.1C28.72,97.09 24.55,95.41 20.49,91.57C18.53,89.3 16.98,86.96 15.56,84.31C14.14,81.78 14.14,81.78 11.25,80.69C6.09,78.01 1.85,73.56 0,68C-0.1,66.51 -0.15,65.02 -0.16,63.53C-0.17,62.63 -0.18,61.73 -0.19,60.8C-0.19,59.83 -0.2,58.86 -0.2,57.86C-0.21,56.85 -0.21,55.85 -0.22,54.82C-0.23,52.69 -0.24,50.57 -0.24,48.45C-0.25,45.21 -0.28,41.97 -0.31,38.73C-0.32,36.67 -0.32,34.61 -0.33,32.54C-0.35,31.09 -0.35,31.09 -0.37,29.62C-0.34,22.82 0.78,18.58 5.31,13.31C11.81,7.72 17.98,6.88 26.31,6.84ZM9,20C7.3,22.83 6.74,24.94 6.71,28.21C6.7,29.04 6.68,29.86 6.67,30.7C6.67,31.58 6.67,32.46 6.66,33.37C6.66,34.28 6.65,35.19 6.64,36.13C6.63,38.06 6.63,39.99 6.63,41.92C6.63,44.86 6.59,47.8 6.55,50.74C6.54,52.61 6.54,54.49 6.54,56.37C6.52,57.24 6.51,58.12 6.5,59.02C6.54,64.48 7.25,67.74 11,72C13.1,73.39 13.1,73.39 15,74C15.01,72.92 15.02,71.84 15.03,70.73C15.07,66.7 15.13,62.66 15.21,58.63C15.24,56.89 15.26,55.15 15.27,53.41C15.29,50.9 15.34,48.39 15.39,45.88C15.39,45.11 15.39,44.34 15.39,43.55C15.54,37.97 16.94,33.7 20,29C22.04,27.16 22.04,27.16 24.06,26.06C24.73,25.68 25.41,25.3 26.1,24.91C30.19,22.95 33.55,22.85 38.04,22.79C38.75,22.78 39.47,22.77 40.2,22.76C42.55,22.73 44.91,22.71 47.26,22.68C48.89,22.66 50.53,22.64 52.16,22.62C56.45,22.57 60.75,22.52 65.05,22.47C69.43,22.42 73.81,22.36 78.2,22.31C86.8,22.2 95.4,22.1 104,22C102.3,18.21 100.75,16.88 97,15C93.33,13.78 89.78,13.87 85.94,13.85C85.24,13.85 84.53,13.85 83.81,13.84C81.49,13.84 79.17,13.83 76.85,13.83C75.23,13.83 73.62,13.83 72,13.82C68.61,13.82 65.23,13.81 61.84,13.81C57.51,13.81 53.17,13.8 48.84,13.78C45.5,13.77 42.16,13.77 38.82,13.77C37.23,13.77 35.63,13.77 34.03,13.76C31.79,13.75 29.56,13.75 27.32,13.76C26.05,13.76 24.78,13.75 23.47,13.75C17.48,14.18 13.36,15.88 9,20ZM24.16,34.58C21.05,38.63 21.3,42.85 21.37,47.78C21.37,48.71 21.37,49.64 21.36,50.6C21.36,52.57 21.38,54.53 21.4,56.49C21.44,59.49 21.42,62.48 21.4,65.48C21.41,67.39 21.42,69.31 21.43,71.22C21.43,72.11 21.42,73 21.42,73.92C21.52,79.43 22.34,82.62 26,87C30.03,90.54 34.43,90.5 39.57,90.79C42,91 42,91 44,92C44.5,100.42 44.5,100.42 45,109C48.81,107.09 51.93,104.86 55.25,102.25C56.87,100.98 58.5,99.72 60.14,98.47C61.37,97.5 62.57,96.49 63.75,95.45C69.05,90.96 72.93,90.16 79.76,90.34C80.66,90.33 81.57,90.33 82.51,90.32C85.38,90.31 88.25,90.34 91.13,90.38C94.01,90.4 96.89,90.41 99.77,90.41C101.55,90.4 103.34,90.42 105.12,90.45C110.58,90.45 113.67,89.65 118,86C122.07,80.53 122.16,74.94 122.2,68.32C122.21,67.59 122.21,66.86 122.22,66.11C122.23,64.56 122.24,63.02 122.24,61.48C122.25,59.14 122.28,56.8 122.31,54.46C122.32,52.95 122.32,51.45 122.33,49.95C122.35,48.91 122.35,48.91 122.37,47.85C122.34,41.87 120.93,37.31 117.06,32.69C112.67,29.1 109.05,28.71 103.48,28.73C102.35,28.72 102.35,28.72 101.2,28.71C98.72,28.7 96.24,28.7 93.76,28.7C92.03,28.7 90.3,28.69 88.57,28.69C84.95,28.68 81.33,28.68 77.7,28.68C73.07,28.69 68.43,28.67 63.8,28.65C60.22,28.64 56.65,28.63 53.08,28.64C51.37,28.64 49.67,28.63 47.96,28.62C45.56,28.61 43.17,28.62 40.78,28.63C40.08,28.62 39.37,28.61 38.65,28.6C32.5,28.67 28.67,30.49 24.16,34.58Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M45.05,67.85C46.99,67.85 46.99,67.85 48.97,67.84C50.4,67.83 51.82,67.83 53.25,67.83C54.7,67.83 56.15,67.83 57.6,67.82C60.65,67.82 63.69,67.81 66.74,67.81C70.65,67.81 74.55,67.8 78.46,67.78C81.46,67.77 84.46,67.77 87.46,67.77C88.9,67.77 90.34,67.77 91.78,67.76C93.79,67.75 95.81,67.75 97.82,67.76C99.54,67.75 99.54,67.75 101.3,67.75C104,68 104,68 106,70C105.46,73.54 105.46,73.54 104,75C101.99,75.1 99.97,75.14 97.95,75.15C96.66,75.15 95.36,75.16 94.03,75.16C92.6,75.17 91.18,75.17 89.75,75.17C88.3,75.17 86.85,75.17 85.4,75.18C82.35,75.18 79.31,75.19 76.26,75.19C72.35,75.19 68.45,75.2 64.54,75.22C61.54,75.23 58.54,75.23 55.54,75.23C54.1,75.23 52.66,75.23 51.22,75.24C49.21,75.25 47.19,75.25 45.18,75.24C43.46,75.25 43.46,75.25 41.7,75.25C39,75 39,75 37,73C37.85,67.41 39.74,67.87 45.05,67.85Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M38,55C60.11,55 82.22,55 105,55C105.5,56.98 105.5,56.98 106,59C104.94,60.73 104.94,60.73 103,62C100.27,62.38 100.27,62.38 96.92,62.39C95.05,62.4 95.05,62.4 93.13,62.42C91.76,62.41 90.4,62.41 89.03,62.4C87.63,62.4 86.23,62.4 84.83,62.41C81.89,62.41 78.96,62.41 76.02,62.39C72.26,62.37 68.5,62.38 64.73,62.4C61.84,62.41 58.95,62.41 56.06,62.4C54.67,62.4 53.28,62.4 51.89,62.41C49.95,62.42 48.02,62.4 46.08,62.39C44.97,62.39 43.87,62.38 42.73,62.38C40,62 40,62 38.06,60.73C37.53,59.87 37.53,59.87 37,59C37.33,57.68 37.66,56.36 38,55Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M46.08,40.61C47.33,40.6 48.58,40.59 49.87,40.58C51.24,40.59 52.6,40.59 53.97,40.6C55.37,40.6 56.77,40.6 58.17,40.59C61.11,40.59 64.04,40.59 66.98,40.61C70.74,40.63 74.5,40.62 78.27,40.6C81.16,40.59 84.05,40.59 86.94,40.6C88.33,40.6 89.72,40.6 91.11,40.59C93.05,40.58 94.98,40.6 96.92,40.61C98.03,40.61 99.13,40.62 100.27,40.62C103,41 103,41 104.94,42.27C105.29,42.84 105.64,43.41 106,44C105.67,45.32 105.34,46.64 105,48C82.89,48 60.78,48 38,48C37.67,46.68 37.34,45.36 37,44C39.24,40.34 42.06,40.62 46.08,40.61Z"
+      android:fillColor="#FFFFFF"/>
+</vector>

app/res/drawable/ic_connect_payment_revert.xml

@@ -6,5 +6,4 @@
     <path
         android:pathData="M6.002,15.417V14.167H11.982C12.852,14.167 13.6,13.88 14.227,13.305C14.855,12.731 15.168,12.022 15.168,11.178C15.168,10.334 14.855,9.626 14.227,9.054C13.6,8.483 12.852,8.197 11.982,8.197H6.131L8.45,10.516L7.572,11.394L3.75,7.572L7.572,3.75L8.45,4.628L6.131,6.947H11.982C13.201,6.947 14.245,7.354 15.115,8.167C15.984,8.981 16.418,9.985 16.418,11.178C16.418,12.371 15.984,13.376 15.115,14.192C14.245,15.009 13.201,15.417 11.982,15.417H6.002Z"
         android:fillColor="@color/connect_payment_revert"/>
-
 </vector>

app/res/layout-land/home_screen.xml

@@ -28,7 +28,7 @@
         app:cardCornerRadius="10dp"
         app:cardElevation="5dp"
         app:layout_constraintStart_toStartOf="parent"
-        >
+        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -148,5 +148,4 @@
                 android:scrollbars="vertical" />
         </RelativeLayout>
     </androidx.core.widget.NestedScrollView>
-
 </LinearLayout>

app/res/layout/fragment_connect_delivery_progress.xml

@@ -73,7 +73,7 @@
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/connect_payment_confirm_yes_button"
                         android:layout_width="wrap_content"
-                        android:layout_height="35dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:text="@string/connect_payment_confirm_yes"
                         android:textColor="@color/blue"
@@ -84,7 +84,7 @@
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/connect_payment_confirm_no_button"
                         android:layout_width="wrap_content"
-                        android:layout_height="35dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginEnd="10dp"
                         android:text="@string/connect_payment_confirm_no"
                         android:textColor="@color/blue"

app/res/layout/item_channel.xml

@@ -68,6 +68,7 @@
             app:layout_constraintStart_toEndOf="@+id/imgChannel"
             app:layout_constraintTop_toBottomOf="@+id/tvChannelName" />
 
+
         <TextView
             android:id="@+id/tvLastChatTime"
             android:layout_width="wrap_content"

app/res/menu/menu_connect.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_notification"
+        android:icon="@drawable/ic_connect_messaging_base"
+        android:title="Notification"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_sync"
+        android:icon="@drawable/ic_backup"
+        android:iconTint="@color/white"
+        android:title="Menu"
+        app:showAsAction="always" />
+</menu>

app/res/values/dimens.xml

@@ -151,6 +151,7 @@
     <dimen name="dp6">6dp</dimen>
     <dimen name="dp60">60dp</dimen>
     <dimen name="dp48">48dp</dimen>
+
     <!-- text margin in Map Info View -->
     <dimen name="text_margin">16dp</dimen>
 

app/src/org/commcare/CommCareApplication.java

@@ -18,22 +18,6 @@
 import android.os.StrictMode;
 import android.text.format.DateUtils;
 import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleEventObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
-import androidx.preference.PreferenceManager;
-import androidx.work.BackoffPolicy;
-import androidx.work.Constraints;
-import androidx.work.ExistingPeriodicWorkPolicy;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.NetworkType;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.PeriodicWorkRequest;
-import androidx.work.WorkManager;
-
 import com.google.common.collect.Multimap;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
@@ -42,11 +26,14 @@
 
 import org.commcare.activities.LoginActivity;
 import org.commcare.android.database.app.models.UserKeyRecord;
+import org.commcare.android.database.connect.models.ConnectJobRecord;
+import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.android.javarosa.AndroidLogEntry;
 import org.commcare.android.logging.ForceCloseLogEntry;
 import org.commcare.android.logging.ForceCloseLogger;
 import org.commcare.android.logging.ReportingUtils;
+import org.commcare.connect.ConnectManager;
 import org.commcare.core.graph.util.GraphUtil;
 import org.commcare.core.interfaces.HttpResponseProcessor;
 import org.commcare.core.network.AuthInfo;
@@ -143,6 +130,20 @@
 import javax.annotation.Nullable;
 import javax.crypto.SecretKey;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.preference.PreferenceManager;
+import androidx.work.BackoffPolicy;
+import androidx.work.Constraints;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
@@ -389,6 +390,8 @@ public void closeUserSession() {
 
             // Switch loggers back over to using global storage, now that we don't have a session
             setupLoggerStorage(false);
+
+            CrashUtil.registerUserData();
         }
     }
 
@@ -436,6 +439,15 @@ synchronized public FirebaseAnalytics getAnalyticsInstance() {
         }
         analyticsInstance.setUserId(getUserIdOrNull());
 
+        ConnectUserRecord user = ConnectManager.getUser(this);
+        if (user != null) {
+            analyticsInstance.setUserProperty("user_cid", user.getUserId());
+        }
+
+        ConnectJobRecord activeJob = ConnectManager.getActiveJob();
+        if (activeJob != null) {
+            analyticsInstance.setUserProperty("ccc_job_id", String.valueOf(activeJob.getJobId()));
+        }
         return analyticsInstance;
     }
 

app/src/org/commcare/CommCareNoficationManager.java

@@ -12,9 +12,6 @@
 import android.os.Bundle;
 import android.os.Message;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.NotificationCompat;
-
 import org.commcare.activities.MessageActivity;
 import org.commcare.dalvik.R;
 import org.commcare.utils.PopupHandler;
@@ -25,8 +22,10 @@
 import java.util.ArrayList;
 import java.util.Vector;
 
-import static android.content.Context.NOTIFICATION_SERVICE;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.NotificationCompat;
 
+import static android.content.Context.NOTIFICATION_SERVICE;
 import static org.commcare.sync.ExternalDataUpdateHelper.sendBroadcastFailSafe;
 
 /**
@@ -41,6 +40,7 @@ public class CommCareNoficationManager {
     public static final String NOTIFICATION_CHANNEL_USER_SESSION_ID = "notification-channel-user-session";
     public static final String NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID = "notification-channel-server-communications";
     public static final String NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID = "notification-channel-push-notifications";
+    public static final String NOTIFICATION_CHANNEL_MESSAGING_ID = "notification-channel-messaging";
 
     /**
      * Handler to receive notifications and show them the user using toast.
@@ -196,6 +196,11 @@ public void createNotificationChannels() {
                 R.string.notification_channel_push_notfications_title,
                 R.string.notification_channel_push_notfications_description,
                 NotificationManager.IMPORTANCE_DEFAULT);
+
+        createNotificationChannel(NOTIFICATION_CHANNEL_MESSAGING_ID,
+                R.string.notification_channel_messaging_title,
+                R.string.notification_channel_messaging_description,
+                NotificationManager.IMPORTANCE_MAX);
     }
 
     @TargetApi(Build.VERSION_CODES.O)

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

@@ -36,6 +36,7 @@
 import org.commcare.android.database.global.models.ApplicationRecord;
 import org.commcare.connect.ConnectConstants;
 import org.commcare.connect.ConnectIDManager;
+import org.commcare.connect.ConnectManager;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.dalvik.R;
 import org.commcare.engine.resource.AppInstallStatus;
@@ -140,8 +141,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         connectIDManager.init(this);
         presetAppId = getIntent().getStringExtra(EXTRA_APP_ID);
-        ///TODO: connect uncomment with connect merge
-//        appLaunchedFromConnect = ConnectIDManager.wasAppLaunchedFromConnect(presetAppId);
+        appLaunchedFromConnect = ConnectManager.wasAppLaunchedFromConnect(presetAppId);
         connectLaunchPerformed = false;
         if (savedInstanceState == null) {
             // Only restore last user on the initial creation
@@ -406,6 +406,9 @@ private boolean tryLocalLogin(final String username, String passwordOrPin,
                                   LoginMode loginMode, boolean blockRemoteKeyManagement,
                                   DataPullMode pullModeToUse) {
         try {
+            passwordOrPin = ConnectManager.checkAutoLoginAndOverridePassword(this,
+                    presetAppId, username, passwordOrPin, appLaunchedFromConnect,
+                    loginManagedByConnectId());
 
             final boolean triggerMultipleUsersWarning = getMatchingUsersCount(username) > 1
                     && warnMultipleAccounts;
@@ -465,7 +468,7 @@ private boolean handleConnectSignIn(CommCareActivity<?> context, String username
         if (connectIDManager.isloggedIn()) {
             connectIDManager.completeSignin();
             String appId = CommCareApplication.instance().getCurrentApp().getUniqueId();
-            ConnectJobRecord job = connectIDManager.setConnectJobForApp(context, appId);
+            ConnectJobRecord job = ConnectManager.setConnectJobForApp(context, appId);
 
             if (job != null) {
                 connectIDManager.updateAppAccess(context, appId, username);

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

@@ -22,18 +22,27 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(getLayoutResource());
         destinationListener = FirebaseAnalyticsUtil.getNavControllerPageChangeLoggingListener();
         navController = getHostFragment().getNavController();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         navController.addOnDestinationChangedListener(destinationListener);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        navController.removeOnDestinationChangedListener(destinationListener);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        NavController navController = getHostFragment().getNavController();
-        navController.removeOnDestinationChangedListener(destinationListener);
         destinationListener = null;
     }
 
-   protected abstract int getLayoutResource();
+    protected abstract int getLayoutResource();
 
     protected abstract NavHostFragment getHostFragment();
 }