Merge remote-tracking branch 'upstream/main'

ArcaneChat · Jan 4, 2025 · 2d8ec49 · 2d8ec49
2 parents 6f5e90b + 3b19ca9
commit 2d8ec49
Show file tree

Hide file tree

Showing 39 changed files with 385 additions and 398 deletions.
diff --git a/src/main/assets/help/de/help.html b/src/main/assets/help/de/help.html
diff --git a/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java b/src/main/java/org/thoughtcrime/securesms/WebxdcActivity.java
@@ -68,6 +68,7 @@ public class WebxdcActivity extends WebViewActivity implements DcEventCenter.DcE
   private static final String EXTRA_HIDE_ACTION_BAR = "hideActionBar";
   private static final String EXTRA_HREF = "href";
   private static final int REQUEST_CODE_FILE_PICKER = 51426;
+  private static long lastOpenTime = 0;
 
   private ValueCallback<Uri[]> filePathCallback;
   private DcContext dcContext;
@@ -270,6 +271,7 @@ protected void onPause() {
 
   @Override
   protected void onDestroy() {
+    lastOpenTime = System.currentTimeMillis();
     DcHelper.getEventCenter(this.getApplicationContext()).removeObservers(this);
     leaveRealtimeChannel();
     super.onDestroy();

diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -125,11 +125,6 @@ private void inflateStub() {
       removableMediaView.setRemoveClickListener(new RemoveButtonListener());
       removableMediaView.setEditClickListener(new EditButtonListener());
       thumbnail.setOnClickListener(new ThumbnailClickListener());
-      int incomingBubbleColor = ThemeUtil.getThemedColor(context, R.attr.conversation_item_incoming_bubble_color);
-      audioView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
-      documentView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
-      webxdcView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
-      vcardView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
     }
 
   }

diff --git a/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="2px"
+        android:bottom="2px">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#55888888" />
+            <corners
+                android:topLeftRadius="@dimen/message_corner_radius"
+                android:topRightRadius="@dimen/message_corner_radius"
+                android:bottomRightRadius="@dimen/message_corner_radius" />
+            <solid android:color="?attr/conversation_item_incoming_bubble_color" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml b/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="2px"
+        android:bottom="2px">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#55888888" />
+            <corners
+                android:topLeftRadius="@dimen/message_corner_radius"
+                android:topRightRadius="@dimen/message_corner_radius"
+                android:bottomLeftRadius="@dimen/message_corner_radius" />
+            <solid android:color="?attr/conversation_item_incoming_bubble_color" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -4,6 +4,7 @@
              android:id="@+id/attachment_editor"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
+             android:background="?attr/input_panel_bg_color"
              android:gravity="center_horizontal"
              android:visibility="gone">
 
@@ -45,7 +46,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
         <org.thoughtcrime.securesms.components.DocumentView
                 android:id="@+id/attachment_document"
@@ -56,7 +57,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
         <org.thoughtcrime.securesms.components.WebxdcView
                 android:id="@+id/attachment_webxdc"
@@ -67,7 +68,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
         <org.thoughtcrime.securesms.components.VcardView
                 android:id="@+id/attachment_vcard"
@@ -78,7 +79,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
     </org.thoughtcrime.securesms.components.RemovableEditableMediaView>
 

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
@@ -1117,8 +1117,6 @@
     <string name="InfoPlist_NSMicrophoneUsageDescription">Delta Chat използва Вашия микрофон, за да записва и изпраща гласови съобщения и видеоклипове със звук.</string>
     <string name="InfoPlist_NSPhotoLibraryUsageDescription">Delta Chat ще Ви даде да изберете кои снимки от Вашата библотека да изпратите.</string>
     <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">Delta Chat иска да запише изображения във Вашата библиотека със снимки.</string>
-
-
     <string name="pref_background_notifications_rationale">За да се поддържа връзката към Вашия сървър за електронна поща и да получавате съобщения във фонов режим, игнорирайте оптимизациите на батерията на следващата стъпка.\n\nDelta Chat използва малко ресурси и се грижи да не изтощава Вашата батерия.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">Докоснете тук, за да получавате съобщения, докато Delta Chat е във фонов режим.</string>