Update to 3.9.0

NextAlone · May 25, 2016 · 85239ed · 85239ed
1 parent 1c74ed4
commit 85239ed
Show file tree

Hide file tree

Showing 174 changed files with 34,037 additions and 16,735 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     compile 'com.android.support:support-v4:23.3.0'
     compile "com.google.android.gms:play-services-gcm:8.4.0"
     compile "com.google.android.gms:play-services-maps:8.4.0"
-    compile 'net.hockeyapp.android:HockeySDK:3.6.+'
+    compile 'net.hockeyapp.android:HockeySDK:4.0.+'
     compile 'com.googlecode.mp4parser:isoparser:1.0.+'
 }
 
@@ -63,7 +63,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 787
+    defaultConfig.versionCode = 803
 
     sourceSets.main {
         jniLibs.srcDir 'libs'
@@ -114,7 +114,7 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 23
-        versionName "3.8.1"
+        versionName "3.9.0"
     }
 }
 

diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk
@@ -235,7 +235,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_MODULE 	:= tmessages.21
+LOCAL_MODULE 	:= tmessages.22
 LOCAL_CFLAGS 	:= -w -std=c11 -Os -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF -fno-math-errno
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -ffast-math -D__STDC_CONSTANT_MACROS
@@ -521,15 +521,12 @@ endif
 
 LOCAL_SRC_FILES     += \
 ./jni.c \
-./sqlite_cursor.c \
-./sqlite_database.c \
-./sqlite_statement.c \
-./sqlite.c \
 ./audio.c \
 ./utils.c \
 ./image.c \
 ./video.c \
 ./gifvideo.cpp \
+./SqliteWrapper.cpp \
 ./TgNetWrapper.cpp \
 ./NativeLoader.cpp
 

