Merge remote-tracking branch 'official/master' into dev

TMessagesProj/build.gradle

@@ -14,12 +14,12 @@ repositories {
     }
 }
 
-def verName = "10.14.5"
-def verCode = 1188
+def verName = "11.0.0"
+def verCode = 1190
 
 
-def officialVer = "10.14.5"
-def officialCode = 4945
+def officialVer = "11.0.0"
+def officialCode = 5143
 
 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
 
@@ -292,7 +292,6 @@ dependencies {
     implementation "com.jakewharton:process-phoenix:2.1.2"
     implementation 'com.google.guava:guava:31.1-android'
 
-    implementation 'com.airbnb.android:lottie:6.4.0'
     implementation 'com.google.android.play:integrity:1.3.0'
 
     implementation 'com.google.android.gms:play-services-mlkit-subject-segmentation:16.0.0-beta1'
@@ -314,7 +313,7 @@ dependencies {
     implementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
 //    implementation "com.google.android.play:core:$playCoreVersion"
 
-    implementation 'com.android.billingclient:billing:5.1.0'
+    implementation 'com.android.billingclient:billing:6.0.1'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "androidx.test:core:1.5.0"

TMessagesProj/jni/CMakeLists.txt

@@ -277,6 +277,7 @@ elseif (${ANDROID_ABI} STREQUAL "arm64-v8a")
             rlottie/src/vector/pixman/pixman-arma64-neon-asm.S)
 endif ()
 
+
 #flac
 add_library(flac STATIC
         exoplayer/libFLAC/bitmath.c
@@ -506,7 +507,8 @@ add_library(${NATIVE_LIB} SHARED
         exoplayer/ffmpeg_jni.cc
         fast-edge.cpp
         genann.c
-        secureid_ocr.cpp)
+        secureid_ocr.cpp
+)
 
 target_compile_options(${NATIVE_LIB} PUBLIC
         -ffast-math -Os -funroll-loops -ffast-math -fno-strict-aliasing -fno-math-errno)

TMessagesProj/jni/tgnet/ApiScheme.cpp

@@ -528,6 +528,9 @@ void TL_user::readParams(NativeByteBuffer *stream, int32_t instanceNum, bool &er
         profile_color_color = stream->readInt32(&error);
         profile_color_background_emoji_id = stream->readInt64(&error);
     }
+    if ((flags2 & 4096) != 0) {
+        bot_active_users = stream->readInt32(&error);
+    }
 }
 
 void TL_user::serializeToStream(NativeByteBuffer *stream) {
@@ -605,6 +608,9 @@ void TL_user::serializeToStream(NativeByteBuffer *stream) {
         stream->writeInt32(profile_color_color);
         stream->writeInt32(profile_color_background_emoji_id);
     }
+    if ((flags2 & 4096) != 0) {
+        stream->writeInt32(bot_active_users);
+    }
 }
 
 InputPeer *InputPeer::TLdeserialize(NativeByteBuffer *stream, uint32_t constructor, int32_t instanceNum, bool &error) {

TMessagesProj/jni/tgnet/ApiScheme.h

@@ -388,6 +388,7 @@ class User : public TLObject {
     int64_t color_background_emoji_id;
     int32_t profile_color_color;
     int64_t profile_color_background_emoji_id;
+    int32_t bot_active_users;
 
     static User *TLdeserialize(NativeByteBuffer *stream, uint32_t constructor, int32_t instanceNum, bool &error);
 };
@@ -404,7 +405,7 @@ class TL_userEmpty : public User {
 class TL_user : public User {
 
 public:
-    static const uint32_t constructor = 0x215c4438;
+    static const uint32_t constructor = 0x83314fca;
 
     void readParams(NativeByteBuffer *stream, int32_t instanceNum, bool &error);
     void serializeToStream(NativeByteBuffer *stream);

TMessagesProj/src/main/AndroidManifest.xml

@@ -140,7 +140,10 @@
         android:hasFragileUserData="true"
         android:preserveLegacyExternalStorage="true"
         android:allowAudioPlaybackCapture="true"
-        tools:replace="android:supportsRtl">
+        tools:replace="android:supportsRtl"
+        android:usesCleartextTraffic="true"
+    >
+        <!-- usesCleartextTraffic for browser supporting opening http:// links -->
 
         <meta-data android:name="io.sentry.auto-init" android:value="false" />
 
@@ -389,6 +392,12 @@
                 <data android:host="t.me" android:scheme="http" />
                 <data android:host="t.me" android:scheme="https" />
             </intent-filter>
+            <intent-filter android:icon="@mipmap/ic_launcher_nagram" android:roundIcon="@mipmap/ic_launcher_nagram_round" android:priority="1">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tonsite" />
+            </intent-filter>
             <intent-filter android:icon="@mipmap/ic_launcher_nagram" android:roundIcon="@mipmap/ic_launcher_nagram_round" android:priority="1">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />

TMessagesProj/src/main/assets/darkblue.attheme

@@ -441,5 +441,8 @@ code_string=-7806088
 code_operator=2147483647
 code_number=-10887465
 code_comment=2147483647
+iv_background=-16777216
+iv_backgroundGray=-14737633
+iv_navigationBackground=-16777216
 table_background=177390847
 table_border=436207615

TMessagesProj/src/main/assets/night.attheme

@@ -466,5 +466,8 @@ code_string=-7806088
 code_operator=2147483647
 code_number=-10887465
 code_comment=2147483647
+iv_background=-16777216
+iv_backgroundGray=-14737633
+iv_navigationBackground=-16777216
 table_background=177390847
 table_border=436207615

TMessagesProj/src/main/assets/shaders/fragment4.glsl

@@ -6,6 +6,7 @@ uniform sampler2D u_BackgroundTexture;
 uniform float f_xOffset;
 uniform float f_alpha;
 uniform mat4 world;
+uniform float white;
 
 varying vec3 vNormal;
 varying vec2 vUV;
@@ -89,5 +90,5 @@ void main() {
         clamp(flecksSpec * abs(vNormal.z) * (flecksNormal.z), 0.2, 0.3) - .2
     );
 
-    gl_FragColor = color * f_alpha;
+    gl_FragColor = mix(color * f_alpha, vec4(1.0), white);
 }