Merge remote-tracking branch 'upstream/main'

Author: adbenitez

CHANGELOG-upstream.md

@@ -1,6 +1,7 @@
 # Delta Chat Android Changelog
 
-## Unreleased
+## v2.25.0
+2025-11
 
 * Make it possible to invite members into a channel via a QR code,
   and make channels more secure
@@ -15,11 +16,12 @@
 * fix sorting of old media in gallery
 * fix text direction in "x members" subtitle for RTL languages
 * fix group invite QR screen's layout
+* tweak text hints in advanced classic e-mail configuration
 * remove deprecated "companion app" code
 * remove deprecated "Watch Sent Folder" preference
 * remove deprecated "send self-report" preference
 * don't show email address in shared vcard
-* update to core 2.24.0
+* update to core 2.25.0
 
 ## v2.22.0
 2025-10

build.gradle

@@ -33,8 +33,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 30000731
-        versionName "2.24.0"
+        versionCode 30000732
+        versionName "2.25.0"
 
         applicationId "chat.delta.lite"
         multiDexEnabled true

jni/deltachat-core-rust

@@ -183,6 +183,9 @@ else if(dcChat.isSelfTalk()) {
         else if(dcChat.isDeviceTalk()) {
             noMessageTextView.setText(R.string.device_talk_explain);
         }
+        else if(!dcChat.isEncrypted()) {
+            noMessageTextView.setText(R.string.chat_unencrypted_explanation);
+        }
         else {
             String message = getString(R.string.chat_new_one_to_one_hint, dcChat.getName());
             noMessageTextView.setText(message);

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

@@ -124,7 +124,7 @@ public void onCreate(Bundle bundle) {
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setTitle(R.string.login_header);
+            actionBar.setTitle(R.string.manual_account_setup_option);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
             actionBar.setElevation(0); // TODO: use custom toolbar instead

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

@@ -97,6 +97,12 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             imageView.setSVG(svg);
         } catch (SVGParseException e) {
             e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Activity activity = getActivity();
+            if (activity != null) {
+              activity.finish();
+            }
         }
 
         view.findViewById(R.id.share_link_button).setOnClickListener((v) -> showInviteLinkDialog());

src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java

@@ -120,7 +120,7 @@
             android:layout_height="wrap_content"
             android:gravity="left"
             android:padding="16dp"
-            android:text="@string/login_no_servers_hint"
+            android:text="@string/login_advanced_hint"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/provider_layout" />
 
@@ -152,7 +152,7 @@
             android:layout_height="40dp"
             android:padding="8dp"
             android:gravity="start|center_vertical"
-            android:text="@string/menu_advanced"
+            android:text="@string/menu_more_options"
             android:textColor="?attr/colorAccent"
             android:textSize="16sp"
             app:layout_constraintHorizontal_chainStyle="packed"
@@ -391,20 +391,6 @@
             app:layout_constraintStart_toStartOf="@id/guideline_root_start"
             app:layout_constraintTop_toBottomOf="@id/cert_check" />
 
-        <TextView
-            android:id="@+id/sub_header"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:gravity="left"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingTop="1dp"
-            android:paddingBottom="16dp"
-            android:text="@string/login_subheader"
-            android:textColor="@color/gray50"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_log_button" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>

src/main/res/layout/registration_activity.xml

@@ -655,9 +655,14 @@
     <string name="welcome_chat_over_email">Secure Decentralized Chat</string>
     <string name="scan_invitation_code">Scan Invitation Code</string>
     <string name="login_title">Log In</string>
+    <string name="login_advanced_hint">This login is for advanced users:\n\n• Do not use an account you\'re using in another app.\n\n• Classic e-mail server allow chats without end-to-end encryption marked by a mail icon.</string>
+    <!-- deprecated -->
     <string name="login_header">Log into your E-Mail Account</string>
+    <!-- deprecated -->
     <string name="login_explain">Log in with an existing e-mail account</string>
+    <!-- deprecated -->
     <string name="login_subheader">For known e-mail providers additional settings are set up automatically. Sometimes IMAP needs to be enabled in the web settings. Consult your e-mail provider or friends for help.</string>
+    <!-- deprecated -->
     <string name="login_no_servers_hint">Delta Chat does not collect user data, everything stays on your device.</string>
     <string name="login_inbox">Inbox</string>
     <string name="login_imap_login">IMAP Login Name</string>
@@ -978,6 +983,7 @@
     <string name="ephemeral_timer_weeks_by_you">You set disappearing messages timer to %1$s weeks.</string>
     <!-- %1$s will be replaced by the number of weeks (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->
     <string name="ephemeral_timer_weeks_by_other">Disappearing messages timer set to %1$s weeks by %2$s.</string>
+    <string name="chat_unencrypted_explanation">Messages in this chat use classic email and are not end-to-end encrypted.</string>
     <string name="chat_protection_enabled_tap_to_learn_more">Messages are end-to-end encrypted. Tap to learn more.</string>
     <string name="chat_protection_enabled_explanation">All messages in this chat are end-to-end encrypted.\n\nEnd-to-end encryption keeps messages private between you and your chat partners. Not even servers, providers or relays can read them.</string>
     <string name="invalid_unencrypted_tap_to_learn_more">⚠️ %1$s requires end-to-end encryption which is not setup for this chat yet. Tap to learn more.</string>