Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
01770e5
Remove duplicate entry
avazirna Apr 14, 2025
6a0c021
Bump JSON to version 20250107
avazirna Apr 14, 2025
13bcbf0
Enabled Firebase Perf monitoring when in release mode
avazirna Jul 3, 2025
3890a12
Disable Firebase perf monitoring by default
avazirna Jul 7, 2025
8411213
Merge branch 'master' into disabled-firebase-perf-monitoring-on-debug…
avazirna Jul 10, 2025
621019b
Merge branch 'master' into disabled-firebase-perf-monitoring-on-debug…
avazirna Jul 15, 2025
850405e
Merge branch 'master' into disabled-firebase-perf-monitoring-on-debug…
avazirna Jul 16, 2025
dd8b660
Gradle and android nav update
shubham1g5 Jul 14, 2025
964109a
Merge pull request #3230 from dimagi/disabled-firebase-perf-monitorin…
avazirna Jul 16, 2025
994a7f6
- Translation changed to get start with for registration string
jaypanchal-13 Jul 17, 2025
7261a26
Merge pull request #3249 from dimagi/QA-7922-7924
jaypanchal-13 Jul 17, 2025
1ceb5e6
Bump JSON to version 20250517
avazirna Jul 23, 2025
dd8c35f
Merge branch 'master' into bump-json-dependency
avazirna Jul 23, 2025
5196880
Merge pull request #3030 from dimagi/bump-json-dependency
avazirna Jul 23, 2025
dd7b916
Changed biometric config page to show "unavailable" error only when r…
OrangeAndGreen Jul 23, 2025
123ad5f
Not localizing the error message that gets logged when biometric/PIN …
OrangeAndGreen Jul 23, 2025
7435dc5
Move locked account handling to the base fragment
shubham1g5 Jul 24, 2025
edd114d
have common handling for showing message fragment
shubham1g5 Jul 24, 2025
1361e61
common locked error handling for personalID signup related apis
shubham1g5 Jul 24, 2025
021b127
refactor otp auth to use onPersonalIDApiFailure callback for personal…
shubham1g5 Jul 24, 2025
b2c5742
Adds lock account handling to otp verification
shubham1g5 Jul 24, 2025
f7b37c9
remove unused method
shubham1g5 Jul 24, 2025
2b20b0b
correct parameters to message fragment
shubham1g5 Jul 24, 2025
529bb7c
Handling more error states explicitly from BiometricManager (to provi…
OrangeAndGreen Jul 24, 2025
caaa30a
Removed code related to obsolete unlocking via backup code (no longer…
OrangeAndGreen Jul 24, 2025
9a34236
Adds lock account handling to name fragment
shubham1g5 Jul 24, 2025
59ac80e
Changed an error message to say fingerprint instead of biometric.
OrangeAndGreen Jul 25, 2025
a97d534
Correct message dialog title on configuration failures
shubham1g5 Jul 25, 2025
2e136be
Merge pull request #3244 from dimagi/gradleUpdateMaster
shubham1g5 Jul 25, 2025
69ce3cc
Hiding OR text when showing PIN but not fingerprint option.
OrangeAndGreen Jul 25, 2025
876d782
Added a new error condition for biometric/PIN retry-able errors (inst…
OrangeAndGreen Jul 25, 2025
5408f18
Merge pull request #3267 from dimagi/commonLockedErrorHandling
shubham1g5 Jul 25, 2025
357fda5
Merge branch 'commcare_2.58' of https://github.com/dimagi/commcare-an…
OrangeAndGreen Jul 25, 2025
2315913
Merge pull request #3266 from dimagi/dv/biometric_unavailable_fix
OrangeAndGreen Jul 25, 2025
7369c3c
fix message null check
pm-dimagi Jul 25, 2025
ba3d5b1
fix message null check
pm-dimagi Jul 25, 2025
17d6f01
fixed variable name spell
pm-dimagi Jul 25, 2025
b9caf05
Merge pull request #3271 from dimagi/pm_beta_fix_mainline
pm-dimagi Jul 25, 2025
a21d0f5
Automated: adding hotfix version to AndroidManifest
avazirna Jul 25, 2025
85b0350
Merge branch 'master' into commcare_2.58
avazirna Jul 25, 2025
e040482
Merge branch 'commcare_2.58' of https://github.com/dimagi/commcare-an…
pm-dimagi Jul 26, 2025
3304d08
created basedraweractivity and it related class
pm-dimagi Jul 30, 2025
bd82ba4
added string
pm-dimagi Jul 30, 2025
02ce415
added drawer to login activity
pm-dimagi Jul 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,9 @@
<meta-data
android:name="firebase_crashlytics_collection_enabled"
android:value="false" />
<meta-data
android:name="firebase_performance_collection_enabled"
android:value="false" />

<!-- Somehow this receiver is getting triggered in Android 8+ devices and causing
IllegalStateException while trying to start map downloader service from background.
Expand Down
4 changes: 1 addition & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ dependencies {
testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
testImplementation 'io.mockk:mockk:1.12.7'
testImplementation 'org.json:json:20231013'
testImplementation 'org.json:json:20250517'
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'
Expand Down Expand Up @@ -107,7 +106,6 @@ dependencies {
implementation 'com.journeyapps:zxing-android-embedded:3.6.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-perf:21.0.1'
implementation 'com.google.firebase:firebase-crashlytics:18.3.7'

Expand Down
4 changes: 3 additions & 1 deletion app/res/navigation/nav_graph_personalid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@
android:name="org.commcare.fragments.personalId.PersonalIdNameFragment"
android:label="personalid_name"
tools:layout="@layout/screen_personalid_name">

<action
android:id="@+id/action_personalid_name_to_personalid_message"
app:destination="@id/personalid_message_display" />
<action
android:id="@+id/action_personalid_name_to_personalid_backup_code"
app:destination="@id/personalid_backup_code" />
Expand Down
8 changes: 6 additions & 2 deletions app/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<string name="busy_message">Todavía estamos procesando tu solicitud anterior. Inténtalo de nuevo más tarde.</string>
<string name="connect_button_logged_in">Ir al menú Conectar</string>
<string name="personalid_generic_error">Ocurrió un problema con la base de datos, recupera tu cuenta.</string>
<string name="connect_registration_title">Registro de PersonalId</string>
<string name="connect_registration_title">Comience a usar PersonalID</string>
<string name="connect_consent_message_1">He leído y acepto la <a href="https://www.dimagi.com/terms/latest/privacy/">Política de Privacidad</a>, los <a href="https://www.dimagi.com/terms/latest/tos/">Términos de Servicio</a>, el <a href="https://www.dimagi.com/terms/latest/ba/">Acuerdo Comercial</a> y la <a href="https://www.dimagi.com/terms/latest/aup/">Política de Uso Aceptable</a> de Dimagi.</string>
<string name="connect_phone_country_code_default">+1</string>
<string name="connect_phone_number_hint">0000000000</string>
Expand Down Expand Up @@ -441,7 +441,11 @@
<string name="personalid_name_empty_error">El campo Nombre no puede estar vacío</string>
<string name="personalid_configuration_process_failed_title">Proceso fallido</string>
<string name="personalid_configuration_process_failed_subtitle">Tu dispositivo no es compatible con PersonalID en este momento. Por favor, inténtalo de nuevo en otro dispositivo.</string>
<string name="personalid_configuration_process_failed_security_subtitle">Tu dispositivo no es compatible con PersonalID en este momento debido a la falta de disponibilidad de la función de seguridad. Por favor, inténtalo de nuevo en otro dispositivo.</string>
<string name="personalid_configuration_process_pin_unavailable_message">El mecanismo de seguridad del PIN no está disponible, inténtelo nuevamente más tarde.</string>
<string name="personalid_configuration_process_biometric_unavailable_message">El mecanismo de seguridad biométrica no está disponible, inténtelo nuevamente más tarde.</string>
<string name="personalid_configuration_process_pin_needs_update_message">El mecanismo de seguridad del PIN requiere una actualización de software; aplique cualquier actualización de sistema disponible o intente nuevamente con un dispositivo diferente.</string>
<string name="personalid_configuration_process_biometric_needs_update_message">El mecanismo de seguridad biométrica requiere una actualización de software; aplique cualquier actualización de sistema disponible o intente nuevamente con un dispositivo diferente.</string>
<string name="personalid_configuration_process_biometric_no_hardware_message">PersonalID requiere que su dispositivo tenga un lector de huellas dactilares. Inténtelo de nuevo con otro dispositivo.</string>
<string name="personalid_configuration_process_failed_play_services">Asegúrate de que Play Store esté disponible en tu dispositivo y que esté actualizado.</string>
<string name="personalid_configuration_process_failed_temporary_unavailable">Error temporal al verificar la elegibilidad de tu dispositivo. Por favor, inténtalo de nuevo después de un día.</string>
<string name="personalid_configuration_process_failed_network_error">Error de red al verificar la elegibilidad de tu dispositivo. Asegúrate de tener una buena conexión de red e inténtalo de nuevo.</string>
Expand Down
8 changes: 6 additions & 2 deletions app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ License.
<string name="busy_message">Nous sommes encore en train de traiter votre demande précédente. Veuillez réessayer plus tard.</string>
<string name="connect_button_logged_in">Accéder au menu Connecter</string>
<string name="personalid_generic_error">Un problème est survenu avec la base de données, veuillez récupérer votre compte.</string>
<string name="connect_registration_title">Inscription PersonalId</string>
<string name="connect_registration_title">Démarrer avec PersonalID</string>
<string name="connect_consent_message_1">J\'ai lu et j\'accepte la <a href="https://www.dimagi.com/terms/latest/privacy/">politique de confidentialité</a>, les <a href="https://www.dimagi.com/terms/latest/tos/">conditions de service</a>, l\'<a href="https://www.dimagi.com/terms/latest/ba/">accord commercial</a> et la <a href="https://www.dimagi.com/terms/latest/aup/">politique d\'utilisation acceptable</a> de Dimagi.</string>
<string name="connect_phone_country_code_default">+1</string>
<string name="connect_phone_number_hint">0000000000</string>
Expand Down Expand Up @@ -442,7 +442,11 @@ License.
<string name="personalid_configuration_process_failed_title">Échec du processus</string>
<string name="personalid_configuration_locked_account">Votre compte a été bloqué. Veuillez contacter le support</string>
<string name="personalid_configuration_process_failed_subtitle">Votre appareil n\'est pas compatible avec PersonalID pour le moment. Veuillez réessayer sur un autre appareil.</string>
<string name="personalid_configuration_process_failed_security_subtitle">Votre appareil n\'est pas compatible avec PersonalID pour le moment en raison de l\'indisponibilité de la fonctionnalité de sécurité. Veuillez réessayer sur un autre appareil.</string>
<string name="personalid_configuration_process_pin_unavailable_message">Le mécanisme de sécurité PIN n\'est pas disponible, veuillez réessayer plus tard.</string>
<string name="personalid_configuration_process_biometric_unavailable_message">Le mécanisme de sécurité biométrique n\'est pas disponible, veuillez réessayer plus tard.</string>
<string name="personalid_configuration_process_pin_needs_update_message">Le mécanisme de sécurité PIN nécessite une mise à jour logicielle, veuillez appliquer toutes les mises à jour système disponibles ou réessayer avec un autre appareil.</string>
<string name="personalid_configuration_process_biometric_needs_update_message">Le mécanisme de sécurité biométrique nécessite une mise à jour logicielle, veuillez appliquer toutes les mises à jour système disponibles ou réessayer avec un autre appareil.</string>
<string name="personalid_configuration_process_biometric_no_hardware_message">PersonalID nécessite que votre appareil soit équipé d\'un lecteur d\'empreintes digitales. Veuillez réessayer avec un autre appareil.</string>
<string name="personalid_configuration_process_failed_play_services">Veuillez vous assurer que le Play Store est disponible sur votre appareil et qu\'il est à jour.</string>
<string name="personalid_configuration_process_failed_temporary_unavailable">Erreur temporaire lors de la vérification de l\'éligibilité de votre appareil. Veuillez réessayer après un jour.</string>
<string name="personalid_configuration_process_failed_network_error">Erreur réseau lors de la vérification de l\'éligibilité de votre appareil. Veuillez vous assurer que vous disposez d\'une bonne connexion réseau et réessayez.</string>
Expand Down
8 changes: 6 additions & 2 deletions app/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ License.
<string name="busy_message">हम अभी भी आपके पिछले अनुरोध को संसाधित कर रहे हैं। कृपया बाद में पुनः प्रयास करें।</string>
<string name="connect_button_logged_in">कनेक्ट मेनू पर जाएं</string>
<string name="personalid_generic_error">डेटाबेस के साथ कोई समस्या हुई है, कृपया अपना खाता पुनर्प्राप्त करें।</string>
<string name="connect_registration_title">PersonalId पंजीकरण</string>
<string name="connect_registration_title">पर्सनलआईडी के साथ शुरुआत करें</string>
<string name="connect_consent_message_1">मैंने डिमागी की <a href="https://www.dimagi.com/terms/latest/privacy/">गोपनीयता नीति</a>, <a href="https://www.dimagi.com/terms/latest/tos/">सेवा की शर्तें</a>, <a href="https://www.dimagi.com/terms/latest/ba/">व्यावसायिक समझौता</a> और <a href="https://www.dimagi.com/terms/latest/aup/">स्वीकार्य उपयोग नीति</a> पढ़ ली है और मैं उनसे सहमत हूं।</string>
<string name="connect_phone_country_code_default">+91</string>
<string name="connect_phone_number_hint">0000000000</string>
Expand Down Expand Up @@ -441,7 +441,11 @@ License.
<string name="personalid_name_empty_error">नाम फ़ील्ड खाली नहीं हो सकता</string>
<string name="personalid_configuration_process_failed_title">प्रक्रिया विफल</string>
<string name="personalid_configuration_process_failed_subtitle">आपका डिवाइस अभी PersonalID के साथ संगत नहीं है। कृपया किसी अन्य डिवाइस पर पुनः प्रयास करें।</string>
<string name="personalid_configuration_process_failed_security_subtitle">सुरक्षा सुविधा की अनुपलब्धता के कारण आपका डिवाइस अभी PersonalID के साथ संगत नहीं है। कृपया किसी अन्य डिवाइस पर पुनः प्रयास करें।</string>
<string name="personalid_configuration_process_pin_unavailable_message">पिन सुरक्षा तंत्र उपलब्ध नहीं है, कृपया बाद में पुनः प्रयास करें.</string>
<string name="personalid_configuration_process_biometric_unavailable_message">बायोमेट्रिक सुरक्षा तंत्र उपलब्ध नहीं है, कृपया बाद में पुनः प्रयास करें।</string>
<string name="personalid_configuration_process_pin_needs_update_message">पिन सुरक्षा तंत्र को सॉफ़्टवेयर अद्यतन की आवश्यकता है, कृपया उपलब्ध सिस्टम अद्यतन लागू करें या किसी अन्य डिवाइस के साथ पुनः प्रयास करें।</string>
<string name="personalid_configuration_process_biometric_needs_update_message">बायोमेट्रिक सुरक्षा तंत्र को सॉफ़्टवेयर अपडेट की आवश्यकता है, कृपया उपलब्ध सिस्टम अपडेट लागू करें या किसी अन्य डिवाइस के साथ पुनः प्रयास करें।</string>
<string name="personalid_configuration_process_biometric_no_hardware_message">पर्सनल आईडी के लिए आपके डिवाइस में फ़िंगरप्रिंट स्कैनर होना ज़रूरी है। कृपया किसी दूसरे डिवाइस से दोबारा कोशिश करें।</string>
<string name="personalid_configuration_process_failed_play_services">कृपया सुनिश्चित करें कि Play Store आपके डिवाइस पर उपलब्ध है और यह अद्यतित है।</string>
<string name="personalid_configuration_process_failed_temporary_unavailable">आपके डिवाइस की पात्रता की जांच करते समय अस्थायी त्रुटि। कृपया एक दिन बाद पुनः प्रयास करें।</string>
<string name="personalid_configuration_process_failed_network_error">आपके डिवाइस की पात्रता की जांच करते समय नेटवर्क त्रुटि। कृपया सुनिश्चित करें कि आपके पास एक अच्छा नेटवर्क कनेक्शन है और पुनः प्रयास करें।</string>
Expand Down
8 changes: 6 additions & 2 deletions app/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<string name="busy_message">Ainda estamos ocupados processando sua solicitação anterior. Por favor, tente novamente em alguns momentos.</string>
<string name="connect_button_logged_in">Vá para o Conectar menu</string>
<string name="personalid_generic_error">Ocorreu um problema. Configure sua conta PersonalID novamente.</string>
<string name="connect_registration_title">Inscrição no Connect ID</string>
<string name="connect_registration_title">Comece a usar o PersonalID</string>
<string name="connect_consent_message_1">Li e concordo com a <a href="https://www.dimagi.com/terms/latest/privacy/">Política de Privacidade</a>, os <a href="https://www.dimagi.com/terms/latest/tos/">Termos de Serviço</a>, o <a href="https://www.dimagi.com/terms/latest/ba/">Contrato Comercial</a> e a <a href="https://www.dimagi.com/terms/latest/aup/">Política de Uso Aceitável</a> da Dimagi.</string>
<string name="connect_phone_country_code_default">+1</string>
<string name="connect_phone_number_hint">0000000000</string>
Expand Down Expand Up @@ -448,7 +448,11 @@
<string name="personalid_configuration_process_failed_title">Falha no processo</string>
<string name="personalid_configuration_locked_account">A sua conta foi bloqueada. Entre em contacto com o suporte</string>
<string name="personalid_configuration_process_failed_subtitle">De momento, o seu dispositivo não está qualificado para se inscrever no PersonalID. Tente novamente noutro dispositivo.</string>
<string name="personalid_configuration_process_failed_security_subtitle">De momento, o seu dispositivo não está qualificado para se inscrever no PersonalID devido à indisponibilidade da funcionalidade de segurança %s. Tente novamente noutro dispositivo.</string>
<string name="personalid_configuration_process_pin_unavailable_message">O mecanismo de segurança do PIN não está disponível, tente novamente mais tarde.</string>
<string name="personalid_configuration_process_biometric_unavailable_message">O mecanismo de segurança biométrica não está disponível, tente novamente mais tarde.</string>
<string name="personalid_configuration_process_pin_needs_update_message">O mecanismo de segurança do PIN requer uma atualização de software. Aplique todas as atualizações de sistema disponíveis ou tente novamente com um dispositivo diferente.</string>
<string name="personalid_configuration_process_biometric_needs_update_message">O mecanismo de segurança biométrica requer uma atualização de software. Aplique todas as atualizações de sistema disponíveis ou tente novamente com um dispositivo diferente.</string>
<string name="personalid_configuration_process_biometric_no_hardware_message">O PersonalID requer que seu dispositivo tenha um leitor de impressão digital. Tente novamente com outro dispositivo.</string>
<string name="personalid_configuration_process_failed_play_services">Certifique-se de que a Play Store está disponível no seu dispositivo e está atualizada.</string>
<string name="personalid_configuration_process_failed_temporary_unavailable">Erro temporário ao verificar a elegibilidade do seu dispositivo. Por favor, tente novamente depois de um dia.</string>
<string name="personalid_configuration_process_failed_network_error">Erro de rede ao verificar a elegibilidade do seu dispositivo. Por favor, certifique-se de que tem uma boa conexão de rede e tente novamente.</string>
Expand Down
Loading