Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit ca672ee

Browse files
philipbritophilipbrito
authored
Merge branch 'develop' into fix/increase-db-retry
2 parents b781379 + 9063d0b commit ca672ee

16 files changed

Lines changed: 50 additions & 59 deletions

File tree

‎app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
239239
AlertDialog.Builder(context)
240240
.setTitle(R.string.dialog_sort_title)
241241
.setView(dialogLayout)
242-
.setPositiveButton(R.string.dialog_button_done) { dialog, _ ->
242+
.setPositiveButton(R.string.msg_sort) { dialog, _ ->
243243
invalidateQueryOnSearch()
244244
updateSort()
245245
dialog.dismiss()

‎app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
88
import chat.rocket.android.util.extension.launchUI
99
import chat.rocket.android.util.retryIO
1010
import chat.rocket.common.RocketChatException
11+
import chat.rocket.common.util.ifNull
1112
import chat.rocket.core.RocketChatClient
1213
import chat.rocket.core.internal.rest.updateProfile
1314
import javax.inject.Inject
@@ -36,7 +37,9 @@ class PasswordPresenter @Inject constructor(
3637
}
3738
} catch (exception: RocketChatException) {
3839
analyticsManager.logResetPassword(false)
39-
view.showPasswordFailsUpdateMessage(exception.message)
40+
exception.message?.let { errorMessage ->
41+
view.showPasswordFailsUpdateMessage(errorMessage)
42+
}
4043
} finally {
4144
view.hideLoading()
4245
}

‎app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ interface PasswordView: LoadingView {
1212
* Shows a message when the user's password fails to update
1313
* @param error is a String containing the failure message
1414
*/
15-
fun showPasswordFailsUpdateMessage(error : String?)
15+
fun showPasswordFailsUpdateMessage(error : String)
1616
}

‎app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
9696
}
9797
}
9898

