OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-31 16:40:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed sharing gif files from gallery

Browse source
This commit is contained in:
DrKLO 2014-04-04 01:56:42 +04:00
parent ec533c5fff
commit 05471c4395
4 changed files with 52 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/build.gradle
View file

@ -82,7 +82,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 19 targetSdkVersion 19
versionCode 220 versionCode 221
versionName "1.4.10" versionName "1.4.10"
} }
} }

5
TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
View file

@ -684,6 +684,7 @@ public class Utilities {
} }
public static String getPath(final Uri uri) { public static String getPath(final Uri uri) {
try {
final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
if (isKitKat && DocumentsContract.isDocumentUri(ApplicationLoader.applicationContext, uri)) { if (isKitKat && DocumentsContract.isDocumentUri(ApplicationLoader.applicationContext, uri)) {
if (isExternalStorageDocument(uri)) { if (isExternalStorageDocument(uri)) {
@ -723,7 +724,9 @@ public class Utilities {
} else if ("file".equalsIgnoreCase(uri.getScheme())) { } else if ("file".equalsIgnoreCase(uri.getScheme())) {
return uri.getPath(); return uri.getPath();
} }
} catch (Exception e) {
FileLog.e("tmessages", e);
}
return null; return null;
} }

7
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file

@ -1535,10 +1535,15 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
processSendingPhoto(currentPicturePath, null); processSendingPhoto(currentPicturePath, null);
currentPicturePath = null; currentPicturePath = null;
} else if (requestCode == 1) { } else if (requestCode == 1) {
if (data == null) { if (data == null || data.getData() == null) {
return; return;
} }
String tempPath = Utilities.getPath(data.getData());
if (tempPath != null && tempPath.endsWith(".gif")) {
processSendingDocument(tempPath);
} else {
processSendingPhoto(null, data.getData()); processSendingPhoto(null, data.getData());
}
} else if (requestCode == 2) { } else if (requestCode == 2) {
String videoPath = null; String videoPath = null;
if (data != null) { if (data != null) {

6
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file

@ -329,7 +329,8 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
parcelable = Uri.parse(parcelable.toString()); parcelable = Uri.parse(parcelable.toString());
} }
if (parcelable != null && type != null && type.startsWith("image/")) { 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 { try {
documentPath = Utilities.getPath((Uri)parcelable); documentPath = Utilities.getPath((Uri)parcelable);
} catch (Exception e) { } catch (Exception e) {
@ -371,7 +372,8 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
if (!(parcelable instanceof Uri)) { if (!(parcelable instanceof Uri)) {
parcelable = Uri.parse(parcelable.toString()); 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) { if (documentsPathArray == null) {
documentsPathArray = new ArrayList<String>(); documentsPathArray = new ArrayList<String>();
} }