diff --git a/TMessagesProj/jni/SqliteWrapper.cpp b/TMessagesProj/jni/SqliteWrapper.cpp
@@ -0,0 +1,241 @@
+#include "sqlite/sqlite3.h"
+#include "tgnet/NativeByteBuffer.h"
+#include "tgnet/BuffersStorage.h"
+
+void throw_sqlite3_exception(JNIEnv *env, sqlite3 *handle, int errcode) {
+    if (SQLITE_OK == errcode) {
+        errcode = sqlite3_errcode(handle);
+    }
+    const char *errmsg = sqlite3_errmsg(handle);
+    jclass exClass = env->FindClass("org/telegram/SQLite/SQLiteException");
+    env->ThrowNew(exClass, errmsg);
+}
+
+extern "C" {
+
+int Java_org_telegram_SQLite_SQLitePreparedStatement_step(JNIEnv *env, jobject object, int statementHandle) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    int errcode = sqlite3_step(handle);
+    if (errcode == SQLITE_ROW)  {
+        return 0;
+    } else if(errcode == SQLITE_DONE) {
+        return 1;
+    }  else if(errcode == SQLITE_BUSY) {
+        return -1;
+    }
+    throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+}
+
+int Java_org_telegram_SQLite_SQLitePreparedStatement_prepare(JNIEnv *env, jobject object, int sqliteHandle, jstring sql) {
+    sqlite3 *handle = (sqlite3 *) sqliteHandle;
+
+    char const *sqlStr = env->GetStringUTFChars(sql, 0);
+
+    sqlite3_stmt *stmt_handle;
+
+    int errcode = sqlite3_prepare_v2(handle, sqlStr, -1, &stmt_handle, 0);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, handle, errcode);
+    }
+
+    if (sqlStr != 0) {
+        env->ReleaseStringUTFChars(sql, sqlStr);
+    }
+
+    return (int) stmt_handle;
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_reset(JNIEnv *env, jobject object, int statementHandle) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    int errcode = sqlite3_reset(handle);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_finalize(JNIEnv *env, jobject object, int statementHandle) {
+    sqlite3_finalize((sqlite3_stmt *) statementHandle);
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_bindByteBuffer(JNIEnv *env, jobject object, int statementHandle, int index, jobject value, int length) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+    void *buf = env->GetDirectBufferAddress(value);
+
+    int errcode = sqlite3_bind_blob(handle, index, buf, length, SQLITE_STATIC);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_bindString(JNIEnv *env, jobject object, int statementHandle, int index, jstring value) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    char const *valueStr = env->GetStringUTFChars(value, 0);
+
+    int errcode = sqlite3_bind_text(handle, index, valueStr, -1, SQLITE_TRANSIENT);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+
+    if (valueStr != 0) {
+        env->ReleaseStringUTFChars(value, valueStr);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_bindInt(JNIEnv *env, jobject object, int statementHandle, int index, int value) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    int errcode = sqlite3_bind_int(handle, index, value);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_bindLong(JNIEnv *env, jobject object, int statementHandle, int index, long long value) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    int errcode = sqlite3_bind_int64(handle, index, value);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_bindDouble(JNIEnv *env, jobject object, int statementHandle, int index, double value) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    int errcode = sqlite3_bind_double(handle, index, value);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLitePreparedStatement_bindNull(JNIEnv *env, jobject object, int statementHandle, int index) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+
+    int errcode = sqlite3_bind_null(handle, index);
+    if (SQLITE_OK != errcode) {
+        throw_sqlite3_exception(env, sqlite3_db_handle(handle), errcode);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLiteDatabase_closedb(JNIEnv *env, jobject object, int sqliteHandle) {
+    sqlite3 *handle = (sqlite3 *)sqliteHandle;
+    int err = sqlite3_close(handle);
+    if (SQLITE_OK != err) {
+        throw_sqlite3_exception(env, handle, err);
+    }
+}
+
+void Java_org_telegram_SQLite_SQLiteDatabase_beginTransaction(JNIEnv *env, jobject object, int sqliteHandle) {
+    sqlite3 *handle = (sqlite3 *)sqliteHandle;
+    sqlite3_exec(handle, "BEGIN", 0, 0, 0);
+}
+
+void Java_org_telegram_SQLite_SQLiteDatabase_commitTransaction(JNIEnv *env, jobject object, int sqliteHandle) {
+    sqlite3 *handle = (sqlite3 *)sqliteHandle;
+    sqlite3_exec(handle, "COMMIT", 0, 0, 0);
+}
+
+int Java_org_telegram_SQLite_SQLiteDatabase_opendb(JNIEnv *env, jobject object, jstring fileName, jstring tempDir) {
+    char const *fileNameStr = env->GetStringUTFChars(fileName, 0);
+    char const *tempDirStr = env->GetStringUTFChars(tempDir, 0);
+
+    if (sqlite3_temp_directory != 0) {
+        sqlite3_free(sqlite3_temp_directory);
+    }
+    sqlite3_temp_directory = sqlite3_mprintf("%s", tempDirStr);
+
+    sqlite3 *handle = 0;
+    int err = sqlite3_open(fileNameStr, &handle);
+    if (SQLITE_OK != err) {
+        throw_sqlite3_exception(env, handle, err);
+    }
+    if (fileNameStr != 0) {
+        env->ReleaseStringUTFChars(fileName, fileNameStr);
+    }
+    if (tempDirStr != 0) {
+        env->ReleaseStringUTFChars(tempDir, tempDirStr);
+    }
+    return (int)handle;
+}
+
+int Java_org_telegram_SQLite_SQLiteCursor_columnType(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+	sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	return sqlite3_column_type(handle, columnIndex);
+}
+
+int Java_org_telegram_SQLite_SQLiteCursor_columnIsNull(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+	sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	int valType = sqlite3_column_type(handle, columnIndex);
+	return SQLITE_NULL == valType;
+}
+
+int Java_org_telegram_SQLite_SQLiteCursor_columnIntValue(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+	sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	int valType = sqlite3_column_type(handle, columnIndex);
+	if (SQLITE_NULL == valType) {
+		return 0;
+	}
+	return sqlite3_column_int(handle, columnIndex);
+}
+
+long long Java_org_telegram_SQLite_SQLiteCursor_columnLongValue(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+	sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	int valType = sqlite3_column_type(handle, columnIndex);
+	if (SQLITE_NULL == valType) {
+		return 0;
+	}
+	return sqlite3_column_int64(handle, columnIndex);
+}
+
+double Java_org_telegram_SQLite_SQLiteCursor_columnDoubleValue(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+	sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	int valType = sqlite3_column_type(handle, columnIndex);
+	if (SQLITE_NULL == valType) {
+		return 0;
+	}
+	return sqlite3_column_double(handle, columnIndex);
+}
+
+jstring Java_org_telegram_SQLite_SQLiteCursor_columnStringValue(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+	sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	const char *str = (const char *) sqlite3_column_text(handle, columnIndex);
+	if (str != 0) {
+		return env->NewStringUTF(str);
+	}
+	return 0;
+}
+
+jbyteArray Java_org_telegram_SQLite_SQLiteCursor_columnByteArrayValue(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+    sqlite3_stmt *handle = (sqlite3_stmt *)statementHandle;
+	const jbyte *buf = (const jbyte *) sqlite3_column_blob(handle, columnIndex);
+	int length = sqlite3_column_bytes(handle, columnIndex);
+	if (buf != nullptr && length > 0) {
+		jbyteArray result = env->NewByteArray(length);
+        env->SetByteArrayRegion(result, 0, length, buf);
+        return result;
+	}
+	return nullptr;
+}
+
+int Java_org_telegram_SQLite_SQLiteCursor_columnByteBufferValue(JNIEnv *env, jobject object, int statementHandle, int columnIndex) {
+    sqlite3_stmt *handle = (sqlite3_stmt *) statementHandle;
+    int length = sqlite3_column_bytes(handle, columnIndex);
+    if (length <= 0) {
+        return 0;
+    }
+    NativeByteBuffer *buffer = BuffersStorage::getInstance().getFreeBuffer(length);
+    if (buffer == nullptr) {
+        return 0;
+    }
+    const char *buf = (const char *) sqlite3_column_blob(handle, columnIndex);
+    if (buf == nullptr) {
+        return 0;
+    }
+    memcpy(buffer->bytes(), buf, length);
+	return (int) buffer;
+}
+
+}
diff --git a/TMessagesProj/jni/jni.c b/TMessagesProj/jni/jni.c
@@ -7,7 +7,6 @@
 #include <openssl/aes.h>
 #include <unistd.h>
 #include "utils.h"
-#include "sqlite.h"
 #include "image.h"
 
 int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env);
@@ -21,10 +20,6 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 		return -1;
 	}
 
