Merge remote-tracking branch 'upstream/master' into cust_remove_call_…

…confirm
simonsso · Feb 1, 2021 · 88bc2d9 · 88bc2d9
2 parents 8fdfabd + e0fc191
commit 88bc2d9
Show file tree

Hide file tree

Showing 22 changed files with 111 additions and 63 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,8 +61,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 782
-def canonicalVersionName = "5.3.9"
+def canonicalVersionCode = 783
+def canonicalVersionName = "5.3.10"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,

diff --git a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
@@ -125,7 +125,7 @@ public void onLoadCleared(@Nullable Drawable placeholder) {
       toolbar.setTitle(recipient.getDisplayName(context));
     });
 
-    FullscreenHelper fullscreenHelper = FullscreenHelper.createWithShortEdgesCutoutMode(this);
+    FullscreenHelper fullscreenHelper = new FullscreenHelper(this);
 
     findViewById(android.R.id.content).setOnClickListener(v -> fullscreenHelper.toggleUiVisibility());
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -159,7 +159,7 @@ protected void onCreate(Bundle bundle, boolean ready) {
 
     viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);
 
-    fullscreenHelper = FullscreenHelper.createWithShortEdgesCutoutMode(this);
+    fullscreenHelper = new FullscreenHelper(this);
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -108,7 +108,7 @@ public void onCreate(Bundle savedInstanceState) {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.webrtc_call_activity);
 
-    fullscreenHelper = FullscreenHelper.createWithShortEdgesCutoutMode(this);
+    fullscreenHelper = new FullscreenHelper(this);
 
     setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
