Pm/master initial merge

.github/pull_request_template.md

@@ -1,29 +1,41 @@
-## Summary
+## Product Description
+<!--
+Delete this section if the PR does not contain any visible changes.
+For non-invisible changes, describe the user-facing effects.
+-->
+
+## Technical Summary
 <!--
-    Provide a link to the ticket or document which prompted this change,
-    Describe the rationale and design decisions.
+- Provide a link to the ticket or document which prompted this change.
+- Describe the rationale and design decisions.
 -->
 
 ## Feature Flag
 <!-- If this is specific to a feature flag, which one? -->
 
-## Product Description
-<!-- For non-invisible changes, describe user-facing effects. Would be good to add screenshots/videos for any major user facing changes -->
+## Safety Assurance
 
-## PR Checklist
+### Safety story
+<!--
+Describe:
+- how you became confident in this change (such as local testing).
+- why the change is inherently safe, and/or plans to limit the defect blast radius.
 
-- [ ] If I think the PR is high risk, "High Risk" label is set
-- [ ] I have confidence that this PR will not introduce a regression for the reasons below
-- [ ] Do we need to enhance manual QA test coverage ? If yes, "QA Note" label is set correctly
-- [ ] Does the PR introduce any major changes worth communicating ? If yes, "Release Note" label is set and a "Release Note" is specified in PR description.
+In particular consider how existing data may be impacted by this change.
+-->
 
 ### Automated test coverage
+<!-- Identify the related test coverage and the conditions it will catch -->
 
-<!-- Identify the related test coverage and the tests it would catch -->
+### QA Plan
+<!--
+- Describe QA plan that (along with test coverage) proves that this PR is regression free.
+- Link to QA Ticket
+-->
 
+## Labels and Review
 
-### Safety story
-<!--
-Describe any other pieces to the safety story including
-local testing, why the change is inherently safe, and/or plans to limit the blast radius of a defect.
---> 
+- [ ] Do we need to enhance the manual QA test coverage ? If yes, the "QA Note" label is set correctly
+- [ ] Does the PR introduce any major changes worth communicating ? If yes, the "Release Note" label is set and a "Release Note" is specified in PR description.
+- [ ] Risk label is set correctly
+- [ ] The set of people pinged as reviewers is appropriate for the level of risk of the change

app/AndroidManifest.xml

@@ -4,83 +4,87 @@
           android:versionCode="106"
           android:versionName="2.56">
 
-    <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" />
-
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
-    <uses-permission xmlns:android="http://schemas.android.com/apk/res/android"
-        android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission xmlns:android="http://schemas.android.com/apk/res/android"
-        android:name="android.permission.INTERNET" />
-    <uses-permission xmlns:android="http://schemas.android.com/apk/res/android"
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+    <uses-permission
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:name="android.permission.INTERNET"/>
+    <uses-permission
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- required to ensure app compatibility -->
+        android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <!-- required to ensure app compatibility -->
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+        android:maxSdkVersion="32"/>
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.NEARBY_WIFI_DEVICES"
-        android:usesPermissionFlags="neverForLocation" />
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
+        android:usesPermissionFlags="neverForLocation"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <uses-feature
         android:name="android.hardware.telephony"
-        android:required="false" />
+        android:required="false"/>
     <uses-feature
         android:name="android.hardware.location"
-        android:required="false" />
+        android:required="false"/>
     <uses-feature
         android:name="android.hardware.location.gps"
-        android:required="false" />
+        android:required="false"/>
     <uses-feature
         android:name="android.hardware.location.network"
-        android:required="false" />
+        android:required="false"/>
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false" />
+        android:required="false"/>
 
     <permission-group
         android:name="commcare.permission-group.DATABASE"
         android:description="@string/permission_content_provider_description"
-        android:label="@string/permission_content_provider_label" />
+        android:label="@string/permission_content_provider_label"
+        />
+
     <permission-group
         android:name="commcare.permission-group.EXTERNAL_ACTION"
         android:description="@string/permission_external_action_description"
-        android:label="@string/permission_external_action_label" />
+        android:label="@string/permission_external_action_label"
+        />
 
     <permission-group
         android:name="commcare.permission-group.INTERNAL_ACTION"
         android:label="@string/permission_group_internal_action_label"
         />
 
     <permission
-        android:name="${applicationId}.provider.cases.read"
         android:description="@string/permission_content_provider_description"
         android:label="@string/permission_content_provider_label"
+        android:name="${applicationId}.provider.cases.read"
         android:permissionGroup="commcare.permission-group.DATABASE"