-    if (sqliteOnJNILoad(vm, reserved, env) == -1) {
-        return -1;
-    }
-
     if (imageOnJNILoad(vm, reserved, env) == -1) {
         return -1;
     }

diff --git a/TMessagesProj/jni/libyuv/include/libyuv/compare_row.h b/TMessagesProj/jni/libyuv/include/libyuv/compare_row.h
@@ -22,6 +22,12 @@ extern "C" {
     (defined(__i386__) && !defined(__SSE2__))
 #define LIBYUV_DISABLE_X86
 #endif
+// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+#define LIBYUV_DISABLE_X86
+#endif
+#endif
 
 // Visual C 2012 required for AVX2.
 #if defined(_M_IX86) && !defined(__clang__) && \
@@ -36,7 +42,8 @@ extern "C" {
 #endif  // clang >= 3.4
 #endif  // __clang__
 
-#if defined(_M_IX86) && (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2))
+#if !defined(LIBYUV_DISABLE_X86) && \
+    defined(_M_IX86) && (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2))
 #define HAS_HASHDJB2_AVX2
 #endif
 

diff --git a/TMessagesProj/jni/libyuv/include/libyuv/cpu_id.h b/TMessagesProj/jni/libyuv/include/libyuv/cpu_id.h
@@ -41,7 +41,7 @@ static const int kCpuHasAVX3 = 0x2000;
 
 // These flags are only valid on MIPS processors.
 static const int kCpuHasMIPS = 0x10000;
-static const int kCpuHasMIPS_DSPR2 = 0x20000;
+static const int kCpuHasDSPR2 = 0x20000;
 
 // Internal function used to auto-init.
 LIBYUV_API

diff --git a/TMessagesProj/jni/libyuv/include/libyuv/planar_functions.h b/TMessagesProj/jni/libyuv/include/libyuv/planar_functions.h
@@ -384,12 +384,6 @@ int ARGBUnattenuate(const uint8* src_argb, int src_stride_argb,
                     uint8* dst_argb, int dst_stride_argb,
                     int width, int height);
 
-// Convert MJPG to ARGB.
-LIBYUV_API
-int MJPGToARGB(const uint8* sample, size_t sample_size,
-               uint8* argb, int argb_stride,
-               int w, int h, int dw, int dh);
-
 // Internal function - do not call directly.
 // Computes table of cumulative sum for image where the value is the sum
 // of all values above and to the left of the entry. Used by ARGBBlur.
@@ -453,6 +447,12 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y,
     (defined(__i386__) && !defined(__SSE2__))
 #define LIBYUV_DISABLE_X86
 #endif
+// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+#define LIBYUV_DISABLE_X86
+#endif
+#endif
 // The following are available on all x86 platforms:
 #if !defined(LIBYUV_DISABLE_X86) && \
     (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__))