Update to 4.6.0

TMessagesProj/build.gradle

@@ -9,11 +9,11 @@ configurations {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services-gcm:11.0.2'
-    compile 'com.google.android.gms:play-services-maps:11.0.2'
-    compile 'com.google.android.gms:play-services-vision:11.0.2'
-    compile 'com.google.android.gms:play-services-wallet:11.0.2'
-    compile 'com.google.android.gms:play-services-wearable:11.0.2'
+    compile 'com.google.android.gms:play-services-gcm:11.0.4'
+    compile 'com.google.android.gms:play-services-maps:11.0.4'
+    compile 'com.google.android.gms:play-services-vision:11.0.4'
+    compile 'com.google.android.gms:play-services-wallet:11.0.4'
+    compile 'com.google.android.gms:play-services-wearable:11.0.4'
     compile 'com.android.support:support-core-ui:25.3.1'
     compile 'com.android.support:support-compat:25.3.1'
     compile 'com.android.support:support-core-utils:25.3.1'
@@ -25,8 +25,9 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.2'
+
 
     useLibrary 'org.apache.http.legacy'
     defaultConfig.applicationId = "org.telegram.messenger"
@@ -90,7 +91,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 1043
+    defaultConfig.versionCode = 1154
 
     sourceSets.debug {
         manifest.srcFile 'config/debug/AndroidManifest.xml'
@@ -104,6 +105,8 @@ android {
         manifest.srcFile 'config/foss/AndroidManifest.xml'
     }
 
+    flavorDimensions "minApi"
+
     productFlavors {
         x86 {
             ndk {
@@ -155,14 +158,21 @@ android {
     }
 
     applicationVariants.all { variant ->
-        def abiVersion = variant.productFlavors.get(0).versionCode
-        variant.mergedFlavor.versionCode = defaultConfig.versionCode * 10 + abiVersion
+        variant.outputs.all { output ->
+            output.processManifest.doLast {
+                def abiVersion = variant.productFlavors.get(0).versionCode
+                String manifestPath = "$manifestOutputDirectory/AndroidManifest.xml"
+                def manifestContent = file(manifestPath).getText()
+                manifestContent = manifestContent.replace(String.format('android:versionCode="%d"', abiVersion), String.format('android:versionCode="%s"', defaultConfig.versionCode * 10 + abiVersion))
+                file(manifestPath).write(manifestContent)
+            }
+        }
     }
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionName "4.2.1"
+        versionName "4.6.0"
 
         externalNativeBuild {
             ndkBuild {

TMessagesProj/jni/Android.mk

@@ -72,42 +72,6 @@ include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := breakpad
-LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -finline-functions -ffast-math -Os -fno-strict-aliasing
-
-LOCAL_C_INCLUDES := \
-./jni/breakpad/common/android/include \
-./jni/breakpad
-
-LOCAL_SRC_FILES := \
-./breakpad/client/linux/crash_generation/crash_generation_client.cc \
-./breakpad/client/linux/dump_writer_common/ucontext_reader.cc \
-./breakpad/client/linux/dump_writer_common/thread_info.cc \
-./breakpad/client/linux/handler/exception_handler.cc \
-./breakpad/client/linux/handler/minidump_descriptor.cc \
-./breakpad/client/linux/log/log.cc \
-./breakpad/client/linux/microdump_writer/microdump_writer.cc \
-./breakpad/client/linux/minidump_writer/linux_dumper.cc \
-./breakpad/client/linux/minidump_writer/linux_ptrace_dumper.cc \
-./breakpad/client/linux/minidump_writer/minidump_writer.cc \
-./breakpad/client/minidump_file_writer.cc \
-./breakpad/common/android/breakpad_getcontext.S \
-./breakpad/common/convert_UTF.c \
-./breakpad/common/md5.cc \
-./breakpad/common/string_conversion.cc \
-./breakpad/common/linux/elfutils.cc \
-./breakpad/common/linux/file_id.cc \
-./breakpad/common/linux/guid_creator.cc \
-./breakpad/common/linux/linux_libc_support.cc \
-./breakpad/common/linux/memory_mapped_file.cc \
-./breakpad/common/linux/safe_readlink.cc
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
 LOCAL_MODULE := voip
 LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -finline-functions -ffast-math -Os -fno-strict-aliasing -O3 -frtti -D__STDC_LIMIT_MACROS
 LOCAL_CFLAGS := -O3 -DUSE_KISS_FFT -fexceptions -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX -D__STDC_LIMIT_MACROS
@@ -399,7 +363,7 @@ LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA
 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
 LOCAL_CPPFLAGS 	:= -DBSD=1 -ffast-math -Os -funroll-loops -std=c++11
 LOCAL_LDLIBS 	:= -ljnigraphics -llog -lz -latomic -lOpenSLES -lEGL -lGLESv2
-LOCAL_STATIC_LIBRARIES := webp sqlite tgnet breakpad avformat avcodec avutil voip
+LOCAL_STATIC_LIBRARIES := webp sqlite tgnet avformat avcodec avutil voip
 
 LOCAL_SRC_FILES     := \
 ./opus/src/opus.c \
@@ -600,9 +564,8 @@ LOCAL_C_INCLUDES    := \
 ./jni/opus/opusfile \
 ./jni/libyuv/include \
 ./jni/boringssl/include \
-./jni/breakpad/common/android/include \
-./jni/breakpad \
 ./jni/ffmpeg/include \
+./jni/emoji \
 ./jni/intro
 
 LOCAL_SRC_FILES     += \
@@ -666,6 +629,8 @@ LOCAL_SRC_FILES     += \
 ./SqliteWrapper.cpp \
 ./TgNetWrapper.cpp \
 ./NativeLoader.cpp \
+./emoji/emoji_suggestions_data.cpp \
+./emoji/emoji_suggestions.cpp \
 ./libtgvoip/client/android/tg_voip_jni.cpp
 
 include $(BUILD_SHARED_LIBRARY)

TMessagesProj/jni/NativeLoader.cpp

@@ -1,7 +1,5 @@
 #include <jni.h>
 #include <stdio.h>
-#include "breakpad/client/linux/handler/exception_handler.h"
-#include "breakpad/client/linux/handler/minidump_descriptor.h"
 
 /*static google_breakpad::ExceptionHandler *exceptionHandler;
 
@@ -19,4 +17,4 @@ extern "C" {
             exceptionHandler = new google_breakpad::ExceptionHandler(descriptor, NULL, callback, NULL, true, -1);
         }*/
     }
-}
+}