Merge tag 'v6.14.5' into molly-6.14

mollyim · Mar 24, 2023 · a43f1e4 · a43f1e4
2 parents d207ad5 + 1f420a1
commit a43f1e4
Show file tree

Hide file tree

Showing 63 changed files with 364 additions and 367 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,8 +56,8 @@ ext {
     MAPS_API_KEY = getEnv('CI_MAPS_API_KEY') ?: mapsApiKey
 }
 
-def canonicalVersionCode = 1231
-def canonicalVersionName = "6.14.4"
+def canonicalVersionCode = 1232
+def canonicalVersionName = "6.14.5"
 def mollyRevision = 0
 
 def postFixSize = 100

diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -68,7 +68,8 @@ public AudioRecorder(@NonNull Context context, @Nullable AudioRecordingHandler u
       Log.i(TAG, "Running startRecording() + " + Thread.currentThread().getId());
       try {
         if (recorder != null) {
-          throw new AssertionError("We can only record once at a time.");
+          recordingSingle.onError(new IllegalStateException("We can only do one recording at a time!"));
+          return;
         }
 
         ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -3207,13 +3207,8 @@ public void onRecorderStarted() {
     requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
 
     voiceNoteMediaController.pausePlayback();
-    try {
-      recordingSession = new RecordingSession(audioRecorder.startRecording());
-      disposables.add(recordingSession);
-    } catch (AssertionError err) {
-      Log.e(TAG, "Could not start audio recording.", err);
-      Toast.makeText(requireContext(), R.string.ConversationActivity_unable_to_record_audio, Toast.LENGTH_SHORT).show();
-    }
+    recordingSession = new RecordingSession(audioRecorder.startRecording());
+    disposables.add(recordingSession);
   }
 
   @Override

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -375,6 +375,7 @@ public boolean canStartNestedScroll() {
     list.setLayoutManager(new LinearLayoutManager(requireActivity()));
     list.setItemAnimator(itemAnimator);
     list.addItemDecoration(archiveDecoration);
+    CachedInflater.from(list.getContext()).clear();
     CachedInflater.from(list.getContext()).cacheUntilLimit(R.layout.conversation_list_item_view, list, 10);
 
     snapToTopDataObserver = new SnapToTopDataObserver(list);

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
@@ -157,7 +157,7 @@ class IncomingMessageObserver(private val context: Application) {
   private fun onAppForegrounded() {
     lock.withLock {
       appVisible = true
-      context.startService(Intent(context, BackgroundService::class.java))
+      BackgroundService.start(context)
       condition.signalAll()
     }
   }

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
@@ -481,7 +481,7 @@
         <item quantity="other">%1$d gesprekke na inkassie geskuif</item>
     </plurals>
     <plurals name="ConversationListFragment_read_plural">
-        <item quantity="one">Lees</item>
+        <item quantity="one">Gelees</item>
         <item quantity="other">Gelees</item>
     </plurals>
     <plurals name="ConversationListFragment_unread_plural">
@@ -494,7 +494,7 @@
     </plurals>
     <plurals name="ConversationListFragment_unpin_plural">
         <item quantity="one">Verwyder speld</item>
-        <item quantity="other">Verwyder speld</item>
+        <item quantity="other">Verwyder spelde</item>
     </plurals>
     <plurals name="ConversationListFragment_mute_plural">
         <item quantity="one">Demp</item>
@@ -504,7 +504,7 @@
         <item quantity="one">Ontdemp</item>
         <item quantity="other">Ontdemp</item>
     </plurals>
-    <string name="ConversationListFragment_select">Kies</string>
+    <string name="ConversationListFragment_select">Selekteer</string>
     <plurals name="ConversationListFragment_archive_plural">
         <item quantity="one">Argiveer</item>
         <item quantity="other">Argiveer</item>
@@ -2147,7 +2147,7 @@
     <string name="MessageNotifier_reacted_s_to_your_audio">Het %1$s gereageer op jou oudio.</string>
     <string name="MessageNotifier_reacted_s_to_your_view_once_media">Het %1$s op jou eenkeerkyk-media gereageer.</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
-    <string name="MessageNotifier_reacted_s_to_your_payment">Reacted %1$s to your payment.</string>
+    <string name="MessageNotifier_reacted_s_to_your_payment">Het %1$s op jou betaling gereageer.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">Het %1$s op jou plakker gereageer.</string>
     <string name="MessageNotifier_this_message_was_deleted">Hierdie boodskap is geskrap.</string>
 

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -521,28 +521,28 @@
         <item quantity="other">تم نقل %1$d رسالة إلى الوارد</item>
     </plurals>
     <plurals name="ConversationListFragment_read_plural">
-        <item quantity="zero">اقرأ</item>
-        <item quantity="one">اقرأ</item>
-        <item quantity="two">اقرأ</item>
-        <item quantity="few">اقرأ</item>
-        <item quantity="many">اقرأ</item>
-        <item quantity="other">اقرأ</item>
+        <item quantity="zero">مقروءة</item>
+        <item quantity="one">مقروء</item>
+        <item quantity="two">مقروءة</item>
+        <item quantity="few">مقروءة</item>
+        <item quantity="many">مقروءة</item>
+        <item quantity="other">مقروءة</item>
     </plurals>
     <plurals name="ConversationListFragment_unread_plural">
-        <item quantity="zero">غير مقروء</item>
+        <item quantity="zero">غير مقروءة</item>
         <item quantity="one">غير مقروء</item>
-        <item quantity="two">غير مقروءه</item>
-        <item quantity="few">غير مقروءه</item>
-        <item quantity="many">غير مقروء</item>
-        <item quantity="other">غير مقروء</item>
+        <item quantity="two">غير مقروءة</item>
+        <item quantity="few">غير مقروءة</item>
+        <item quantity="many">غير مقروءة</item>
+        <item quantity="other">غير مقروءة</item>
     </plurals>
     <plurals name="ConversationListFragment_pin_plural">
         <item quantity="zero">تثبيت</item>
         <item quantity="one">تثبيت</item>
         <item quantity="two">تثبيت</item>
-        <item quantity="few">ثبت</item>
+        <item quantity="few">تثبيت</item>
         <item quantity="many">تثبيت</item>
-        <item quantity="other">ثبت</item>
+        <item quantity="other">تثبيت</item>
     </plurals>
     <plurals name="ConversationListFragment_unpin_plural">
         <item quantity="zero">إلغاء التثبيت</item>
@@ -554,36 +554,36 @@
     </plurals>
     <plurals name="ConversationListFragment_mute_plural">
         <item quantity="zero">كتم الدردشات</item>
-        <item quantity="one">كتم الدردشات</item>
+        <item quantity="one">كتم الدردشة</item>
         <item quantity="two">كتم الدردشات</item>
         <item quantity="few">كتم الدردشات</item>
         <item quantity="many">كتم الدردشات</item>
         <item quantity="other">كتم الدردشات</item>
     </plurals>
     <plurals name="ConversationListFragment_unmute_plural">
         <item quantity="zero">إلغاء كتم الدردشات</item>
-        <item quantity="one">إلغاء كتم الدردشات</item>
+        <item quantity="one">إلغاء كتم الدردشة</item>
         <item quantity="two">إلغاء كتم الدردشات</item>
         <item quantity="few">إلغاء كتم الدردشات</item>
         <item quantity="many">إلغاء كتم الدردشات</item>
         <item quantity="other">إلغاء كتم الدردشات</item>
     </plurals>
-    <string name="ConversationListFragment_select">حَدِّد</string>
+    <string name="ConversationListFragment_select">تحديد</string>
     <plurals name="ConversationListFragment_archive_plural">
-        <item quantity="zero">أرشيف</item>
-        <item quantity="one">أرشيف</item>
-        <item quantity="two">أرشيف</item>
-        <item quantity="few">أرشيف</item>
-        <item quantity="many">أرشيف</item>
-        <item quantity="other">أرشيف</item>
+        <item quantity="zero">أرشفة</item>
+        <item quantity="one">أرشفة</item>
+        <item quantity="two">أرشفة</item>
+        <item quantity="few">أرشفة</item>
+        <item quantity="many">أرشفة</item>
+        <item quantity="other">أرشفة</item>
     </plurals>
     <plurals name="ConversationListFragment_unarchive_plural">
-        <item quantity="zero">أخرج من الأرشيف</item>
-        <item quantity="one">أخرج من الأرشيف</item>
-        <item quantity="two">أخرج من الأرشيف</item>
-        <item quantity="few">أخرج من الأرشيف</item>
-        <item quantity="many">أخرج من الأرشيف</item>
-        <item quantity="other">أخرج من الأرشيف</item>
+        <item quantity="zero">إخراج من الأرشيف</item>
+        <item quantity="one">إخراج من الأرشيف</item>
+        <item quantity="two">إخراج من الأرشيف</item>
+        <item quantity="few">إخراج من الأرشيف</item>
+        <item quantity="many">إخراج من الأرشيف</item>
+        <item quantity="other">إخراج من الأرشيف</item>
     </plurals>
     <plurals name="ConversationListFragment_delete_plural">
         <item quantity="zero">حذف</item>
@@ -593,7 +593,7 @@
         <item quantity="many">حذف</item>
         <item quantity="other">حذف</item>
     </plurals>
-    <string name="ConversationListFragment_select_all">اختيار الجميع</string>
+    <string name="ConversationListFragment_select_all">تحديد الكل</string>
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="zero">تم تحديد %1$d</item>
         <item quantity="one">تم تحديد %1$d</item>
@@ -2435,7 +2435,7 @@
     <string name="MessageNotifier_reacted_s_to_your_audio">تفاعل %1$s مع تسجيلك الصوتي.</string>
     <string name="MessageNotifier_reacted_s_to_your_view_once_media">تفاعل %1$s مع وسائطك التي تُعرَض مرة واحدة.</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
-    <string name="MessageNotifier_reacted_s_to_your_payment">Reacted %1$s to your payment.</string>
+    <string name="MessageNotifier_reacted_s_to_your_payment">تفاعل %1$s مع عملية الدفع الخاصة بك.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">تم تفاعل %1$s مع ملصقك الخاص.</string>
     <string name="MessageNotifier_this_message_was_deleted">تم حذف هذه الرسالة.</string>
 

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
@@ -481,12 +481,12 @@
         <item quantity="other">%1$d söhbət gələnlər qutusuna köçürüldü</item>
     </plurals>
     <plurals name="ConversationListFragment_read_plural">
-        <item quantity="one">Oxundu</item>
-        <item quantity="other">Oxundu</item>
+        <item quantity="one">Oxunmuş</item>
+        <item quantity="other">Oxunmuş</item>
     </plurals>
     <plurals name="ConversationListFragment_unread_plural">
-        <item quantity="one">Oxunmadı</item>
-        <item quantity="other">Oxunmadı</item>
+        <item quantity="one">Oxunmamış</item>
+        <item quantity="other">Oxunmamış</item>
     </plurals>
     <plurals name="ConversationListFragment_pin_plural">
         <item quantity="one">Sancaqla</item>
@@ -497,17 +497,17 @@
         <item quantity="other">Sancağı götür</item>
     </plurals>
     <plurals name="ConversationListFragment_mute_plural">
-        <item quantity="one">Səsi bağla</item>
-        <item quantity="other">Səsi bağla</item>
+        <item quantity="one">Səssiz et</item>
+        <item quantity="other">Səssiz et</item>
     </plurals>
     <plurals name="ConversationListFragment_unmute_plural">
         <item quantity="one">Səsi aç</item>
         <item quantity="other">Səsi aç</item>
     </plurals>
-    <string name="ConversationListFragment_select">Seçin</string>
+    <string name="ConversationListFragment_select">Seç</string>
     <plurals name="ConversationListFragment_archive_plural">
-        <item quantity="one">Arxivlə</item>
-        <item quantity="other">Arxivlə</item>
+        <item quantity="one">Arxivləşdir</item>
+        <item quantity="other">Arxivləşdir</item>
     </plurals>
     <plurals name="ConversationListFragment_unarchive_plural">
         <item quantity="one">Arxivdən çıxart</item>
@@ -2147,7 +2147,7 @@
     <string name="MessageNotifier_reacted_s_to_your_audio">Səsinizə reaksiya verdi: %1$s.</string>
     <string name="MessageNotifier_reacted_s_to_your_view_once_media">Bir dəfə baxıla bilən media faylınıza reaksiya verdi: %1$s.</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
-    <string name="MessageNotifier_reacted_s_to_your_payment">Reacted %1$s to your payment.</string>
+    <string name="MessageNotifier_reacted_s_to_your_payment">Ödənişinizə %1$s reaksiyası verdi.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">Stikerinizə reaksiya verdi: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Mesaj silindi.</string>
 

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -482,11 +482,11 @@
     </plurals>
     <plurals name="ConversationListFragment_read_plural">
         <item quantity="one">Прочетено</item>
-        <item quantity="other">Прочетено</item>
+        <item quantity="other">Прочетени</item>
     </plurals>
     <plurals name="ConversationListFragment_unread_plural">
-        <item quantity="one">Непрочитане</item>
-        <item quantity="other">Непрочитане</item>
+        <item quantity="one">Непрочетено</item>
+        <item quantity="other">Непрочетени</item>
     </plurals>
     <plurals name="ConversationListFragment_pin_plural">
         <item quantity="one">Закачане</item>
@@ -501,10 +501,10 @@
         <item quantity="other">Заглушаване</item>
     </plurals>
     <plurals name="ConversationListFragment_unmute_plural">
-        <item quantity="one">Изключване на тих режим</item>
+        <item quantity="one">Премахни заглушаване</item>
         <item quantity="other">Премахни заглушаване</item>
     </plurals>
-    <string name="ConversationListFragment_select">Изберете</string>
+    <string name="ConversationListFragment_select">Избиране</string>
     <plurals name="ConversationListFragment_archive_plural">
         <item quantity="one">Архивиране</item>
         <item quantity="other">Архивиране</item>
@@ -517,7 +517,7 @@
         <item quantity="one">Изтриване</item>
         <item quantity="other">Изтриване</item>
     </plurals>
-    <string name="ConversationListFragment_select_all">Избери всичко</string>
+    <string name="ConversationListFragment_select_all">Избиране на всичко</string>
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="one">%1$d избрано</item>
         <item quantity="other">%1$d избрани</item>
@@ -2147,7 +2147,7 @@
     <string name="MessageNotifier_reacted_s_to_your_audio">Реагира с %1$s на вашето аудио.</string>
     <string name="MessageNotifier_reacted_s_to_your_view_once_media">Реагира с %1$s на вашата еднократна медия.</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
-    <string name="MessageNotifier_reacted_s_to_your_payment">Reacted %1$s to your payment.</string>
+    <string name="MessageNotifier_reacted_s_to_your_payment">Реагира с %1$s на вашето плащане.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">Реагира с %1$s на вашия стикер.</string>
     <string name="MessageNotifier_this_message_was_deleted">Това съобщение беше изтрито.</string>
 

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
@@ -489,29 +489,29 @@
         <item quantity="other">অপঠিত</item>
     </plurals>
     <plurals name="ConversationListFragment_pin_plural">
-        <item quantity="one">পিন</item>
-        <item quantity="other">পিন</item>
+        <item quantity="one">পিন করুন</item>
+        <item quantity="other">পিন করুন</item>
     </plurals>
     <plurals name="ConversationListFragment_unpin_plural">
         <item quantity="one">আনপিন করুন</item>
         <item quantity="other">আনপিন করুন</item>
     </plurals>
     <plurals name="ConversationListFragment_mute_plural">
-        <item quantity="one">মিউট করুন</item>
-        <item quantity="other">মিউট করুন</item>
+        <item quantity="one">নীরব করুন</item>
+        <item quantity="other">নীরব করুন</item>
     </plurals>
     <plurals name="ConversationListFragment_unmute_plural">
-        <item quantity="one">আনমিউট করুন</item>
-        <item quantity="other">আনমিউট করুন</item>
+        <item quantity="one">সরব করুন</item>
+        <item quantity="other">সরব করুন</item>
     </plurals>
-    <string name="ConversationListFragment_select">নির্বাচন</string>
+    <string name="ConversationListFragment_select">নির্বাচন করুন</string>
     <plurals name="ConversationListFragment_archive_plural">
-        <item quantity="one">লুকাইয়া রাখুন</item>
-        <item quantity="other">লুকাইয়া রাখুন</item>
+        <item quantity="one">আর্কাইভ করুন</item>
+        <item quantity="other">আর্কাইভ করুন</item>
     </plurals>
     <plurals name="ConversationListFragment_unarchive_plural">
-        <item quantity="one">পুনরুদ্ধার করুন</item>
-        <item quantity="other">পুনরুদ্ধার করুন</item>
+        <item quantity="one">আনআর্কাইভ করুন</item>
+        <item quantity="other">আনআর্কাইভ করুন</item>
     </plurals>
     <plurals name="ConversationListFragment_delete_plural">
         <item quantity="one">মুছে ফেলুন</item>
@@ -2147,7 +2147,7 @@
     <string name="MessageNotifier_reacted_s_to_your_audio">আপনার অডিওতে %1$s রিঅ্যাক্ট করেছেন।</string>
     <string name="MessageNotifier_reacted_s_to_your_view_once_media">আপনার ভিউ-ওয়ান্স মিডিয়াতে %1$s রিঅ্যাক্ট করেছেন।</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
-    <string name="MessageNotifier_reacted_s_to_your_payment">Reacted %1$s to your payment.</string>
+    <string name="MessageNotifier_reacted_s_to_your_payment">আপনার পেমেন্টে %1$s রিঅ্যাক্ট করেছেন।</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">আপনার স্টিকারে %1$s রিঅ্যাক্ট করেছেন।</string>
     <string name="MessageNotifier_this_message_was_deleted">এই বার্তাটি মুছে ফেলা হয়েছে।</string>