Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
739f662
Added optional error message storage to ConnectKeyRecord.
OrangeAndGreen May 20, 2025
cd3dccf
Checking for logout error message on PersonalIdManager initialization.
OrangeAndGreen May 20, 2025
2db1c5a
Showing worst-case error message on Setup and Login pages after Conne…
OrangeAndGreen May 21, 2025
8b8003c
Fixed error in v6-to-v7 upgrade
OrangeAndGreen May 22, 2025
7312e7d
Crashing DB when PersonalID token request is denied (i.e. configurati…
OrangeAndGreen May 23, 2025
2255d9d
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
OrangeAndGreen May 23, 2025
3bf04d5
Converted to using a separate table for global errors (instead of add…
OrangeAndGreen May 27, 2025
b234e5b
Merge branch 'master' into dv/worst_case_message
OrangeAndGreen May 27, 2025
d89c22c
Calling PersonalIdManager.init after checking for global errors.
OrangeAndGreen May 27, 2025
0535ccc
Merge branch 'dv/worst_case_message' of https://github.com/dimagi/com…
OrangeAndGreen May 27, 2025
c0c0353
Improved generic PersonalID de-configure error message, and renamed i…
OrangeAndGreen May 28, 2025
845633f
Renamed date field to createdAt
OrangeAndGreen May 28, 2025
5f756d6
Cleaned up unused code in GlobalErrorUtil
OrangeAndGreen May 28, 2025
aefb035
Moved code for checking for global errors into LoginActivityUIControl…
OrangeAndGreen May 28, 2025
5236563
Renamed connect_error_msg to error_msg in UI (Login and Setup pages).
OrangeAndGreen May 28, 2025
527ac0d
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
OrangeAndGreen May 28, 2025
530a9ae
Merge branch 'master' into dv/worst_case_message
OrangeAndGreen May 28, 2025
cf9dc45
Added missing externalizable for unit test.
OrangeAndGreen May 28, 2025
ea1a173
Merge branch 'dv/worst_case_message' of https://github.com/dimagi/com…
OrangeAndGreen May 28, 2025
25e1fc1
Fixed wrong package name in unit test.
OrangeAndGreen May 28, 2025
5767b7c
Changed cc:translatable to just translatable in strings.xml
OrangeAndGreen May 29, 2025
9b88189
Merge branch 'master' into dv/worst_case_message
OrangeAndGreen May 29, 2025
35468a9
Got rid of translatable="true" in strings.xml.
OrangeAndGreen May 29, 2025
a4cfea1
Merge branch 'master' into dv/worst_case_message
OrangeAndGreen May 30, 2025
2bab9a1
Creating table when creating new global database.
OrangeAndGreen May 30, 2025
0835a7e
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
OrangeAndGreen May 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
11 changes: 11 additions & 0 deletions app/res/layout/screen_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@
android:paddingRight="@dimen/login_box_margins"
android:paddingStart="@dimen/login_box_margins">

<TextView
android:textStyle="bold"
android:id="@+id/error_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/content_min_margin"
android:textColor="@color/red_500"
android:visibility="gone"
android:textSize="@dimen/text_medium" />

<TextView
android:textStyle="bold"
android:id="@+id/welcome_msg"
Expand Down
11 changes: 11 additions & 0 deletions app/res/layout/select_install_mode_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
android:gravity="center_horizontal"
android:orientation="vertical">

<TextView
android:textStyle="bold"
android:id="@+id/error_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/content_min_margin"
android:textColor="@color/red_500"
android:visibility="gone"
android:textSize="@dimen/text_medium" />

<TextView
android:id="@+id/str_setup_message"
android:layout_width="fill_parent"
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ License.
<string name="choice_or">_____________ OU _____________</string>
<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="connect_db_corrupt">Un problème est survenu avec la base de données, veuillez récupérer votre compte.</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 ConnectID</string>
<string name="connect_signup">S\'inscrire</string>
<string name="connect_recover">Récupérer</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
<string name="choice_or">OU</string>
<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="connect_db_corrupt">Ocorreu um problema com a base de dados, Por favor recupere a sua conta.</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_signup">Inscrição</string>
<string name="connect_recover">Recuperar</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<string name="choice_or">____________ AU _____________</string>
<string name="busy_message">Bado tunashughulika kuchakata ombi lako la awali. Tafadhali jaribu tena baada ya muda fulani.</string>
<string name="connect_button_logged_in">Nenda kwenye menyu ya Unganisha</string>
<string name="connect_db_corrupt">Tatizo limetokea kwenye hifadhidata, tafadhali rudisha akaunti yako.</string>
<string name="personalid_generic_error">Tatizo limetokea, tafadhali sanidi akaunti yako ya Kitambulisho cha Kibinafsi tena.</string>
<string name="connect_registration_title">Usajili wa ConnectID</string>
<string name="connect_signup">Jisajili</string>
<string name="connect_recover">Pata nafuu</string>
Expand Down
2 changes: 1 addition & 1 deletion app/res/values-ti/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
<string name="choice_or">_____________ ወይ _____________</string>
<string name="busy_message">ሕጂ ውን ቅድሚ ሕጂ ዝገበርካዮ ሕቶ ኣብ ምስራሕ ተጸሚድና ኣለና። በጃኻ ድሕሪ ውሱን ግዜ ደጊምካ ፈትን።</string>
<string name="connect_button_logged_in">ናብ Connect መማረፂ ኪድ</string>
<string name="connect_db_corrupt">ኣብቲ ዳታቤዝ/ ማእከል ሓበርታ ፀገም ኣጋጢሙ፡ በጃኻ ኣካውንትካ ናብ ናይ ቅድም ከነታት መልስ።</string>
<string name="personalid_generic_error">ጸገም ኣጋጢሙ፡ በጃኻ PersonalID ኣካውንትካ እንደገና ኣወሃህቦ።</string>
<string name="connect_registration_title">ConnectID ምዝገባ</string>
<string name="connect_signup">ምዝገባ</string>
<string name="connect_recover">ናብ ንቡር ኩነታት ምምላስ</string>
Expand Down
Loading
Loading