Connect QA 2025 03

app/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           android:versionCode="106"
-          android:versionName="2.56">
+          android:versionName="2.57">
 
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -53,6 +53,10 @@
         android:name="android.hardware.camera"
         android:required="false"/>
 
+    <uses-sdk tools:overrideLibrary="com.dimagi.android.zebraprinttool, com.simprints.libsimprints,
+    ru.noties.markwon.il, ru.noties.markwon.view, ru.noties.markwon.renderer,
+    com.google.firebase.crashlytics, com.google.firebase.iid, com.appmattus.certificatetransparency"/>
+
     <permission-group
         android:name="commcare.permission-group.DATABASE"
         android:description="@string/permission_content_provider_description"
@@ -118,38 +122,36 @@
     </queries>
 
     <application
-        android:name="org.commcare.CommCareApplication"
         android:allowBackup="false"
-        android:enableOnBackInvokedCallback="false"
-        android:hardwareAccelerated="true"
+        tools:replace="android:label,android:icon,android:theme, android:allowBackup"
+        android:name="org.commcare.CommCareApplication"
         android:icon="@mipmap/commcare_launcher"
-        android:label="@string/application_name"
         android:supportsRtl="true"
-        android:theme="@style/AppBaseTheme"
+        android:label="@string/application_name"
+        android:hardwareAccelerated="true"
         android:usesCleartextTraffic="true"
-        tools:replace="android:label,android:icon,android:theme, android:allowBackup">
-        <activity
-            android:name="org.commcare.activities.connect.ConnectMessagingActivity"
-            android:exported="true" >
-        </activity>
+        android:theme="@style/AppBaseTheme"
+        android:enableOnBackInvokedCallback="false">
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="@string/fcm_default_notification_channel" />
-
         <receiver
             android:name="org.commcare.connect.SMSBroadcastReceiver"
             android:exported="true"
             android:permission="com.google.android.gms.auth.api.phone.permission.SEND">
             <intent-filter>
-                <action android:name="com.google.android.gms.auth.api.phone.SMS_RETRIEVED" />
+                <action android:name="com.google.android.gms.auth.api.phone.SMS_RETRIEVED"/>
             </intent-filter>
         </receiver>
-
         <activity
-            android:name="org.commcare.activities.DispatchActivity"
+            android:name="org.commcare.activities.connect.ConnectMessagingActivity"
+            android:exported="true" >
+        </activity>
+        <activity
+            android:label="@string/application_name"
             android:exported="true"
-            android:label="@string/application_name">
+            android:name="org.commcare.activities.DispatchActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -170,6 +172,9 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="org.commcare.activities.connect.ConnectIdActivity"
+            android:screenOrientation="portrait"/>
         <activity
             android:name="org.commcare.activities.LoginActivity"
             android:label="@string/application_name"
@@ -180,9 +185,6 @@
         <activity android:name="org.commcare.activities.StandardHomeActivity" />
         <activity android:name="org.commcare.activities.RootMenuHomeActivity" />
         <activity android:name="org.commcare.activities.MenuActivity" />
-        <activity
-            android:name="org.commcare.activities.connect.ConnectIdActivity"
-            android:theme="@style/NoAppBarTheme" />
         <activity
             android:name="org.commcare.activities.connect.ConnectActivity" />
         <activity android:name="org.commcare.activities.AppSelectActivity" />

app/assets/locales/android_translatable_strings.txt

@@ -206,8 +206,8 @@ post.server.error=Server-side error (code ${0}) received from network request.
 post.gone.error=Case is not present on server.
 post.conflict.error=You have already claimed this case.
 
-version.id.long=CommCare Android, version "${0}"(${1}). App v${5}. CommCare Version ${2}. Build ${3}, built on: ${4}
-version.id.short=CCDroid:"${0}"(${1}). v${5} CC${2}b[${3}] on ${4}
+version.id.long=CommCare Android, version "${0}"(${1}). App v${4}. CommCare Version ${0}. Build ${2}, built on: ${3}
+version.id.short=CCDroid:"${0}"(${1}). v${4} CC${0}b[${2}] on ${3}
 commcare.version=CommCare Android, version "${0}"(${1}), built on: ${2}
 
 auth.request.not.using.https=${0} is an invalid URL. CommCare can't connect with authentication to an insecure (HTTP) server.