-        android:protectionLevel="dangerous" />
+        android:protectionLevel="dangerous">
+    </permission>
+
     <permission
         android:name="${applicationId}.permission.COMMCARE_LOGOUT"
         android:description="@string/permission_commcare_logout_description"
         android:label="@string/permission_commcare_logout_label"
         android:permissionGroup="commcare.permission-group.EXTERNAL_ACTION"
-        android:protectionLevel="dangerous" />
+        android:protectionLevel="dangerous">
+    </permission>
 
     <permission
         android:name="${applicationId}.permission.PROTECT_FALSELY_EXPOSED_COMPONENTS"
@@ -96,17 +100,12 @@
         </intent>
         <intent>
             <action android:name="android.intent.action.SEND" />
-
             <data android:mimeType="*/*" />
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW" />
-
-            <data
-                android:mimeType="*/*"
-                android:scheme="*" />
+            <data android:mimeType="*/*" android:scheme="*" />
         </intent>
-
         <package android:name="com.google.android.apps.maps" />
         <package android:name="org.commcare.dalvik.reminders" />
         <package android:name="callout.commcare.org.sendussd" />
@@ -183,13 +182,19 @@
         <activity android:name="org.commcare.activities.MenuActivity" />
         <activity
             android:name="org.commcare.activities.connect.ConnectIdActivity"
-            android:theme="@style/NoAppBarTheme"
-            android:exported="true" />
+            android:theme="@style/NoAppBarTheme" />
         <activity
-            android:name="org.commcare.activities.connect.ConnectActivity"
-            android:exported="true" />
+            android:name="org.commcare.activities.connect.ConnectActivity" />
         <activity android:name="org.commcare.activities.AppSelectActivity" />
-
+        <service android:name="com.google.android.gms.metadata.ModuleDependencies"
+            android:enabled="false"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+            <meta-data android:name="photopicker_activity:0:required" android:value="" />
+        </service>
         <provider
             android:name="org.commcare.provider.FormsProvider"
             android:authorities="${odkProvider}.forms"

app/assets/locales/android_translatable_strings.txt

@@ -533,6 +533,10 @@ login.attempt.fail.changed.title=Password Changed since Last Login
 login.attempt.fail.changed.detail=You've logged in with a new password since you're last login. You may need to log in with your old credentials to ensure you have no unsent data.
 login.attempt.fail.changed.action=If you had unsent data or incomplete forms on the phone before you logged in with your new password you should log out, and log in with your old password. Make sure all your unsent forms are sent and incomplete forms are submitted, then log in again with your new password and sync. 
 
+login.attempt.insufficient.role.permission.title=User doesn't have permission to access the CommCare application
+login.attempt.insufficient.role.permission.detail=The role assigned to your user doesn't have permission to access CommCare mobile application
+login.attempt.insufficient.role.permission.action=Contact Support for assistance with this matter
+
 notification.credential.mismatch.title=Mismatching Login Credentials
 notification.credential.mismatch.detail=The server recognized your password, but the password it sent to the device does not match 
 notification.credential.mismatch.action=Contact CommCare Support for assistance with your account
@@ -996,3 +1000,5 @@ background.sync.fail=Background sync failed. Please try to trigger a normal Sync
 android.package.name.org.commcare.dalvik.reminders=CommCare Reminders
 android.package.name.callout.commcare.org.sendussd=Commcare USSD
 android.package.name.org.commcare.dalvik.abha=CommCare ABHA
+
+location.capture.cancelled=Location capture cancelled

app/build.gradle

