From da517bdc9b434b06cfd9b2c4bb02232be9e99382 Mon Sep 17 00:00:00 2001
From: bjoern <r10s@b44t.com>
Date: Wed, 5 Apr 2023 15:41:15 +0200
Subject: [PATCH] prepare 1.36.2 (#2535)

* update deltachat-core-rust to 'ref: More logging for ongoing and get_backup (#4289)' of branch 'stable-1.112'

* update changelog for 1.36.2

* bump version to 1.36.2

* add some feedback at end of upload-release script, similar to upload-beta
---
 CHANGELOG.md              | 15 ++++++++++++++-
 build.gradle              |  4 ++--
 jni/deltachat-core-rust   |  2 +-
 scripts/upload-release.sh |  6 ++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04afb8b3b..048a945c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,23 @@
 # Delta Chat Android Changelog
 
+## v1.36.2
+2023-04
+
+* add a device message after setting up a second device
+* speed up "Add as Second Device" connection time significantly on the getter side
+* if possible, show Wi-Fi-name directly after scanning an "Add Second Device" QR code
+* fix immediate restarts of "Add Second Device"
+* fix: do not show just trashed media in "All Media" view
+* fix: update database if needed after "Add Second Device"
+* update translations and local help
+* update to core112.6
+
+
 ## v1.36.0
 2023-03
 
 * new, easy method of adding a second device to your account:
-  select "Add as a Second Device" after installation and scan a QR code from the old device
+  select "Add as Second Device" after installation and scan a QR code from the old device
 * view "All Media" of all chats by the corresponding option in the chat list's menu
 * add "Clear Chat" option to remove all messages from a chat
 * show non-deltachat emails by default for new installations
diff --git a/build.gradle b/build.gradle
index 3969f9a3c..b89a65fbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,8 +96,8 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 650
-        versionName "1.36.0"
+        versionCode 651
+        versionName "1.36.2"
 
         applicationId "com.b44t.messenger"
         multiDexEnabled true
diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index 185a0193c..86c18fb3a 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit 185a0193cce60fd472a41e20205652176f7e552c
+Subproject commit 86c18fb3ae6bb629b590087bd07f64ae3f8dba79
diff --git a/scripts/upload-release.sh b/scripts/upload-release.sh
index 67597aeed..54d6badf6 100755
--- a/scripts/upload-release.sh
+++ b/scripts/upload-release.sh
@@ -35,3 +35,9 @@ rm $SYMBOLS_ZIP
 zip -r $SYMBOLS_ZIP obj
 ls -l $SYMBOLS_ZIP
 rsync --progress $SYMBOLS_ZIP jekyll@download.delta.chat:/var/www/html/download/android/symbols/
+
+echo "upload done."
+echo ""
+echo "and now: here is Delta Chat $VERSION:"
+echo "- 🍋 https://download.delta.chat/android/deltachat-gplay-release-$VERSION.apk (android, overwrites existing gplay installs, keeps data)"
+echo ""