@@ -556,6 +556,14 @@ notification.bad.certificate.detail=CommCare couldn't validate the security info
 notification.bad.certificate.action=Check your device's time and date to make sure they are correct. If the problem persists, try to connect to a secure server with the phone's browser
 notification.bad.certificate.button=Go to settings
 
+notification.token.unavailable.title=Couldn't connect to the server.
+notification.token.unavailable.detail=CommCare had an issue authenticating the user.
+notification.token.unavailable.action=Check your device's time and date to make sure they are correct, then try again.
+
+notification.token.denied.title=Couldn't connect to the server.
+notification.token.denied.detail=CommCare can no longer communicate with the ConnectID server.
+notification.token.denied.action=Please recover your ConnectID account, then try again.
+
 notification.restore.storagefull.title=Couldn't save your application's resources
 notification.restore.storagefull.detail=CommCare was not able to save one or more of your application's resources on the device. This could be because the entire application was too large, or because an individual fixture exceeded 1MB.
 notification.restore.storagefull.action=Check the amount of space available on your device. If the SD card isn't full, then it's likely one of your fixtures is too large (> 1MB) and needs to be reduced or split.

app/build.gradle

@@ -14,15 +14,16 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'androidx.navigation.safeargs'
 apply from: 'jacoco.gradle'
