diff --git a/.gitignore b/.gitignore index b1bd8aaab..f8399fb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,9 @@ test/androidTestEspresso/res/values/arrays.xml obj/ jni/libspeex/.deps/ +# ignore debug symbols created by ./tools/upload-release.sh +*-symbols.zip + # ignore private scripts and directories, eg. local2github.prv.sh *.prv* diff --git a/CHANGELOG.md b/CHANGELOG.md index ff5043b92..368f28044 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Delta Chat Android Changelog -## v1.10.2 +## v1.10.3 2020-06 * with this version, Delta Chat enters a whole new level of speed, @@ -28,6 +28,7 @@ * fix importing addresses * lots of other fixes + ## v1.8.1 2020-05-14 diff --git a/build.gradle b/build.gradle index bfcefb4d4..1e67ba861 100644 --- a/build.gradle +++ b/build.gradle @@ -89,8 +89,8 @@ android { } defaultConfig { - versionCode 585 - versionName "1.10.2" + versionCode 586 + versionName "1.10.3" applicationId "com.b44t.messenger" multiDexEnabled true diff --git a/docs/release-checklist.md b/docs/release-checklist.md index d8ab5909c..c7fe243e3 100644 --- a/docs/release-checklist.md +++ b/docs/release-checklist.md @@ -37,14 +37,7 @@ on success, the generated APK is at # Upload APK to get.delta.chat -7. $ cd gplay/release - $ rsync deltachat-gplay-release-VERSION.apk jekyll@download.delta.chat:/var/www/html/download/android/ - (you need the private SSH key of the jekyll user; you can find it in this file: - https://github.com/hpk42/otf-deltachat/blob/master/secrets/delta.chat - It is protected with [git-crypt](https://www.agwa.name/projects/git-crypt/) - - after installing it, you can decrypt it with `git crypt unlock`. - If your key isn't added to the secrets, you can ask on irc add you. - Add the key to your `~/.ssh/config` for the host, or to your ssh-agent, so rsync is able to use it) +7. $ ./tools/upload-release.sh VERSION 8. a) Test the APK yourself. The "Testing checklist" gives some hints. diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index 75d20b899..6a4b6fdda 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit 75d20b899a4bb626d08737193704d5dc3bce159b +Subproject commit 6a4b6fddac15f425e0037ebc5c0358e61a8ba269 diff --git a/res/drawable/emoji_variation_selector_background_light.xml b/res/drawable/emoji_variation_selector_background_light.xml index b4a215a2e..4023357a2 100644 --- a/res/drawable/emoji_variation_selector_background_light.xml +++ b/res/drawable/emoji_variation_selector_background_light.xml @@ -4,6 +4,7 @@ android:shape="rectangle"> + diff --git a/res/values/strings.xml b/res/values/strings.xml index ccb5be51b..38815170b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -696,6 +696,7 @@ Delta Chat uses your contacts to show a list of email addresses you can write to. Delta Chat has no server, your contacts are not sent anywhere. Delta Chat uses your microphone to record and send voice messages and videos with sound. Delta Chat will let you choose which photos from your library to send. + Delta Chat wants to save images to your photo library. diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java index e2ee81aa5..3774e79ca 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java @@ -48,7 +48,6 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider, @Override public void onEmojiSelected(String emoji) { recentModel.onCodePointSelected(emoji); - emojiPagerAdapter.notifyDataSetChanged(); if (emojiEventListener != null) { emojiEventListener.onEmojiSelected(emoji); @@ -158,11 +157,6 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider, public boolean isViewFromObject(View view, Object object) { return view == object; } - - @Override - public int getItemPosition(@NonNull Object object) { - return POSITION_NONE; - } } public interface EmojiEventListener { diff --git a/src/org/thoughtcrime/securesms/connect/AccountManager.java b/src/org/thoughtcrime/securesms/connect/AccountManager.java index b01526943..53639e877 100644 --- a/src/org/thoughtcrime/securesms/connect/AccountManager.java +++ b/src/org/thoughtcrime/securesms/connect/AccountManager.java @@ -64,7 +64,7 @@ public class AccountManager { private @Nullable Account maybeGetAccount(File file) { try { - if (!file.isDirectory() && file.getName().endsWith(".db")) { + if (!file.isDirectory() && file.getName().startsWith("messenger") && file.getName().endsWith(".db")) { DcContext testContext = new DcContext(null, file.getAbsolutePath()); if (testContext.isOk()) { Account ret = new Account(); diff --git a/tools/upload-release.sh b/tools/upload-release.sh new file mode 100755 index 000000000..4f8ddc2dc --- /dev/null +++ b/tools/upload-release.sh @@ -0,0 +1,35 @@ + +VERSION=$1 + +if [ -z "$VERSION" ]; then + echo "this script uploads apk and symbols to get.delta.chat" + echo "the script does not upload things to gplay or other stores." + echo "" + echo "usage: ./tools/upload-release.sh " + exit +fi +if [[ ${VERSION:0:1} == "v" ]]; then + echo "VERSION must not begin with 'v' here." + exit +fi + +cd gplay/release +APK="deltachat-gplay-release-$VERSION.apk" +ls -l $APK +read -p "upload this apk and belonging symbols to get.delta.chat? ENTER to continue, CTRL-C to abort." + +# you need the private SSH key of the jekyll user; you can find it in this file: +# https://github.com/hpk42/otf-deltachat/blob/master/secrets/delta.chat +# It is protected with [git-crypt](https://www.agwa.name/projects/git-crypt/) - +# after installing it, you can decrypt it with `git crypt unlock`. +# If your key isn't added to the secrets, and you know some of the team in person, +# you can ask on irc #deltachat for access. +# Add the key to your `~/.ssh/config` for the host, or to your ssh-agent, so rsync is able to use it) +rsync --progress $APK jekyll@download.delta.chat:/var/www/html/download/android/ + +cd ../.. +SYMBOLS_ZIP="$APK-symbols.zip" +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/ \ No newline at end of file