fix Downloader to support text/* files

update session adaptor to support downloading multiple files from incoming messages
zom · Jun 4, 2018 · cb62dff · cb62dff
1 parent 2fef352
commit cb62dff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/eu/siacs/conversations/Downloader.java b/app/src/main/java/eu/siacs/conversations/Downloader.java
@@ -53,7 +53,7 @@ public boolean get (String urlString, OutputStream storageStream) throws IOExcep
             connection.connect();
             mMimeType = connection.getContentType();
 
-            if (mMimeType != null && (!mMimeType.startsWith("text"))) {
+            if (mMimeType != null) {
                 OutputStream os = setupOutputStream(storageStream, url.getRef());
                 byte[] buffer = new byte[4096];
                 int count;

diff --git a/app/src/main/java/org/awesomeapp/messenger/service/adapters/ChatSessionAdapter.java b/app/src/main/java/org/awesomeapp/messenger/service/adapters/ChatSessionAdapter.java
@@ -1188,10 +1188,11 @@ public boolean onIncomingMessage(ChatSession ses, final org.awesomeapp.messenger
 
             boolean wasMessageSeen = false;
             ArrayList<String> mimeTypes = new ArrayList<>();
+            int attachIdx = 0;
 
             for (String mediaLink : mediaLinks)
             {
-               String resultMimeType = downloadMedia (mediaLink, msg.getID(), nickname);
+               String resultMimeType = downloadMedia (mediaLink, msg.getID() + "-" + attachIdx++, nickname);
                mimeTypes.add(resultMimeType);
             }
 
@@ -2067,7 +2068,6 @@ public String downloadMedia (String mediaLink, String msgId, String nickname)
 
                     insertOrUpdateChat(result);
 
-                 //   Imps.deleteMessageInDb(service.getContentResolver(),msgId);
                     Uri messageUri = Imps.insertMessageInDb(service.getContentResolver(),
                             mIsGroupChat, getId(),
                             true, nickname,