+apply plugin: "androidx.navigation.safeargs"
 
 repositories {
     // for local aar inclusion
     flatDir {
         dirs 'libs'
     }
     maven { url 'https://jitpack.io' }
+    maven {url 'https://repository.liferay.com/nexus/content/repositories/public/'}
 }
 
 configurations {
@@ -31,6 +32,7 @@ configurations {
 }
 
 dependencies {
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
     testImplementation 'junit:junit:4.13.2'
     testImplementation('org.robolectric:robolectric:4.8.2') {
         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')
@@ -71,11 +73,7 @@ dependencies {
     implementation fileTree(include: '*.jar', exclude: 'regexp-me.jar', dir: 'libs')
     implementation(name: 'htmlspanner-custom', ext: 'aar')
     implementation 'com.github.dimagi:zebra-print-android:v1.3'
-    implementation (name: 'LibSimprints-1.0.12', ext: 'aar')
-    implementation (name: 'mapbox-android-accounts-0.2.0', ext: 'aar')
-    implementation (name: 'realm-android-library-4.1.1', ext: 'aar')
-    implementation (name: 'volley-1.1.0', ext: 'aar')
-    implementation (name: 'storage-2.1.0', ext: 'aar')
+    implementation 'com.simprints:libsimprints:2024.2.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
@@ -107,9 +105,10 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
-    implementation 'com.google.firebase:firebase-analytics:17.5.0'
+    implementation 'com.google.firebase:firebase-analytics:20.1.2'
     implementation 'com.google.firebase:firebase-messaging:21.1.0'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics:18.3.7'
+
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
     implementation('com.github.bumptech.glide:glide:4.9.0') {
         exclude group: 'com.android.support'
@@ -125,12 +124,13 @@ dependencies {
     implementation "io.noties.markwon:ext-tables:$markwon_version"
     implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
 
+    // Kujaku
+    implementation 'com.android.volley:volley:1.2.1'
+    implementation 'com.snatik:storage:2.1.0'
     implementation('io.ona.kujaku:library:0.9.0') {
         exclude module: 'xpp3'
         exclude module: 'volley'
         exclude module: 'storage'
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
-        exclude group: 'io.realm'
     }
     implementation 'androidx.work:work-runtime:2.10.0'
     implementation 'androidx.work:work-runtime-ktx:2.10.0'
@@ -148,15 +148,16 @@ dependencies {
 
     implementation 'com.appmattus.certificatetransparency:certificatetransparency-android:2.5.4'
 
-    // Dependency required for API desugaring
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_minimal:2.1.3'
-
     implementation 'androidx.biometric:biometric:1.1.0'
 
     implementation 'io.michaelrocks:libphonenumber-android:8.13.11'
     implementation 'com.nulab-inc:zxcvbn:1.7.0'
-
-    def nav_version = '2.8.5'
+    // Dependency required for API desugaring
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_minimal:2.1.3'
+    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.google.android.gms:play-services-identity:18.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.5.0'
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
     implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"
@@ -315,6 +316,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        dataBinding true
     }
 
     applicationVariants.all { variant ->
@@ -584,7 +586,7 @@ tasks.configureEach { task ->
             && "true" == isConsumerApp && "true" == runDownloadScripts) {
         task.dependsOn downloadRestoreFile
     }
-    if (task.name == 'assembleCommcareReleaseAndroidTest' || task.name == 'assembleCommcareDebugAndroidTest') {
+    if (isInstrumentationTestTask(task)) {
         android.defaultConfig.buildConfigField "String", "HQ_API_USERNAME", "\"${project.ext.HQ_API_USERNAME}\""
         android.defaultConfig.buildConfigField "String", "HQ_API_PASSWORD", "\"${project.ext.HQ_API_PASSWORD}\""
     }
@@ -667,3 +669,8 @@ downloadLicenses {
     includeProjectDependencies = true
     dependencyConfiguration = 'compile'
 }
+
+static def isInstrumentationTestTask(task){
+    def instrumentationTestTaskNamePattern = /^(assemble|connected).*AndroidTest/
+    return task.name ==~ instrumentationTestTaskNamePattern
+}

app/instrumentation-tests/src/org/commcare/utils/HQApi.java

@@ -326,7 +326,7 @@ private static Response<ResponseBody> postRequest(String url, String query, Requ
     }
 
     private static CommCareNetworkService createTestNetworkService() {
-        AuthInfo authInfo = new AuthInfo.ProvidedAuth(BuildConfig.HQ_API_USERNAME, BuildConfig.HQ_API_PASSWORD);
+        AuthInfo authInfo = new AuthInfo.ProvidedAuth(BuildConfig.HQ_API_USERNAME, BuildConfig.HQ_API_PASSWORD,false);
         CommCareNetworkService networkService =
                 CommCareNetworkServiceGenerator.createCommCareNetworkService(
                         HttpUtils.getCredential(authInfo),

app/res/drawable/baseline_fingerprint_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#3A42C7"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"/>
+</vector>

app/res/drawable/baseline_pattern_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#3A42C7"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,6c0,-1.1 0.9,-2 2,-2s2,0.9 2,2S7.1,8 6,8S4,7.1 4,6zM6,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S4.9,14 6,14zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,8 12,8zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2s2,-0.9 2,-2S19.1,10 18,10zM17.98,16c-0.74,0 -1.37,0.4 -1.72,1h-2.54c-0.34,-0.6 -0.98,-1 -1.72,-1s-1.37,0.4 -1.72,1H8.41l3.07,-3.07C11.65,13.97 11.82,14 12,14c1.1,0 2,-0.9 2,-2c0,-0.18 -0.03,-0.35 -0.07,-0.51l3.56,-3.56C17.65,7.97 17.82,8 18,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2c0,0.18 0.03,0.35 0.07,0.51l-3.56,3.56C12.35,10.03 12.18,10 12,10c-1.1,0 -2,0.9 -2,2c0,0.18 0.03,0.35 0.07,0.51l-3.56,3.56C6.35,16.03 6.18,16 6,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c0.74,0 1.37,-0.4 1.72,-1h2.57c0.34,0.6 0.98,1 1.72,1s1.37,-0.4 1.72,-1h2.55c0.34,0.6 0.98,1 1.72,1c1.1,0 2,-0.9 2,-2C19.98,16.9 19.08,16 17.98,16z"/>
+</vector>

app/res/drawable/ic_primary_portrait.xml

@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11,15h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M11,7h2v6h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M17,1H7C5.9,1 5.01,1.9 5.01,3v18c0,1.1 0.89,2 1.99,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1 17,1zM17,18H7V6h10V18z"/>
+</vector>

app/res/layout/fragment_connect_delivery_details.xml

@@ -155,20 +155,23 @@
                         android:background="@color/connect_darker_blue_color"
                         android:padding="16dp">
 
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/linearLayout"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
                             android:orientation="vertical"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
+                            android:layout_marginRight="2dp"
+                            app:layout_constraintEnd_toStartOf="@+id/connect_delivery_button"
                             app:layout_constraintTop_toTopOf="parent">
 
                             <org.commcare.views.connect.connecttextview.ConnectRegularTextView
                                 android:id="@+id/connect_delivery_action_title"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
                                 android:text="@string/connect_job_info_start_visit"
                                 android:textColor="@color/white"
                                 android:textSize="16sp"
@@ -178,12 +181,13 @@
                                 android:id="@+id/connect_delivery_action_details"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/connect_delivery_action_title"
                                 android:text="@string/connect_job_info_download_delivery"
-                                android:textAlignment="center"
                                 android:textColor="@color/grey"
                                 android:textSize="14sp" />
 
-                        </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/connect_delivery_button"