From 8b5b3393a45c5a739a19ec51ba8c4a6c31df0938 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 16 Jun 2016 11:46:25 +0200
Subject: extract relevant extension from file name when processing share
 intent

---
 .../conversations/persistance/FileBackend.java     | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/persistance')

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index d2a45695d..34943a52b 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -14,6 +14,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.system.Os;
 import android.system.StructStat;
@@ -264,14 +265,34 @@ public class FileBackend {
 	}
 
 	public void copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
-		Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage");
 		String mime = mXmppConnectionService.getContentResolver().getType(uri);
+		Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage (mime="+mime+")");
 		String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime);
-        String filename = fileDateFormat.format(new Date(message.getTimeSent()))+"_"+message.getUuid().substring(0,4);
+		if (extension == null) {
+			extension = getExtensionFromUri(uri);
+		}
+		String filename = fileDateFormat.format(new Date(message.getTimeSent()))+"_"+message.getUuid().substring(0,4);
 		message.setRelativeFilePath(filename + "." + extension);
 		copyFileToPrivateStorage(mXmppConnectionService.getFileBackend().getFile(message), uri);
 	}
 
+	private String getExtensionFromUri(Uri uri) {
+		String[] projection = {MediaStore.MediaColumns.DATA};
+		String filename = null;
+		Cursor cursor = mXmppConnectionService.getContentResolver().query(uri, projection, null, null, null);
+		if (cursor != null) {
+			try {
+				if (cursor.moveToFirst()) {
+					filename = cursor.getString(0);
+				}
+			} finally {
+				cursor.close();
+			}
+		}
+		int pos = filename == null ? -1 : filename.lastIndexOf('.');
+		return pos > 0 ? filename.substring(pos+1) : null;
+	}
+
 	private void copyImageToPrivateStorage(File file, Uri image, int sampleSize) throws FileCopyException {
 		file.getParentFile().mkdirs();
 		InputStream is = null;
-- 
cgit v1.2.3