From 05471c43951383964dae87f07546dbd656c69819 Mon Sep 17 00:00:00 2001 From: DrKLO Date: Fri, 4 Apr 2014 01:56:42 +0400 Subject: [PATCH] Fixed sharing gif files from gallery --- TMessagesProj/build.gradle | 2 +- .../org/telegram/messenger/Utilities.java | 77 ++++++++++--------- .../java/org/telegram/ui/ChatActivity.java | 9 ++- .../java/org/telegram/ui/LaunchActivity.java | 6 +- 4 files changed, 52 insertions(+), 42 deletions(-) diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index fa573d866..1a05a8dc8 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -82,7 +82,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 19 - versionCode 220 + versionCode 221 versionName "1.4.10" } } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java index 5f7259290..d0193dd9b 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java @@ -684,46 +684,49 @@ public class Utilities { } public static String getPath(final Uri uri) { - final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; - if (isKitKat && DocumentsContract.isDocumentUri(ApplicationLoader.applicationContext, uri)) { - if (isExternalStorageDocument(uri)) { - final String docId = DocumentsContract.getDocumentId(uri); - final String[] split = docId.split(":"); - final String type = split[0]; - if ("primary".equalsIgnoreCase(type)) { - return Environment.getExternalStorageDirectory() + "/" + split[1]; + try { + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + if (isKitKat && DocumentsContract.isDocumentUri(ApplicationLoader.applicationContext, uri)) { + if (isExternalStorageDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + if ("primary".equalsIgnoreCase(type)) { + return Environment.getExternalStorageDirectory() + "/" + split[1]; + } + } else if (isDownloadsDocument(uri)) { + final String id = DocumentsContract.getDocumentId(uri); + final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); + return getDataColumn(ApplicationLoader.applicationContext, contentUri, null, null); + } else if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } else if ("video".equals(type)) { + contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI; + } else if ("audio".equals(type)) { + contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[] { + split[1] + }; + + return getDataColumn(ApplicationLoader.applicationContext, contentUri, selection, selectionArgs); } - } else if (isDownloadsDocument(uri)) { - final String id = DocumentsContract.getDocumentId(uri); - final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); - return getDataColumn(ApplicationLoader.applicationContext, contentUri, null, null); - } else if (isMediaDocument(uri)) { - final String docId = DocumentsContract.getDocumentId(uri); - final String[] split = docId.split(":"); - final String type = split[0]; - - Uri contentUri = null; - if ("image".equals(type)) { - contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; - } else if ("video".equals(type)) { - contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI; - } else if ("audio".equals(type)) { - contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; - } - - final String selection = "_id=?"; - final String[] selectionArgs = new String[] { - split[1] - }; - - return getDataColumn(ApplicationLoader.applicationContext, contentUri, selection, selectionArgs); + } else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(ApplicationLoader.applicationContext, uri, null, null); + } else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); } - } else if ("content".equalsIgnoreCase(uri.getScheme())) { - return getDataColumn(ApplicationLoader.applicationContext, uri, null, null); - } else if ("file".equalsIgnoreCase(uri.getScheme())) { - return uri.getPath(); + } catch (Exception e) { + FileLog.e("tmessages", e); } - return null; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 7d2a9a773..a9971c075 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -1535,10 +1535,15 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa processSendingPhoto(currentPicturePath, null); currentPicturePath = null; } else if (requestCode == 1) { - if (data == null) { + if (data == null || data.getData() == null) { return; } - processSendingPhoto(null, data.getData()); + String tempPath = Utilities.getPath(data.getData()); + if (tempPath != null && tempPath.endsWith(".gif")) { + processSendingDocument(tempPath); + } else { + processSendingPhoto(null, data.getData()); + } } else if (requestCode == 2) { String videoPath = null; if (data != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index 24fea83d0..0847666fb 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -329,7 +329,8 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen parcelable = Uri.parse(parcelable.toString()); } if (parcelable != null && type != null && type.startsWith("image/")) { - if (type.equals("image/gif")) { + String tempPath = Utilities.getPath((Uri)parcelable); + if (type.equals("image/gif") || tempPath != null && tempPath.endsWith(".gif")) { try { documentPath = Utilities.getPath((Uri)parcelable); } catch (Exception e) { @@ -371,7 +372,8 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen if (!(parcelable instanceof Uri)) { parcelable = Uri.parse(parcelable.toString()); } - if (type.equals("image/gif")) { + String tempPath = Utilities.getPath((Uri)parcelable); + if (type.equals("image/gif") || tempPath != null && tempPath.endsWith(".gif")) { if (documentsPathArray == null) { documentsPathArray = new ArrayList(); }