@@ -44,6 +44,8 @@ dependencies {
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     testImplementation 'io.mockk:mockk:1.12.7'
     testImplementation 'org.json:json:20231013'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.json:json:20140107'
     testImplementation project(path: ':commcare-core', configuration: 'testsAsJar')
 
     androidTestImplementation 'androidx.test:runner:1.4.0'
@@ -109,7 +111,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging:21.1.0'
     implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-
     implementation('com.github.bumptech.glide:glide:4.9.0') {
         exclude group: 'com.android.support'
     }
@@ -306,9 +307,7 @@ android {
         buildConfigField 'String', 'ANALYTICS_TRACKING_ID_LIVE', "\"${project.ext.ANALYTICS_TRACKING_ID_LIVE}\""
         buildConfigField 'String', 'ANALYTICS_TRACKING_ID_DEV', "\"${project.ext.ANALYTICS_TRACKING_ID_DEV}\""
         buildConfigField 'String', 'MAPBOX_SDK_API_KEY', "\"${project.ext.MAPBOX_SDK_API_KEY}\""
-
         buildConfigField "String", "FIREBASE_DATABASE_URL", "\"${project.ext.FIREBASE_DATABASE_URL}\""
-
         buildConfigField 'String', 'CCC_HOST', "\"connect.dimagi.com\""
 
         testInstrumentationRunner 'org.commcare.CommCareJUnitRunner'

app/instrumentation-tests/src/org/commcare/androidTests/BaseTest.kt

@@ -48,9 +48,7 @@ abstract class BaseTest {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             appPermissions.addAll(arrayOf(
-                    Manifest.permission.READ_MEDIA_IMAGES,
                     Manifest.permission.READ_MEDIA_AUDIO,
-                    Manifest.permission.READ_MEDIA_VIDEO,
                     Manifest.permission.POST_NOTIFICATIONS))
         } else {
             appPermissions.addAll(arrayOf(

app/res/layout/entity_select_layout.xml

@@ -53,6 +53,7 @@
         android:visibility="gone"/>
 
     <RelativeLayout
+        android:id="@+id/progress_container"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
         android:layout_below="@id/entity_select_filter_dropdown">
@@ -63,8 +64,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"/>
+
+        <TextView
+            android:id="@+id/progress_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/entity_select_loading"
+            android:padding="8dp"
+            android:layout_centerInParent="true" />
+
     </RelativeLayout>
 
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/res/layout/screen_form_entry.xml

@@ -70,7 +70,6 @@
             android:id="@+id/nav_btn_prev"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
             android:layout_alignParentLeft="true"
             android:background="@drawable/selector_button_press"
             android:minHeight="@dimen/new_progressbar_button_minheight"
@@ -87,8 +86,7 @@
             android:id="@+id/nav_prog_bar"
             android:indeterminate="false"
             android:indeterminateOnly="false"
-            android:layout_centerVertical="true"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/content_start"
             android:layout_marginLeft="@dimen/content_start"
             android:layout_marginRight="@dimen/content_start"
@@ -99,8 +97,8 @@
             android:layout_toStartOf="@+id/nav_btn_next"
             android:layout_width="wrap_content"
             android:max="100"
-            android:paddingBottom="@dimen/content_start"
-            android:paddingTop="@dimen/content_start"
+            android:paddingBottom="@dimen/progressbar_vertical_padding"
+            android:paddingTop="@dimen/progressbar_vertical_padding"
             android:progress="0"
             android:progressDrawable="@drawable/progressbar_modern" />
 
@@ -110,7 +108,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
             android:background="@drawable/selector_button_press"
             android:minHeight="@dimen/new_progressbar_button_minheight"
             android:minWidth="@dimen/new_progressbar_button_minwidth"

app/res/layout/square_button_text.xml

@@ -26,8 +26,8 @@
         android:paddingBottom="@dimen/standard_spacer"
         android:paddingLeft="@dimen/standard_spacer"
         android:paddingRight="@dimen/standard_spacer"
-        android:textSize="@dimen/font_size_xlarge"
-        app:text_size_small="@dimen/font_size_large"
+        android:textSize="@dimen/font_size_large"
+        app:text_size_small="@dimen/font_size_medium"
         android:paddingStart="@dimen/standard_spacer"
         android:paddingEnd="@dimen/standard_spacer" />
 </RelativeLayout>

app/res/layout/square_card.xml

@@ -41,8 +41,8 @@
                 android:paddingBottom="@dimen/standard_spacer"
                 android:paddingLeft="@dimen/standard_spacer"
                 android:paddingRight="@dimen/standard_spacer"
-                android:textSize="@dimen/font_size_xlarge"
-                app:text_size_small="@dimen/font_size_large"
+                android:textSize="@dimen/font_size_large"
+                app:text_size_small="@dimen/font_size_medium"
                 android:paddingStart="@dimen/standard_spacer"
                 android:paddingEnd="@dimen/standard_spacer" />
         </RelativeLayout>
@@ -54,6 +54,6 @@
             android:layout_below="@+id/card"
             android:layout_gravity="end"
             android:padding="@dimen/help_text_padding"
-            android:textSize="@dimen/font_size_medium"/>
+            android:textSize="@dimen/font_size_small"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>

app/res/values-w320dp/dimens.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="edit_text_question_widget_compact_width">100dp</dimen>
-    <dimen name="font_size_small">12sp</dimen>
-    <dimen name="font_size_medium">15sp</dimen>
-    <dimen name="font_size_large">18sp</dimen>
-    <dimen name="font_size_xlarge">21sp</dimen>
+    <dimen name="font_size_small">14sp</dimen>
+    <dimen name="font_size_medium">17sp</dimen>
+    <dimen name="font_size_large">19sp</dimen>
+    <dimen name="font_size_xlarge">23sp</dimen>
     <dimen name="cell_padding_vertical">8sp</dimen>
     <dimen name="cell_padding_horizontal">8sp</dimen>
     <dimen name="row_padding_vertical">8sp</dimen>