From 6ff2ae4e0246aac275b88e1e39242c4994fd3dd9 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Fri, 24 Jan 2020 20:20:37 +0100
Subject: fixed adding omemo encrypted images to gallery

---
 CHANGELOG.md                                             |  3 +++
 build.gradle                                             | 16 ++++++++--------
 .../de/pixart/messenger/http/HttpDownloadConnection.java |  3 ++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6b413b47..5e1a16451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 #### Version 2.3.5
 * start removing OTR
 * rework conference and contact details (big avatar is available via long click)
+* resume download of OMEMO encrypted files
+* Channels now use '#' as symbol in avatar
+* bug fixes
 
 #### Version 2.3.4
 * fixes for Jingle IBB file transfer
diff --git a/build.gradle b/build.gradle
index 8149b249b..af369ce42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 
@@ -63,7 +63,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.emoji:emoji:1.0.0'
     gitImplementation 'androidx.emoji:emoji-appcompat:1.0.0'
@@ -84,8 +84,8 @@ dependencies {
     implementation 'com.leinardi.android:speed-dial:3.1.1' // version >= 3.0.0 needs android X libraries
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.squareup.okhttp3:okhttp:3.12.6' // versions > 3.12.x don't support API level < 21 anymore
-    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
+    implementation "com.squareup.retrofit2:retrofit:2.6.4" //retrofit needs to stick with 2.6.x (https://github.com/square/retrofit/blob/master/CHANGELOG.md)
+    implementation "com.squareup.retrofit2:converter-gson:2.6.4"
     implementation 'com.google.guava:guava:28.1-android'
     implementation('com.github.AppIntro:AppIntro:5.1.0') {
         exclude group: 'org.jetbrains' , module:'annotations'
@@ -105,12 +105,12 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
 
-        versionCode 281
-        versionName "2.3.4"
+        versionCode 282
+        versionName "2.3.5-beta (2020-01-02)"
         //resConfigs "en"
 
         archivesBaseName += "-$versionName"
-        applicationId "de.pixart.messenger"
+        applicationId "de.pixart.messenger.test"
         multiDexEnabled true
 
         buildConfigField("String", "LOGTAG", '"Pix-Art_Messenger"')
@@ -119,7 +119,7 @@ android {
         buildConfigField("boolean", "SHOW_INTRO", 'true')
         buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"')
         resValue "string", "applicationId", applicationId
-        resValue "string", "app_name", "Pix-Art Messenger"
+        resValue "string", "app_name", "Pix-Art Messenger Test"
     }
 
     dataBinding {
diff --git a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
index 4d3db9f8c..c2f899ff7 100644
--- a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
+++ b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java
@@ -193,7 +193,7 @@ public class HttpDownloadConnection implements Transferable {
         }
     }
 
-    private void finish() throws Exception {
+    private void finish() {
         message.setTransferable(null);
         mHttpConnectionManager.finishConnection(this);
         boolean notify = acceptedAutomatically && !message.isRead();
@@ -202,6 +202,7 @@ public class HttpDownloadConnection implements Transferable {
         }
         mHttpConnectionManager.updateConversationUi(true);
         final boolean notifyAfterScan = notify;
+        final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message, true);
         mXmppConnectionService.getFileBackend().updateMediaScanner(file, () -> {
             if (notifyAfterScan) {
                 mXmppConnectionService.getNotificationService().push(message);
-- 
cgit v1.2.3