Merge remote-tracking branch 'upstream/main'

Author: adbenitez

CHANGELOG-upstream.md

@@ -1,5 +1,14 @@
 # Delta Chat Android Changelog
 
+## v2.9.0
+
+* hide contact email addresses in search results
+* disable non-functional message editing and ephemeral messages timer settings in classic email thread chat
+* don't enlage email chats avatar placeholder
+* improve message date/status footer layout, also in RTL languages
+* display correct text when receiving a "Disapearing messages enabled" system message
+* Update to core 2.9.0
+
 ## v2.8.0
 
 * Profiles focus on recognizing contacts

build.gradle

@@ -33,8 +33,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000726
-        versionName "2.8.0"
+        versionCode 30000727
+        versionName "2.9.0"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true

jni/deltachat-core-rust

@@ -448,7 +448,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
       menu.findItem(R.id.menu_show_map).setVisible(false);
     }
 
-    if (!dcChat.canSend() || dcChat.isMailingList() ) {
+    if (!dcChat.isEncrypted() || !dcChat.canSend() || dcChat.isMailingList() ) {
       menu.findItem(R.id.menu_ephemeral_messages).setVisible(false);
     }
 

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -334,8 +334,7 @@ protected void setCorrectMenuVisibility(Menu menu) {
             menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile());
             boolean canReply = canReplyToMsg(messageRecord);
             menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
-            boolean canEdit = canEditMsg(messageRecord);
-            menu.findItem(R.id.menu_context_edit).setVisible(chat.canSend() && canEdit);
+            menu.findItem(R.id.menu_context_edit).setVisible(chat.isEncrypted() && chat.canSend() && canEditMsg(messageRecord));
             boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
             menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately);
             menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC);

src/main/java/org/thoughtcrime/securesms/ConversationFragment.java

@@ -134,6 +134,7 @@ public void bind(@NonNull ThreadRecord thread,
       this.fromView.setText(recipient, state!=DcMsg.DC_STATE_IN_FRESH);
     }
 
+    subjectView.setVisibility(VISIBLE);
     this.subjectView.setText(thread.getDisplayBody());
     this.subjectView.setTypeface(state==DcMsg.DC_STATE_IN_FRESH ? BOLD_TYPEFACE : LIGHT_TYPEFACE);
     this.subjectView.setTextColor(state==DcMsg.DC_STATE_IN_FRESH ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color)
@@ -179,8 +180,8 @@ public void bind(@NonNull  DcContact     contact,
     Recipient recipient  = new Recipient(getContext(), contact);
 
     fromView.setText(getHighlightedSpan(contact.getDisplayName(), highlightSubstring));
-    fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, contact.isVerified()? R.drawable.ic_verified : 0, 0);
-    subjectView.setText(getHighlightedSpan(contact.getAddr(), highlightSubstring));
+    fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+    subjectView.setVisibility(GONE);
     dateView.setText("");
     dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
     archivedBadgeView.setVisibility(GONE);
