Update to 4.1.1

NextAlone · Jul 8, 2017 · dd679bd · dd679bd
1 parent 6a1cf64
commit dd679bd
Show file tree

Hide file tree

Showing 649 changed files with 47,414 additions and 10,992 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -9,15 +9,17 @@ configurations {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services-gcm:10.2.0'
-    compile 'com.google.android.gms:play-services-maps:10.2.0'
-    compile 'com.google.android.gms:play-services-vision:10.2.0'
-    compile 'com.android.support:support-core-ui:25.3.0'
-    compile 'com.android.support:support-compat:25.3.0'
-    compile 'com.android.support:support-core-utils:25.3.0'
-    compile 'com.android.support:support-v13:25.3.0'
-    compile 'com.android.support:palette-v7:25.3.0'
-    compile 'net.hockeyapp.android:HockeySDK:4.1.2'
+    compile 'com.google.android.gms:play-services-gcm:11.0.1'
+    compile 'com.google.android.gms:play-services-maps:11.0.1'
+    compile 'com.google.android.gms:play-services-vision:11.0.1'
+    compile 'com.google.android.gms:play-services-wallet:11.0.1'
+    compile 'com.google.android.gms:play-services-wearable:11.0.1'
+    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'
+    compile 'com.android.support:support-v13:25.3.1'
+    compile 'com.android.support:palette-v7:25.3.1'
+    compile 'net.hockeyapp.android:HockeySDK:4.1.3'
     compile 'com.googlecode.mp4parser:isoparser:1.0.6'
     compile 'com.stripe:stripe-android:2.0.2'
 }
