Merge pull request signalapp#376 from meskio/extension_saving_attachment

Set the right extension on saving an attachment
beno619 · Oct 15, 2013 · f3fdde6 · f3fdde6
2 parents f49c627 + 73b1e3f
commit f3fdde6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -39,6 +39,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.webkit.MimeTypeMap;
 
 import org.thoughtcrime.securesms.contacts.ContactIdentityManager;
 import org.thoughtcrime.securesms.contacts.ContactPhotoFactory;
@@ -387,9 +388,14 @@ else if (slide.hasAudio())
         outputDirectory = new File(sdCard.getAbsolutePath() + File.separator + "Music");
       else
         outputDirectory = new File(sdCard.getAbsolutePath() + File.separator + "Pictures");
-
       outputDirectory.mkdirs();
-      return File.createTempFile("textsecure", ".attach", outputDirectory);
+
+      MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
+      String extension = mimeTypeMap.getExtensionFromMimeType(slide.getContentType());
+      if (extension == null)
+          extension = "attach";
+
+      return File.createTempFile("textsecure", "." + extension, outputDirectory);
     }
 
     private void saveToSdCard() {