OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2025-03-26 08:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed native library checking, fixed preview sending for gif documents

Browse source
This commit is contained in:
DrKLO 2014-04-05 17:27:42 +04:00
parent 2f191225b7
commit c4e113dc67
3 changed files with 112 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TMessagesProj/build.gradle
View file

@ -82,7 +82,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 19 targetSdkVersion 19
versionCode 226 versionCode 229
versionName "1.4.11" versionName "1.4.12"
} }
} }

6
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file

@ -1935,7 +1935,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter
reqSend.media.last_name = user.last_name; reqSend.media.last_name = user.last_name;
performSendMessageRequest(reqSend, newMsgObj); performSendMessageRequest(reqSend, newMsgObj);
} else if (type == 7) { } else if (type == 7) {
reqSend.media = new TLRPC.TL_inputMediaUploadedDocument(); if (document.thumb.location != null && document.thumb.location instanceof TLRPC.TL_fileLocation) {
reqSend.media = new TLRPC.TL_inputMediaUploadedThumbDocument();
} else {
reqSend.media = new TLRPC.TL_inputMediaUploadedDocument();
}
reqSend.media.mime_type = document.mime_type; reqSend.media.mime_type = document.mime_type;
reqSend.media.file_name = document.file_name; reqSend.media.file_name = document.file_name;
DelayedMessage delayedMessage = new DelayedMessage(); DelayedMessage delayedMessage = new DelayedMessage();

192
TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java
View file

@ -9,6 +9,7 @@
package org.telegram.messenger; package org.telegram.messenger;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.os.Build; import android.os.Build;
import java.io.File; import java.io.File;
@ -29,119 +30,136 @@ public class NativeLoader {
private static volatile boolean nativeLoaded = false; private static volatile boolean nativeLoaded = false;
private static File getNativeLibraryDir(Context context) {
File f = null;
if (context != null) {
try {
f = (File) ApplicationInfo.class.getField("nativeLibraryDir").get(context.getApplicationInfo());
} catch (Throwable th) {
th.printStackTrace();
}
}
if (f == null) {
f = new File(context.getApplicationInfo().dataDir, "lib");
}
if (f != null && f.isDirectory()) {
return f;
}
return null;
}
public static synchronized void initNativeLibs(Context context) { public static synchronized void initNativeLibs(Context context) {
if (nativeLoaded) { if (nativeLoaded) {
return; return;
} }
if (Build.VERSION.SDK_INT >= 9) { try {
try { String folder = null;
String folder = null; long libSize = 0;
long libSize = 0; long libSize2 = 0;
long libSize2 = 0;
try { try {
if (Build.CPU_ABI.equalsIgnoreCase("armeabi-v7a")) { if (Build.CPU_ABI.equalsIgnoreCase("armeabi-v7a")) {
folder = "armeabi-v7a"; folder = "armeabi-v7a";
libSize = sizes[1]; libSize = sizes[1];
libSize2 = sizes[0]; libSize2 = sizes[0];
} else if (Build.CPU_ABI.equalsIgnoreCase("armeabi")) { } else if (Build.CPU_ABI.equalsIgnoreCase("armeabi")) {
folder = "armeabi";
libSize = sizes[0];
libSize2 = sizes[1];
} else if (Build.CPU_ABI.equalsIgnoreCase("x86")) {
folder = "x86";
libSize = sizes[2];
} else if (Build.CPU_ABI.equalsIgnoreCase("mips")) {
folder = "mips";
libSize = sizes[3];
} else {
folder = "armeabi";
libSize = sizes[0];
libSize2 = sizes[1];
FileLog.e("tmessages", "Unsupported arch: " + Build.CPU_ABI);
}
} catch (Exception e) {
FileLog.e("tmessages", e);
folder = "armeabi"; folder = "armeabi";
libSize = sizes[0]; libSize = sizes[0];
libSize2 = sizes[1]; libSize2 = sizes[1];
} else if (Build.CPU_ABI.equalsIgnoreCase("x86")) {
folder = "x86";
libSize = sizes[2];
} else if (Build.CPU_ABI.equalsIgnoreCase("mips")) {
folder = "mips";
libSize = sizes[3];
} else {
folder = "armeabi";
libSize = sizes[0];
libSize2 = sizes[1];
FileLog.e("tmessages", "Unsupported arch: " + Build.CPU_ABI);
} }
} catch (Exception e) {
FileLog.e("tmessages", e);
folder = "armeabi";
libSize = sizes[0];
libSize2 = sizes[1];
}
File destFile = new File(context.getApplicationInfo().nativeLibraryDir + "/libtmessages.so"); File destFile = getNativeLibraryDir(context);
if (destFile.exists() && (destFile.length() == libSize || libSize2 != 0 && destFile.length() == libSize2)) { if (destFile != null && destFile.exists() && (destFile.length() == libSize || libSize2 != 0 && destFile.length() == libSize2)) {
FileLog.d("tmessages", "Load normal lib"); FileLog.d("tmessages", "Load normal lib");
try {
System.loadLibrary("tmessages");
nativeLoaded = true;
return;
} catch (Exception e) {
e.printStackTrace();
}
}
File destLocalFile = new File(context.getFilesDir().getAbsolutePath() + "/libtmessages.so");
if (destLocalFile.exists()) {
if (destLocalFile.length() == libSize) {
try { try {
System.loadLibrary("tmessages"); FileLog.d("tmessages", "Load local lib");
System.load(destLocalFile.getAbsolutePath());
nativeLoaded = true; nativeLoaded = true;
return; return;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} else {
destLocalFile.delete();
} }
}
File destLocalFile = new File(context.getFilesDir().getAbsolutePath() + "/libtmessages.so"); FileLog.e("tmessages", "Library not found, arch = " + folder);
if (destLocalFile.exists()) {
if (destLocalFile.length() == libSize) { ZipFile zipFile = null;
try { InputStream stream = null;
FileLog.d("tmessages", "Load local lib"); try {
System.load(destLocalFile.getAbsolutePath()); zipFile = new ZipFile(context.getApplicationInfo().sourceDir);
nativeLoaded = true; ZipEntry entry = zipFile.getEntry("lib/" + folder + "/libtmessages.so");
return; if (entry == null) {
} catch (Exception e) { throw new Exception("Unable to find file in apk:" + "lib/" + folder + "/libtmessages.so");
e.printStackTrace();
}
} else {
destLocalFile.delete();
}
} }
stream = zipFile.getInputStream(entry);
FileLog.e("tmessages", "Library not found, arch = " + folder); OutputStream out = new FileOutputStream(destLocalFile);
byte[] buf = new byte[4096];
ZipFile zipFile = null; int len;
InputStream stream = null; while ((len = stream.read(buf)) > 0) {
try { Thread.yield();
zipFile = new ZipFile(context.getApplicationInfo().sourceDir); out.write(buf, 0, len);
ZipEntry entry = zipFile.getEntry("lib/" + folder + "/libtmessages.so");
if (entry == null) {
throw new Exception("Unable to find file in apk:" + "lib/" + folder + "/libtmessages.so");
}
stream = zipFile.getInputStream(entry);
OutputStream out = new FileOutputStream(destLocalFile);
byte[] buf = new byte[4096];
int len;
while ((len = stream.read(buf)) > 0) {
Thread.yield();
out.write(buf, 0, len);
}
out.close();
System.load(destLocalFile.getAbsolutePath());
nativeLoaded = true;
return;
} catch (Exception e) {
FileLog.e("tmessages", e);
} finally {
if (stream != null) {
try {
stream.close();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
if (zipFile != null) {
try {
zipFile.close();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
} }
out.close();
System.load(destLocalFile.getAbsolutePath());
nativeLoaded = true;
return;
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} finally {
if (stream != null) {
try {
stream.close();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
if (zipFile != null) {
try {
zipFile.close();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
} }
} catch (Throwable e) {
e.printStackTrace();
} }
System.loadLibrary("tmessages"); System.loadLibrary("tmessages");