Merge branch 'master' into deltalab

.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*
 

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
 

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

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.

res/drawable/emoji_variation_selector_background_light.xml

@@ -4,6 +4,7 @@
     android:shape="rectangle">
 
     <corners android:radius="5dp" />
+    <stroke android:width="1dp" android:color="@color/grey_400"/>
     <solid android:color="@color/core_white" />
 
 </shape>

res/values/strings.xml

@@ -696,6 +696,7 @@
     <string name="InfoPlist_NSContactsUsageDescription">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.</string>
     <string name="InfoPlist_NSMicrophoneUsageDescription">Delta Chat uses your microphone to record and send voice messages and videos with sound.</string>
     <string name="InfoPlist_NSPhotoLibraryUsageDescription">Delta Chat will let you choose which photos from your library to send.</string>
+    <string name="InfoPlist_NSPhotoLibraryAddUsageDescription">Delta Chat wants to save images to your photo library.</string>
 
 
     <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->

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 {

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();

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 <VERSION>"
+    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/