From e8eb0365949ab6d5913986fc1ad3f4b6cc80e261 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Tue, 3 Dec 2024 11:36:26 +0100
Subject: [PATCH] prepare 1.50.0

---
 CHANGELOG.md                                           | 10 ++++++----
 build.gradle                                           |  4 ++--
 .../securesms/ConversationListActivity.java            |  4 ++--
 src/main/res/values/strings.xml                        |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 761960574..d836b8c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Delta Chat Android Changelog
 
-## v1.49.0
-2024-11
+## v1.50.0
+2024-12
 
 * New emoji picker with support for more emojis
 * Webxdc apps can now trigger notifications
@@ -16,7 +16,9 @@
 * Removed internal font scaling setting in favor of the better system settings
 * Use privacy-preserving webxdc addresses
 * Use Rustls for connections with strict TLS
-* fix: Trim whitespace from scanned QR codes.
+* Mark Saved Messages chat as protected
+* Allow the user to replace maps integration
+* fix: Trim whitespace from scanned QR codes
 * fix quotes: Line-before-quote may be up to 120 character long instead of 80
 * fix: Prevent accidental wrong-password-notifications
 * fix: Remove footers from "Show Full Message..."
@@ -26,7 +28,7 @@
 * fix: Do not percent-encode dot when passing to autoconfig server (so, fix handling of some servers)
 * fix displaynames not being updated when intially scanned by a QR code
 * several bug fixes
-* update to core 1.151.2
+* update to core 1.151.3
 
 ## v1.48.3
 2024-10
diff --git a/build.gradle b/build.gradle
index ad7dcc2cd..5726b0357 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 702
-        versionName "1.49.0"
+        versionCode 703
+        versionName "1.50.0"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
index b9ba9e081..3ff77dbed 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -110,7 +110,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     // it is not needed to keep all past update messages, however, when deleted, also the strings should be deleted.
     try {
       DcContext dcContext = DcHelper.getContext(this);
-      final String deviceMsgLabel = "update_1_46_0l_android";
+      final String deviceMsgLabel = "update_1_50_0_android";
       if (!dcContext.wasDeviceMsgEverAdded(deviceMsgLabel)) {
         DcMsg msg = null;
         if (!getIntent().getBooleanExtra(FROM_WELCOME, false)) {
@@ -121,7 +121,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
           // Util.copy(inputStream, new FileOutputStream(outputFile));
           // msg.setFile(outputFile, "image/jpeg");
 
-          msg.setText(getString(R.string.update_1_46_android, "https://get.delta.chat/#changelogs"));
+          msg.setText(getString(R.string.update_1_50_android, "https://get.delta.chat/#changelogs"));
         }
         dcContext.addDeviceMsg(deviceMsgLabel, msg);
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 40226be13..bc75f0812 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1181,7 +1181,7 @@
     <string name="perm_enable_bg_already_done">You already allowed Delta Chat to receive messages in the background.\n\nIf messages still do not arrive in background, please also check your system settings.</string>
 
     <!-- device messages for updates -->
-    <string name="update_1_46_android">New Onboarding 🐣 and More:\n\n⚡️ Sign up to secure fast chatmail servers (https://delta.chat/chatmail) or use classic e-mail servers\n\n👉 PUSH notifications for any chatmail server\n\n👤 Connect your friends securely via \"Attach contacts\"\n\n🥰 React with any emoji\n\n📌 Pin chats directly from search … and MORE at %1$s</string>
+    <string name="update_1_50_android">New Emoji Picker ❤️‍🔥 and More:\n\n🆕 New emoji picker with support for more emojis\n\n🎮 Webxdc apps can now trigger notifications and deep-link to sections directly on opening by tapping in-chat announcements\n\n👍 Notify reactions to your messages\n\n🔔 Change to more natural order of messages in grouped notifications\n\n🥸 Don\'t expose your real email address to Webxdc apps … and MORE at %1$s</string>
     <string name="update_1_46_ios">New Onboarding 🐣 and More:\n\n⚡️ Sign up to secure fast chatmail servers (https://delta.chat/chatmail) or use classic e-mail servers\n\n👉 PUSH notifications for any chatmail server\n\n👤 Receive \"Attached contacts\" and connect to your friends\n\n🥰 Faster reaction selection … and MORE at %1$s</string>
     <string name="update_switch_profile_placement">ℹ️ \"Switch Profile\" option moved: Tap your profile image in the upper corner of the main screen to add or switch profiles 💡</string>
 </resources>