99-
override fun showPasswordFailsUpdateMessage(error: String?) {
99+
override fun showPasswordFailsUpdateMessage(error: String) {
100100
showToast(getString(R.string.msg_unable_to_update_password, error))
101101
}
102102

‎app/src/main/res/menu/chatrooms.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<item
1515
android:id="@+id/action_sort"
1616
android:icon="@drawable/ic_sort"
17-
android:title="@string/menu_chatroom_sort"
17+
android:title="@string/msg_sort"
1818
app:showAsAction="ifRoom" />
1919

2020
</menu>

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@
164164
<string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
165165
<string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
166166
<plurals name="msg_reacted_with_">
167-
<item quantity="one">% 1 $ s reagierte mit% 2 $ s</item>
168-
<item quantity="other">% 1 $ s reagierte mit% 2 $ s</item>
167+
<item quantity="one">%1$ s reagierte mit %2$s</item>
168+
<item quantity="other">%1$s reagierte mit %2$s</item>
169169
</plurals>
170170

171171
<!-- Create channel messages -->
@@ -306,13 +306,12 @@
306306
<string name="alert_title_default_skin_tone">Standart Hautton</string>
307307

308308
<!-- Sorting and grouping-->
309-
<string name="menu_chatroom_sort">Sortiere</string>
309+
<string name="msg_sort">Sortiere</string>
310310
<string name="dialog_sort_title">Sortieren nach</string>
311311
<string name="dialog_sort_by_alphabet">Alphabetisch</string>
312312
<string name="dialog_sort_by_activity">Aktivität</string>
313313
<string name="dialog_group_by_type">Räume nach Typ</string>
314314
<string name="dialog_group_favourites">Räume nach Favoriten</string>
315-
<string name="dialog_button_done">Erledigt</string>
316315
<string name="chatroom_header">Kopf</string>
317316

318317
<!--ChatRooms Headers-->

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,12 @@
305305
<string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
306306

307307
<!-- Sorting and grouping-->
308-
<string name="menu_chatroom_sort">Ordenar</string>
308+
<string name="msg_sort">Ordenar</string>
309309
<string name="dialog_sort_title">Ordenar por</string>
310310
<string name="dialog_sort_by_alphabet">Alfabético</string>
311311
<string name="dialog_sort_by_activity">Actividad</string>
312312
<string name="dialog_group_by_type">Agrupar por tipo</string>
313313
<string name="dialog_group_favourites">Agrupar favoritos</string>
314-
<string name="dialog_button_done">Done</string><!-- TODO Add translation -->
315314
<string name="chatroom_header">Cabezazo</string>
316315

317316
<!--ChatRooms Headers-->

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,12 @@
310310
<string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
311311

312312
<!-- Sorting and grouping-->
313-
<string name="menu_chatroom_sort">Trier</string>
313+
<string name="msg_sort">Trier</string>
314314
<string name="dialog_sort_title">Trier par</string>
315315
<string name="dialog_sort_by_alphabet">Alphabétique</string>
316316
<string name="dialog_sort_by_activity">Activité</string>
317317
<string name="dialog_group_by_type">Grouper par type</string>
318318
<string name="dialog_group_favourites">Grouper favoris</string>
319-
<string name="dialog_button_done">Ok</string>
320319
<string name="chatroom_header">Entête</string>
321320

322321
<!--ChatRooms Headers-->

‎app/src/main/res/values-hi-rIN/strings.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,12 @@
184184
<string name="msg_no_topic">कोई विषय नहीं जोड़ा गया</string>
185185
<string name="msg_no_announcement">कोई घोषणा नहीं जोड़ा गया</string>
186186
<string name="msg_no_description">कोई विवरण नहीं जोड़ा गया</string>
187-
<string name="msg_unable_to_update_password">पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश:% 1$s</string>
187+
<string name="msg_unable_to_update_password">पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश: %1$s</string>
188188
<string name="msg_password_updated_successfully">पासवर्ड सफलतापूर्वक अपडेट किया गया</string>
189189
<plurals name="msg_reacted_with_">
190-
<item quantity="one">% 1 $ s ने% 2 $ %d s के साथ प्रतिक्रिया व्यक्त की</item>
191-
<item quantity="few">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
192-
<item quantity="many">% 1 $ s ने% 2 $ s के साथ प्रतिक्रिया व्यक्त की</item>
190+
<item quantity="one">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
191+
<item quantity="few">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
192+
<item quantity="many">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
193193
</plurals>
194194

195195
<!-- Preferences messages -->
@@ -310,13 +310,12 @@
310310
<string name="alert_title_default_skin_tone">डिफ़ॉल्ट त्वचा टोन</string>
311311

312312
<!-- Sorting and grouping-->
313-
<string name="menu_chatroom_sort">क्रम</string>
313+
<string name="msg_sort">क्रम</string>
314314
<string name="dialog_sort_title">द्वारा सॉर्ट करें</string>
315315
<string name="dialog_sort_by_alphabet">वर्णानुक्रम</string>
316316
<string name="dialog_sort_by_activity">गतिविधि</string>
317317
<string name="dialog_group_by_type">प्रकार के आधार पर समूह</string>
318318
<string name="dialog_group_favourites">पसंदीदा समूह</string>
319-
<string name="dialog_button_done">पूर्ण</string>
320319
<string name="chatroom_header">हैडर</string>
321320

322321
<!--ChatRooms Headers-->

‎app/src/main/res/values-it/strings.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,12 @@
306306
<string name="alert_title_default_skin_tone">Default skin tone</string>
307307

308308
<!-- Sorting and grouping-->
309-
<string name="menu_chatroom_sort">Ordinare</string>
309+
<string name="msg_sort">Ordinare</string>
310310
<string name="dialog_sort_title">Ordinare per</string>
311311
<string name="dialog_sort_by_alphabet">Alfabeto</string>
312312
<string name="dialog_sort_by_activity">Attività</string>
313313
<string name="dialog_group_by_type">Raggruppa per tipo</string>
314314
<string name="dialog_group_favourites">Raggruppa preferiti</string>
315-
<string name="dialog_button_done">Fatto</string>
316315
<string name="chatroom_header">Intestazione</string>
317316

318317
<!--ChatRooms Headers-->

0 commit comments

Comments
 (0)