@@ -33,6 +33,8 @@ public InsetAwareConstraintLayout(@NonNull Context context, @Nullable AttributeS
   protected boolean fitSystemWindows(Rect insets) {
     Guideline statusBarGuideline     = findViewById(R.id.status_bar_guideline);
     Guideline navigationBarGuideline = findViewById(R.id.navigation_bar_guideline);
+    Guideline parentStartGuideline   = findViewById(R.id.parent_start_guideline);
+    Guideline parentEndGuideline     = findViewById(R.id.parent_end_guideline);
 
     if (statusBarGuideline != null) {
       statusBarGuideline.setGuidelineBegin(insets.top);
@@ -42,6 +44,14 @@ protected boolean fitSystemWindows(Rect insets) {
       navigationBarGuideline.setGuidelineEnd(insets.bottom);
     }
 
+    if (parentStartGuideline != null) {
+      parentStartGuideline.setGuidelineBegin(insets.left);
+    }
+
+    if (parentEndGuideline != null) {
+      parentEndGuideline.setGuidelineEnd(insets.right);
+    }
+
     return true;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -420,7 +420,7 @@ protected void onCreate(Bundle state, boolean ready) {
       return;
     }
 
-    FullscreenHelper.createWithDefaultCutoutMode(this).showSystemUI();
+    new FullscreenHelper(this).showSystemUI();
 
     ConversationIntents.Args args = ConversationIntents.Args.from(getIntent());
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java
@@ -18,28 +18,14 @@ public final class FullscreenHelper {
 
   @NonNull private final Activity activity;
 
-  public static @NonNull FullscreenHelper createWithDefaultCutoutMode(@NonNull Activity activity) {
-    FullscreenHelper helper = new FullscreenHelper(activity);
-
-    helper.showSystemUI();
-
-    return helper;
-  }
-
-  public static @NonNull FullscreenHelper createWithShortEdgesCutoutMode(@NonNull Activity activity) {
-    FullscreenHelper helper = new FullscreenHelper(activity);
+  public FullscreenHelper(@NonNull Activity activity) {
+    this.activity = activity;
 
     if (Build.VERSION.SDK_INT >= 28) {
       activity.getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
     }
 
-    helper.showSystemUI();
-
-    return helper;
-  }
-
-  private FullscreenHelper(@NonNull Activity activity) {
-    this.activity = activity;
+    showSystemUI();
   }
 
   public void configureToolbarSpacer(@NonNull View spacer) {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java
@@ -90,7 +90,7 @@ protected void onCreate(Bundle savedInstanceState, boolean ready) {
       bubble2.setText(getString(R.string.ChatWallpaperPreviewActivity__set_wallpaper_for_s, recipient.getDisplayName(this)));
     }
 
-    FullscreenHelper.createWithDefaultCutoutMode(this).showSystemUI();
+    new FullscreenHelper(this).showSystemUI();
     WindowUtil.setLightStatusBarFromTheme(this);
     WindowUtil.setLightNavigationBarFromTheme(this);
   }

diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
@@ -27,8 +27,8 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"
         app:layout_constraintTop_toTopOf="@id/status_bar_guideline">
 
         <androidx.appcompat.widget.Toolbar
@@ -79,10 +79,10 @@
         android:id="@+id/layout_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
         app:layout_constraintBottom_toBottomOf="@id/navigation_bar_guideline"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/status_bar_guideline">
+        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline">
 
         <LinearLayout
             android:id="@+id/conversation_container"
@@ -227,8 +227,8 @@
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="@+id/status_bar_guideline"
         app:layout_constraintBottom_toBottomOf="@+id/navigation_bar_guideline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/parent_start_guideline"
+        app:layout_constraintEnd_toEndOf="@+id/parent_end_guideline"
         android:inflatedId="@+id/conversation_reaction_scrubber"
         android:layout="@layout/conversation_reaction_scrubber" />
 

diff --git a/app/src/main/res/layout/conversation_reaction_scrubber.xml b/app/src/main/res/layout/conversation_reaction_scrubber.xml
@@ -5,12 +5,12 @@
     android:id="@+id/conversation_reaction_scrubber"
     android:layout_width="0dp"
     android:layout_height="0dp"
+    app:layout_constraintTop_toTopOf="@+id/status_bar_guideline"
+    app:layout_constraintBottom_toBottomOf="@+id/navigation_bar_guideline"
+    app:layout_constraintStart_toStartOf="@+id/parent_start_guideline"
+    app:layout_constraintEnd_toEndOf="@+id/parent_end_guideline"
     android:elevation="1000dp"
     android:visibility="gone"
-    app:layout_constraintBottom_toBottomOf="@+id/navigation_bar_guideline"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@+id/status_bar_guideline"
     tools:visibility="visible">
 
     <org.thoughtcrime.securesms.components.MaskView

diff --git a/app/src/main/res/layout/system_ui_guidelines.xml b/app/src/main/res/layout/system_ui_guidelines.xml
@@ -14,4 +14,18 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         tools:layout_constraintGuide_end="48dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/parent_start_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:layout_constraintGuide_begin="5dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/parent_end_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:layout_constraintGuide_end="5dp" />
 </merge>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -359,7 +359,7 @@
   <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">Снимане трябва разрешение на камерата.</string>
   <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">Гледане на галерията трябва пазрешение на паметта.</string>
   <!--DateUtils-->
-  <string name="DateUtils_just_now">Сега</string>
+  <string name="DateUtils_just_now">Току що</string>
   <string name="DateUtils_minutes_ago">%dm</string>
   <string name="DateUtils_today">Днес</string>
   <string name="DateUtils_yesterday">Вчера</string>
@@ -622,8 +622,8 @@
   <string name="ManageGroupActivity_failed_to_update_the_group_please_retry_later">Актуализирането на групата не бе успешно, опитайте отново по-късно</string>
   <string name="ManageGroupActivity_failed_to_update_the_group_due_to_a_network_error_please_retry_later">Актуализирането на групата не бе успешно поради мрежова грешка, моля, опитайте отново по-късно</string>
   <string name="ManageGroupActivity_edit_name_and_picture">Редактирайте име и снимка</string>
-  <string name="ManageGroupActivity_legacy_group">Група от стар вид</string>
-  <string name="ManageGroupActivity_legacy_group_learn_more">Това е група от стар вид. Функции като администратори на групи са достъпни само за Нови Групи.</string>
+  <string name="ManageGroupActivity_legacy_group">Стар вид група</string>
+  <string name="ManageGroupActivity_legacy_group_learn_more">Това е група от стар вид. Функции като администратори на групи са достъпни само за нов вид групи.</string>
   <string name="ManageGroupActivity_legacy_group_upgrade">Това е група от стар вид. За достъп до нови функции като @споменавяния и администратори,</string>
   <string name="ManageGroupActivity_legacy_group_too_large">Тази група не може да бъде обновена до Нова, защото е прекалено голяма. Максиналният размер на група е %1$d.</string>
   <string name="ManageGroupActivity_upgrade_this_group">Обновете тази група</string>
@@ -778,7 +778,7 @@
   <string name="MediaOverviewActivity_Media">Медия</string>
   <string name="MediaOverviewActivity_Files">Файлове</string>
   <string name="MediaOverviewActivity_Audio">Аудио</string>
-  <string name="MediaOverviewActivity_All">Lir\'ur</string>
+  <string name="MediaOverviewActivity_All">Всички</string>
   <plurals name="MediaOverviewActivity_Media_delete_confirm_title">
     <item quantity="one">Да се изтрие ли избраният елемент?</item>
     <item quantity="other">Да се изтрият ли избраните елементи?</item>
@@ -792,8 +792,8 @@
   <string name="MediaOverviewActivity_Select_all">Избери всичко</string>
   <string name="MediaOverviewActivity_collecting_attachments">Събиране на прикачени файлове…</string>
   <string name="MediaOverviewActivity_Sort_by">Сортиране по</string>
-  <string name="MediaOverviewActivity_Newest">Най нови</string>
-  <string name="MediaOverviewActivity_Oldest">Най стари</string>
+  <string name="MediaOverviewActivity_Newest">Най-нови</string>
+  <string name="MediaOverviewActivity_Oldest">Най-стари</string>
   <string name="MediaOverviewActivity_Storage_used">Памет изпозвана</string>
   <string name="MediaOverviewActivity_All_storage_use">Цялото пространство за съхранение</string>
   <string name="MediaOverviewActivity_Grid_view_description">Изглед на мрежа</string>
@@ -1259,12 +1259,12 @@
   <!--SharedContactDetailsActivity-->
   <string name="SharedContactDetailsActivity_add_to_contacts">Добавяне към контакти</string>
   <string name="SharedContactDetailsActivity_invite_to_signal">Покани в Signal</string>
-  <string name="SharedContactDetailsActivity_signal_message">Signal-ско съобщение</string>
+  <string name="SharedContactDetailsActivity_signal_message">Съобщение в Signal</string>
   <string name="SharedContactDetailsActivity_signal_call">Signal обаждане</string>
   <!--SharedContactView-->
   <string name="SharedContactView_add_to_contacts">Добавяне към контакти</string>
   <string name="SharedContactView_invite_to_signal">Покани в Signal</string>
-  <string name="SharedContactView_message">Signal-ско съобщение</string>
+  <string name="SharedContactView_message">Съобщение в Signal</string>
   <!--SignalPinReminders-->
   <string name="SignalPinReminders_well_remind_you_again_later">Ще ви напомним отново по-късно.</string>
   <string name="SignalPinReminders_well_remind_you_again_tomorrow">Ще ви припомним отново утре.</string>
@@ -1433,7 +1433,7 @@
   <string name="MessageNotifier_view_once_photo">Снимка за еднократно гледане</string>
   <string name="MessageNotifier_view_once_video">Видео за еднократно гледане</string>
   <string name="MessageNotifier_reply">Отговори</string>
-  <string name="MessageNotifier_signal_message">Signal-ско съобщение</string>
+  <string name="MessageNotifier_signal_message">Съобщение в Signal</string>
   <string name="MessageNotifier_unsecured_sms">Некриптиран SMS</string>
   <string name="MessageNotifier_you_may_have_new_messages">Вие може да имате нови съобщения</string>
   <string name="MessageNotifier_open_signal_to_check_for_recent_notifications">Отворете Signal за да проверите за скорошни известия</string>
@@ -1545,7 +1545,7 @@
     <item quantity="other">%1$d членове</item>
   </plurals>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal-ско съобщение</string>
+  <string name="conversation_activity__type_message_push">Съобщение в Signal</string>
   <string name="conversation_activity__type_message_sms_insecure">Некриптиран SMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Некриптиран MMS</string>
   <string name="conversation_activity__from_sim_name">От %1$s</string>
@@ -1672,7 +1672,7 @@
   <string name="load_more_header__see_full_conversation">Разгледай целия разговор</string>
   <string name="load_more_header__loading">Зареждане</string>
   <!--media_overview_activity-->
-  <string name="media_overview_activity__no_media">Без медия</string>
+  <string name="media_overview_activity__no_media">Няма нищо</string>
   <!--message_recipients_list_item-->
   <string name="message_recipients_list_item__view">ПРЕГЛЕД</string>
   <string name="message_recipients_list_item__resend">ПОВТОРНО ИЗПРАЩАНЕ</string>
@@ -1697,6 +1697,7 @@
   <!--EditAboutFragment-->
   <string name="EditAboutFragment_about">Относно</string>
   <string name="EditAboutFragment_write_a_few_words_about_yourself">Напиши нещо за себе си…</string>
+  <string name="EditAboutFragment_count">%1$d/%2$d</string>
   <string name="EditAboutFragment_speak_freely">Говори свободно</string>
   <string name="EditAboutFragment_encrypted">Криптирано</string>
   <string name="EditAboutFragment_be_kind">Бъде добър</string>
@@ -2404,7 +2405,7 @@
   <string name="ChatWallpaperFragment__clear">Изчистване</string>
   <string name="ChatWallpaperFragment__wallpaper_preview_description">Преглед на тапета</string>
   <!--ChatWallpaperSelectionFragment-->
-  <string name="ChatWallpaperSelectionFragment__choose_from_photos">Изери от снимки</string>
+  <string name="ChatWallpaperSelectionFragment__choose_from_photos">Избери от снимки</string>
   <string name="ChatWallpaperSelectionFragment__presets">Предварително зададени</string>
   <!--ChatWallpaperPreviewActivity-->
   <string name="ChatWallpaperPreviewActivity__preview">Преглед</string>

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -1703,6 +1703,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--EditAboutFragment-->
   <string name="EditAboutFragment_about">Névjegy</string>
   <string name="EditAboutFragment_write_a_few_words_about_yourself">Írj egy pár szót magadról…</string>
+  <string name="EditAboutFragment_count">%1$d/%2$d</string>
   <string name="EditAboutFragment_speak_freely">Beszélj szabadon</string>
   <string name="EditAboutFragment_encrypted">Titkosított</string>
   <string name="EditAboutFragment_be_kind">Légy kedves</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -1641,7 +1641,7 @@
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>名前または番号を入力して下さい</small></string>
   <!--verify_display_fragment-->
-  <string name="verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%s との暗号化を検証したい場合は、上記の番号が相手端末上の番号と一致するか確認してください。相手の端末上のQRコードを読み取るか、こちらのQRコードを相手に読み取ってもらうことでも可能です。<a href="https://signal.org/redirect/safety-numbers">詳細</a>]]></string>
+  <string name="verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%s に対する暗号化を検証するには、上記の番号が相手の端末のものと一致するか確認してください。相手の端末上のコードをスキャンするか、あなたのコードをスキャンしてもらうことでも可能です。<a href="https://signal.org/redirect/safety-numbers">詳細</a>]]></string>
   <string name="verify_display_fragment__tap_to_scan">タップしてスキャンする</string>
   <string name="verify_display_fragment__loading">読み込んでいます…</string>
   <string name="verify_display_fragment__verified">検証済み</string>
@@ -2031,7 +2031,7 @@
   <string name="ConfirmKbsPinFragment__pins_dont_match">PINが一致しません。再度試してください。</string>
   <string name="ConfirmKbsPinFragment__confirm_your_pin">PINを確認してください。</string>
   <string name="ConfirmKbsPinFragment__pin_creation_failed">PINの作成に失敗しました</string>
-  <string name="ConfirmKbsPinFragment__your_pin_was_not_saved">PINは保存されませんでした。あとでPINの作成について改めて伺います。 </string>
+  <string name="ConfirmKbsPinFragment__your_pin_was_not_saved">PINは保存されていません。あとでPINを作成するようお知らせします。</string>
   <string name="ConfirmKbsPinFragment__pin_created">PINを作成しました。</string>
   <string name="ConfirmKbsPinFragment__re_enter_your_pin">PINを再入力</string>
   <string name="ConfirmKbsPinFragment__creating_pin">PINを作成しています…</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -420,7 +420,7 @@ protected void onCreate(Bundle state, boolean ready) { @@
           return;
         }
-        FullscreenHelper.createWithDefaultCutoutMode(this).showSystemUI();
+        new FullscreenHelper(this).showSystemUI();
         ConversationIntents.Args args = ConversationIntents.Args.from(getIntent());
@@ Expand Down @@