@@ -204,6 +205,7 @@ public void bind(@NonNull  DcMsg         messageResult,
 
     fromView.setText(recipient, true);
     fromView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+    subjectView.setVisibility(VISIBLE);
     subjectView.setText(getHighlightedSpan(messageResult.getSummarytext(512), highlightSubstring));
 
     long timestamp = messageResult.getTimestamp();

src/main/java/org/thoughtcrime/securesms/ConversationListItem.java

@@ -329,7 +329,7 @@ public void onEnlargeAvatar() {
 
     File file = new File(profileImagePath);
 
-    if (file.exists()) {
+    if (chatIsEncrypted && file.exists()) {
       profileImageUri = Uri.fromFile(file);
       String type = "image/" + profileImagePath.substring(profileImagePath.lastIndexOf(".") + 1);
 
@@ -338,7 +338,7 @@ public void onEnlargeAvatar() {
       intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title);
       intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar
               MediaPreviewActivity.EDIT_AVATAR_CHAT_ID,
-              (chatIsMultiUser && chatIsEncrypted && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
+              (chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
       );
       startActivity(intent);
     } else if (chatIsMultiUser){

src/main/java/org/thoughtcrime/securesms/ProfileActivity.java

@@ -155,7 +155,6 @@ public static void setStockTranslations(Context context) {
     dcContext.setStockTranslation(11, context.getString(R.string.audio));
     dcContext.setStockTranslation(12, context.getString(R.string.file));
     dcContext.setStockTranslation(23, context.getString(R.string.gif));
-    dcContext.setStockTranslation(24, context.getString(R.string.encrypted_message));
     dcContext.setStockTranslation(29, context.getString(R.string.systemmsg_cannot_decrypt));
     dcContext.setStockTranslation(35, context.getString(R.string.contact_verified));
     dcContext.setStockTranslation(40, context.getString(R.string.chat_archived_label));
@@ -238,12 +237,7 @@ public static void setStockTranslations(Context context) {
     dcContext.setStockTranslation(121, context.getString(R.string.connectivity_not_connected));
     dcContext.setStockTranslation(162, context.getString(R.string.multidevice_qr_subtitle));
     dcContext.setStockTranslation(163, context.getString(R.string.multidevice_transfer_done_devicemsg));
-
-    // The next two strings should only be set if the UI actually shows more info when the user clicks on the
-    // DC_INFO_PROTECTION_{EN|DIS}ABLED info message
     dcContext.setStockTranslation(170, context.getString(R.string.chat_protection_enabled_tap_to_learn_more));
-    dcContext.setStockTranslation(171, context.getString(R.string.chat_protection_broken_tap_to_learn_more));
-
     dcContext.setStockTranslation(172, context.getString(R.string.chat_new_group_hint));
     dcContext.setStockTranslation(173, context.getString(R.string.member_x_added));
     dcContext.setStockTranslation(174, context.getString(R.string.invalid_unencrypted_tap_to_learn_more));

src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -15,18 +16,18 @@
         android:layout_gravity="center_vertical|end"
         android:importantForAccessibility="no"
         android:visibility="gone"
-        tools:visibility="visible"
-        />
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/footer_email_indicator"
         android:layout_width="12sp"
         android:layout_height="11sp"
         android:src="@drawable/ic_outline_email"
         android:visibility="gone"
+        android:layout_marginEnd="5dp"
         android:layout_gravity="center_vertical|end"
         android:importantForAccessibility="no"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/footer_edited"
@@ -37,9 +38,9 @@
         style="@style/Signal.Text.Caption.MessageSent"
         android:textColor="?conversation_item_outgoing_text_secondary_color"
         android:text="@string/edited"
-        android:paddingEnd="5dp"
+        android:layout_marginEnd="5dp"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/footer_date"
@@ -49,7 +50,7 @@
         android:linksClickable="false"
         style="@style/Signal.Text.Caption.MessageSent"
         android:textColor="?conversation_item_outgoing_text_secondary_color"
-        tools:text="30 mins"/>
+        tools:text="30 mins" />
 
     <ImageView
         android:id="@+id/footer_location_indicator"
@@ -59,14 +60,16 @@
         android:visibility="gone"
         android:layout_gravity="center_vertical|end"
         android:contentDescription="@string/location"
-        tools:visibility="gone"/>
+        tools:visibility="gone" />
 
-    <ImageView android:id="@+id/delivery_indicator"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_gravity="center_vertical|end"
-               android:layout_marginLeft="6dp"
-               android:tint="?attr/conversation_item_outgoing_text_secondary_color"
-               android:visibility="gone" />
+    <ImageView
+        android:id="@+id/delivery_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginStart="6dp"
+        android:contentDescription="@null"
+        android:visibility="gone"
+        app:tint="?attr/conversation_item_outgoing_text_secondary_color" />
 
 </merge>

src/main/res/layout/conversation_item_footer.xml

@@ -28,8 +28,8 @@
     <string name="join">Долучитися</string>
     <string name="rejoin">Передолучитися</string>
     <string name="delete">Видалити</string>
-    <string name="delete_for_me">Видалить у мене</string>
-    <string name="delete_for_everyone">Видалити в усіх</string>
+    <string name="delete_for_me">Видалити для мене</string>
+    <string name="delete_for_everyone">Видалити для всіх</string>
     <string name="info">Відомості</string>
     <string name="update">Оновити</string>
     <string name="emoji">Емодзі</string>