Merge remote-tracking branch 'upstream/dev' into dev

LiuYi0526 · Mar 30, 2024 · 3ac7c88 · 3ac7c88
2 parents 2e876e1 + 1ed37c2
commit 3ac7c88
Show file tree

Hide file tree

Showing 29 changed files with 42 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ local.properties
 obj/
 service_account_credentials.json
 __pycache__/
+release/
+
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -77,7 +77,6 @@ if (nativeTarget == null) nativeTarget = ""
 
 android {
     compileSdkVersion 33
-    buildToolsVersion "33.0.0"
     ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig.applicationId = "xyz.nextalone.nagram"
@@ -364,11 +363,16 @@ android {
         }
 
         def lib = "libtmessages.*.so"
+        pickFirst "lib/armeabi-v7a/$lib"
+        pickFirst "lib/arm64-v8a/$lib"
     }
     namespace "org.telegram.messenger"
     lint {
         disable 'MissingTranslation', 'ExtraTranslation', 'BlockedPrivateApi'
     }
+    buildFeatures {
+        buildConfig true
+    }
 
     tasks.configureEach { task ->
         if (task.name.startsWith("uploadCrashlyticsMappingFile")) {

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/MemberRequestCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/MemberRequestCell.java
@@ -91,7 +91,7 @@ public MemberRequestCell(@NonNull Context context, OnClickListener clickListener
 
         float dismissButtonWidth = dismissButton.getPaint().measureText(dismissButton.getText().toString()) + btnPadding * 2;
         TextView banButton = new TextView(getContext());
-        banButton.setBackground(Theme.AdaptiveRipple.filledRect(Theme.key_featuredStickers_addButton, 4));
+        banButton.setBackground(Theme.AdaptiveRipple.filledRectByKey(Theme.key_featuredStickers_addButton, 4));
         banButton.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
         banButton.setMaxLines(1);
         banButton.setPadding(btnPadding, 0, btnPadding, 0);

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -2586,6 +2586,9 @@ public boolean onFragmentCreate() {
 
         getNotificationCenter().addPostponeNotificationsCallback(postponeNotificationsWhileLoadingCallback);
 
+        // na: unread count
+        getNotificationCenter().addObserver(this, NotificationCenter.dialogsUnreadCounterChanged);
+
         if (chatMode != MODE_SCHEDULED) {
             if (threadMessageId == 0) {
                 getNotificationCenter().addObserver(this, NotificationCenter.screenshotTook);
@@ -2983,6 +2986,10 @@ public void onFragmentDestroy() {
             AndroidUtilities.cancelRunOnUIThread(chatInviteRunnable);
             chatInviteRunnable = null;
         }
+
+        // na: unread count
+        getNotificationCenter().removeObserver(this, NotificationCenter.dialogsUnreadCounterChanged);
+
         getNotificationCenter().removePostponeNotificationsCallback(postponeNotificationsWhileLoadingCallback);
         getMessagesController().setLastCreatedDialogId(dialog_id, chatMode == MODE_SCHEDULED, false);
         getNotificationCenter().removeObserver(this, NotificationCenter.messagesDidLoad);
@@ -33391,6 +33398,10 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
                                 });
                     }
                 }
+                // na: unread count
+                if (actionBar != null) {
+                    actionBar.unreadBadgeSetCount(getMessagesStorage().getMainUnreadCount());
+                }
             }
 
             int position = holder.getAdapterPosition();

diff --git a/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml b/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">دفع موحد</string>
     <string name="PushServiceTypeInAppDialog">إظهار الإشعارات المقيمة</string>
     <string name="PushServiceTypeUnifiedGateway">بوابة دفع موحدة</string>
+    <string name="SendMp4DocumentAsVideo">إرسال مستند mp4 كفيديو</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml b/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Sjednocený posun</string>
     <string name="PushServiceTypeInAppDialog">Zobrazit rezidentní oznámení</string>
     <string name="PushServiceTypeUnifiedGateway">Sjednocená posuvná brána</string>
+    <string name="SendMp4DocumentAsVideo">Poslat dokument mp4 jako video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml b/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Unified Push</string>
     <string name="PushServiceTypeInAppDialog">Vis residente notifikationer</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Send mp4-dokument som video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml b/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Einheitlicher Push</string>
     <string name="PushServiceTypeInAppDialog">Resident-Benachrichtigungen anzeigen</string>
     <string name="PushServiceTypeUnifiedGateway">Einheitliches Push-Gateway</string>
+    <string name="SendMp4DocumentAsVideo">mp4 Dokument als Video senden</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml b/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Ενοποιημένη Προώθηση</string>
     <string name="PushServiceTypeInAppDialog">Εμφάνιση ειδοποιήσεων κατοίκων</string>
     <string name="PushServiceTypeUnifiedGateway">Ενοποιημένη Πύλη Ώθησης</string>
+    <string name="SendMp4DocumentAsVideo">Αποστολή εγγράφου mp4 ως βίντεο</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-es-rES/strings_na.xml b/TMessagesProj/src/main/res/values-es-rES/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Unified Push</string>
     <string name="PushServiceTypeInAppDialog">Mostrar notificación permanente</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway de Unified Push</string>
+    <string name="SendMp4DocumentAsVideo">Enviar documento mp4 como vídeo</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml b/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Yhdistetty Työntö</string>
     <string name="PushServiceTypeInAppDialog">Näytä kotimaiset ilmoitukset</string>
     <string name="PushServiceTypeUnifiedGateway">Yhdistetty Push-Yhdyskäytävä</string>
+    <string name="SendMp4DocumentAsVideo">Lähetä mp4-asiakirja videona</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml b/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Push unifié</string>
     <string name="PushServiceTypeInAppDialog">Afficher les notifications des résidents</string>
     <string name="PushServiceTypeUnifiedGateway">Passerelle Push unifiée</string>
+    <string name="SendMp4DocumentAsVideo">Envoyer le document mp4 en tant que vidéo</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml b/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Push Unificato</string>
     <string name="PushServiceTypeInAppDialog">Mostra notifiche residenti</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Invia il documento mp4 come video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml b/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">統一されたプッシュ</string>
     <string name="PushServiceTypeInAppDialog">常駐通知を表示</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">mp4ドキュメントを動画として送信</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml b/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Gecombineerde Push</string>
     <string name="PushServiceTypeInAppDialog">Toon inactieve meldingen</string>
     <string name="PushServiceTypeUnifiedGateway">Gecombineerde Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Stuur mp4-document als video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml b/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Felles Push</string>
     <string name="PushServiceTypeInAppDialog">Vis varsling fra kunder</string>
     <string name="PushServiceTypeUnifiedGateway">Enhetlig Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Send mp4-dokument som video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml b/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Jednolite Push</string>
     <string name="PushServiceTypeInAppDialog">Pokaż powiadomienia mieszkańców</string>
     <string name="PushServiceTypeUnifiedGateway">Zunifikowana brama popychająca</string>
+    <string name="SendMp4DocumentAsVideo">Wyślij dokument mp4 jako film</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Envio Unificado</string>
     <string name="PushServiceTypeInAppDialog">Mostrar notificações residentes</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway Unificado</string>
+    <string name="SendMp4DocumentAsVideo">Enviar documento mp4 como vídeo</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Envio Unificado</string>
     <string name="PushServiceTypeInAppDialog">Mostrar notificações residentes</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway Unificado</string>
+    <string name="SendMp4DocumentAsVideo">Enviar documento mp4 como vídeo</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml b/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Push unificat</string>
     <string name="PushServiceTypeInAppDialog">Arată notificările rezidenților</string>
     <string name="PushServiceTypeUnifiedGateway">Gateway Push Unificat</string>
+    <string name="SendMp4DocumentAsVideo">Trimite documentul mp4 ca video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml b/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Единый толчок</string>
     <string name="PushServiceTypeInAppDialog">Показывать уведомления жителя</string>
     <string name="PushServiceTypeUnifiedGateway">Единый Push шлюз</string>
+    <string name="SendMp4DocumentAsVideo">Отправить mp4 документ как видео</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml b/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Enhetlig Push</string>
     <string name="PushServiceTypeInAppDialog">Visa inhemska aviseringar</string>
     <string name="PushServiceTypeUnifiedGateway">Enhetlig Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Skicka mp4-dokument som video</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml b/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml
@@ -132,4 +132,5 @@
     <string name="PushServiceTypeUnified">Одноразове штовхання</string>
     <string name="PushServiceTypeInAppDialog">Показувати сповіщення резидента</string>
     <string name="PushServiceTypeUnifiedGateway">Уніфікований Push-шлюз</string>
+    <string name="SendMp4DocumentAsVideo">Відправити mp4 документ як відео</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml b/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml
@@ -133,4 +133,5 @@
     <string name="PushServiceTypeUnified">Unified Push</string>
     <string name="PushServiceTypeInAppDialog">Show resident notifications</string>
     <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Send mp4 document as video</string>
 </resources>
diff --git a/bin/libs/native.sh b/bin/libs/native.sh
@@ -2,7 +2,7 @@
 
 source "bin/init/env.sh"
 
-OUT=TMessagesProj/build/intermediates/stripped_native_libs/release/out/lib
+OUT=TMessagesProj/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib
 DIR=TMessagesProj/src/main/libs
 
 export COMPILE_NATIVE=1

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.3.0'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'

diff --git a/gradle.properties b/gradle.properties
@@ -22,6 +22,5 @@ org.gradle.configureondemand=false
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8.fullMode=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 17 16:55:16 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/openpgp-api/build.gradle b/openpgp-api/build.gradle
@@ -9,7 +9,6 @@ android {
         targetSdkVersion 33
     }
 
-    buildToolsVersion '33.0.0'
     lint {
         abortOnError false
     }