@@ -88,7 +90,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 957
+    defaultConfig.versionCode = 1030
 
     sourceSets.debug {
         manifest.srcFile 'config/debug/AndroidManifest.xml'
@@ -160,7 +162,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionName "3.18.0"
+        versionName "4.1.1"
 
         externalNativeBuild {
             ndkBuild {

diff --git a/TMessagesProj/config/debug/AndroidManifest.xml b/TMessagesProj/config/debug/AndroidManifest.xml
@@ -22,6 +22,7 @@
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/AppNameBeta"
         android:theme="@style/Theme.TMessages.Start"
         android:name=".ApplicationLoader"

diff --git a/TMessagesProj/config/debug/AndroidManifest_SDK23.xml b/TMessagesProj/config/debug/AndroidManifest_SDK23.xml
@@ -25,6 +25,7 @@
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/AppNameBeta"
         android:theme="@style/Theme.TMessages.Start"
         android:name=".ApplicationLoader"

diff --git a/TMessagesProj/config/foss/AndroidManifest.xml b/TMessagesProj/config/foss/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/AppName"
         android:theme="@style/Theme.TMessages.Start"
         android:name=".ApplicationLoader"

diff --git a/TMessagesProj/config/release/AndroidManifest.xml b/TMessagesProj/config/release/AndroidManifest.xml
@@ -22,6 +22,7 @@
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/AppName"
         android:theme="@style/Theme.TMessages.Start"
         android:name=".ApplicationLoader"

diff --git a/TMessagesProj/config/release/AndroidManifest_SDK23.xml b/TMessagesProj/config/release/AndroidManifest_SDK23.xml
@@ -25,6 +25,7 @@
     <application
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/AppName"
         android:theme="@style/Theme.TMessages.Start"
         android:name=".ApplicationLoader"

diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk
@@ -108,17 +108,9 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := WebRtcAec
-
-LOCAL_SRC_FILES := ./libtgvoip/external/libWebRtcAec_android_$(TARGET_ARCH_ABI).a
-
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
 LOCAL_MODULE := voip
-LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -finline-functions -ffast-math -Os -fno-strict-aliasing -O3
-LOCAL_CFLAGS := -O3 -DUSE_KISS_FFT -fexceptions
+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
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 #    LOCAL_CPPFLAGS += -mfloat-abi=softfp -mfpu=neon
@@ -138,7 +130,7 @@ endif
 
 MY_DIR := libtgvoip
 
-LOCAL_C_INCLUDES := jni/opus/include jni/boringssl/include/
+LOCAL_C_INCLUDES := jni/opus/include jni/boringssl/include/ jni/libtgvoip/webrtc_dsp/
 
 LOCAL_SRC_FILES := \
 ./libtgvoip/logging.cpp \
@@ -160,7 +152,113 @@ LOCAL_SRC_FILES := \
 ./libtgvoip/os/android/AudioOutputAndroid.cpp \
 ./libtgvoip/EchoCanceller.cpp \
 ./libtgvoip/CongestionControl.cpp \
-./libtgvoip/VoIPServerConfig.cpp
+./libtgvoip/VoIPServerConfig.cpp \
+./libtgvoip/audio/Resampler.cpp \
+./libtgvoip/NetworkSocket.cpp \
+./libtgvoip/os/posix/NetworkSocketPosix.cpp
+
+# WebRTC signal processing
+
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/ring_buffer.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/auto_corr_to_refl_coef.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/auto_correlation.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/complex_bit_reverse.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/complex_fft.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/copy_set_operations.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/cross_correlation.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/division_operations.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/dot_product_with_scale.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/downsample_fast.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/energy.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/filter_ar.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/filter_ma_fast_q12.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/get_hanning_window.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/get_scaling_square.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/ilbc_specific_functions.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/levinson_durbin.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/lpc_to_refl_coef.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/min_max_operations.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/randomization_functions.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/real_fft.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/refl_coef_to_lpc.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/resample.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/resample_48khz.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/resample_by_2.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/resample_by_2_internal.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/resample_fractional.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/spl_inl.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/spl_sqrt.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/spl_sqrt_floor.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/splitting_filter_impl.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/vector_scaling_operations.c
+
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/base/checks.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aecm/aecm_core.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aecm/aecm_core_c.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aecm/echo_control_mobile.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/utility/delay_estimator.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/three_band_filter_bank.cc \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/splitting_filter.cc \
+./libtgvoip/webrtc_dsp/webrtc/system_wrappers/source/cpu_features.cc \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/sparse_fir_filter.cc \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/channel_buffer.cc \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/audio_util.cc
+
+#LOCAL_SRC_FILES += \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/utility/block_mean_calculator.cc \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/utility/ooura_fft.cc \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/logging/apm_data_dumper.cc \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aec/aec_core.cc \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aec/aec_resampler.cc \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aec/echo_cancellation.cc \
+#./libtgvoip/webrtc_dsp/webrtc/common_audio/wav_header.cc \
+#./libtgvoip/webrtc_dsp/webrtc/common_audio/wav_file.cc \
+#./libtgvoip/webrtc_dsp/webrtc/base/stringutils.cc
+
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/ns/noise_suppression_x.c \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/ns/noise_suppression.c \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/ns/ns_core.c \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/ns/nsx_core_c.c \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/ns/nsx_core.c \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/fft4g.c
+
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/agc/legacy/analog_agc.c \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/agc/legacy/digital_agc.c
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aecm/aecm_core_neon.cc.neon \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/min_max_operations_neon.c.neon \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/downsample_fast_neon.c.neon \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/cross_correlation_neon.c.neon \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S.neon
+#LOCAL_SRC_FILES += \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aec/aec_core_neon.cc.neon
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/utility/ooura_fft_neon.cc.neon
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/ns/nsx_core_neon.c.neon
+#LOCAL_ARM_NEON := true
+endif
+
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+LOCAL_SRC_FILES += \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S \
+./libtgvoip/webrtc_dsp/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S
+endif
+
+#ifeq ($(TARGET_ARCH_ABI),x86)
+#LOCAL_SRC_FILES += \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/aec/aec_core_sse2.cc \
+#./libtgvoip/webrtc_dsp/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
+#endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -295,13 +393,13 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_MODULE 	:= tmessages.26
+LOCAL_MODULE 	:= tmessages.27
 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
 LOCAL_CPPFLAGS 	:= -DBSD=1 -ffast-math -Os -funroll-loops -std=c++11
-LOCAL_LDLIBS 	:= -ljnigraphics -llog -lz -latomic -lOpenSLES
-LOCAL_STATIC_LIBRARIES := webp sqlite tgnet breakpad avformat avcodec avutil voip WebRtcAec
+LOCAL_LDLIBS 	:= -ljnigraphics -llog -lz -latomic -lOpenSLES -lEGL -lGLESv2
+LOCAL_STATIC_LIBRARIES := webp sqlite tgnet breakpad avformat avcodec avutil voip
 
 LOCAL_SRC_FILES     := \
 ./opus/src/opus.c \