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

LiuYi0526 · May 5, 2024 · 3663986 · 3663986
2 parents d494c8e + 452db1b
commit 3663986
Show file tree

Hide file tree

Showing 33 changed files with 265 additions and 3 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -11,7 +11,7 @@ repositories {
 }
 
 def verName = "10.12.0"
-def verCode = 1171
+def verCode = 1172
 
 
 def officialVer = "10.12.0"

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
@@ -19215,6 +19215,10 @@ public void markReactionsAsRead(long dialogId, long topicId) {
     }
 
     public SponsoredMessagesInfo getSponsoredMessages(long dialogId) {
+        // na: disable ad
+        if (true) {
+            return null;
+        }
         SponsoredMessagesInfo info = sponsoredMessages.get(dialogId);
         if (info != null && (info.loading || Math.abs(SystemClock.elapsedRealtime() - info.loadTime) <= 5 * 60 * 1000)) {
             return info;

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java
@@ -8839,7 +8839,7 @@ public static void createChatResources(Context context, boolean fontsOnly) {
                 chat_psaHelpDrawable[a] = resources.getDrawable(R.drawable.msg_psa).mutate();
             }
 
-            chat_editDrawable = resources.getDrawable(R.drawable.msg_edit).mutate();
+            chat_editDrawable = resources.getDrawable(R.drawable.edit_pencil).mutate();
 
             chat_timeHintSentDrawable = resources.getDrawable(R.drawable.msg_check_s).mutate();
             chat_timeHintForwardDrawable = resources.getDrawable(R.drawable.mini_forwarded).mutate();

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -10265,6 +10265,31 @@ protected void didSendPressed() {
                 dismiss(true);
                 chatActivityEnterView.getSendButton().callOnClick();
             }
+
+            @Override
+            protected void sendWebpageMedia(boolean notify, int scheduleDate) {
+                if (checkSlowModeAlert()) {
+                    SendMessagesHelper.SendMessageParams params;
+                    if (messagePreviewParams.webpage.document != null) {
+                        params = SendMessagesHelper.SendMessageParams.of((TLRPC.TL_document) messagePreviewParams.webpage.document, null, null, dialog_id, replyingMessageObject, getThreadMessage(), null, null, null, null, notify, scheduleDate, 0, messagePreviewParams.webpage, null, false);
+                    } else {
+                        params = SendMessagesHelper.SendMessageParams.of((TLRPC.TL_photo) messagePreviewParams.webpage.photo, null, dialog_id, replyingMessageObject, getThreadMessage(), null, null, null, null, notify, scheduleDate, 0, messagePreviewParams.webpage, false);
+                    }
+                    params.quick_reply_shortcut = quickReplyShortcut;
+                    params.quick_reply_shortcut_id = getQuickReplyId();
+                    getSendMessagesHelper().sendMessage(params);
+                    dismiss(true);
+                    if (threadMessageId == 0 || isTopic) {
+                        if (isTopic) {
+                            replyingMessageObject = threadMessageObject;
+                        } else {
+                            replyingMessageObject = null;
+                        }
+                        replyingQuote = null;
+                        chatActivityEnterView.setReplyingMessageObject(null, null);
+                    }
+                }
+            }
         };
         messagePreviewParams.attach(forwardingPreviewView);
         TLRPC.Peer defPeer = chatInfo != null ? chatInfo.default_send_as : null;
@@ -32986,7 +33011,7 @@ public void end(boolean replaced) {
     private void processExternalUrl(int type, String url, CharacterStyle span, ChatMessageCell cell, boolean forceAlert) {
         try {
             String host = AndroidUtilities.getHostAuthority(url);
-            if ((currentEncryptedChat == null || getMessagesController().secretWebpagePreview == 1) && getMessagesController().authDomains.contains(host)) {
+            if ((currentEncryptedChat == null || getMessagesController().secretWebpagePreview == 1) && getMessagesController().authDomains.contains(host) && !NaConfig.INSTANCE.getDisableAutoWebLogin().Bool()) {
                 getSendMessagesHelper().requestUrlAuth(url, this, type == 0 || type == 2);
                 return;
             }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/MessagePreviewView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/MessagePreviewView.java
@@ -1081,6 +1081,20 @@ public void updateBackground() {
                 applyChanges.setOnClickListener(v -> dismiss(true));
                 menu.addView(applyChanges, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48));
 
+                ActionBarMenuSubItem sendMessagesView = new ActionBarMenuSubItem(context, false, false, resourcesProvider);
+                sendMessagesView.setTextAndIcon(LocaleController.getString(messagePreviewParams.webpage.document != null ? messagePreviewParams.isVideo ? R.string.PreviewSendVideo : R.string.PreviewSendFile : R.string.PreviewSendPhoto), R.drawable.msg_send);
+                menu.addView(sendMessagesView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48));
+                sendMessagesView.setOnClickListener(v -> {
+                    if (chatActivity.isInScheduleMode()) {
+                        AlertsCreator.createScheduleDatePickerDialog(
+                                chatActivity.getParentActivity(),
+                                chatActivity.getDialogId(),
+                                MessagePreviewView.this::sendWebpageMedia);
+                    } else {
+                        sendWebpageMedia(true, 0);
+                    }
+                });
+
                 ActionBarMenuSubItem deleteLink = new ActionBarMenuSubItem(context, true, false, true, resourcesProvider);
                 deleteLink.setTextAndIcon(LocaleController.getString(R.string.DoNotLinkPreview), R.drawable.msg_delete);
                 deleteLink.setColors(getThemedColor(Theme.key_text_RedBold), getThemedColor(Theme.key_text_RedRegular));
@@ -1921,6 +1935,10 @@ protected void didSendPressed() {
 
     }
 
+    protected void sendWebpageMedia(boolean notify, int scheduleDate) {
+
+    }
+
     private static class TabsView extends View {
         private static class Tab {
             final int id;

diff --git a/TMessagesProj/src/main/res/drawable-hdpi/edit_pencil.png b/TMessagesProj/src/main/res/drawable-hdpi/edit_pencil.png
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/edit_pencil.png b/TMessagesProj/src/main/res/drawable-mdpi/edit_pencil.png
diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/edit_pencil.png b/TMessagesProj/src/main/res/drawable-xhdpi/edit_pencil.png
diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/edit_pencil.png b/TMessagesProj/src/main/res/drawable-xxhdpi/edit_pencil.png
diff --git a/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml b/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">تعطيل إختصار صوت معاينة الفيديو</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">تعطيل مفاتيح الصوت لتمكين معاينة صوت الفيديو</string>
     <string name="DisableAutoWebLogin">تعطيل تسجيل الدخول التلقائي</string>
+    <string name="PreviewSendPhoto">إرسال صورة</string>
+    <string name="PreviewSendVideo">إرسال فيديو</string>
+    <string name="PreviewSendFile">إرسال ملف</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Zakázat zástupce zvuku videa</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Zakázat tlačítka hlasitosti pro zapnutí náhledu zvuku videa</string>
     <string name="DisableAutoWebLogin">Zakázat automatické přihlášení k webu</string>
+    <string name="PreviewSendPhoto">Odeslat fotku</string>
+    <string name="PreviewSendVideo">Poslat video</string>
+    <string name="PreviewSendFile">Odeslat soubor</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Deaktivér forhåndsvisning af videolyd genvej</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Deaktivér lydstyrkeknapper for at aktivere forhåndsvisning af videolyd</string>
     <string name="DisableAutoWebLogin">Deaktivér auto weblogin</string>
+    <string name="PreviewSendPhoto">Send Foto</string>
+    <string name="PreviewSendVideo">Send Video</string>
+    <string name="PreviewSendFile">Send Fil</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Vorschau Video Ton Verknüpfung deaktivieren</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Lautstärketasten deaktivieren, um Videovorschau zu aktivieren</string>
     <string name="DisableAutoWebLogin">Auto-Web-Login deaktivieren</string>
+    <string name="PreviewSendPhoto">Foto senden</string>
+    <string name="PreviewSendVideo">Video senden</string>
+    <string name="PreviewSendFile">Datei 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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Απενεργοποίηση συντόμευσης ήχου βίντεο προεπισκόπησης</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Απενεργοποίηση πλήκτρων έντασης για ενεργοποίηση προεπισκόπησης ήχου βίντεο</string>
     <string name="DisableAutoWebLogin">Απενεργοποίηση αυτόματης σύνδεσης στον ιστό</string>
+    <string name="PreviewSendPhoto">Αποστολή Φωτογραφίας</string>
+    <string name="PreviewSendVideo">Αποστολή Βίντεο</string>
+    <string name="PreviewSendFile">Αποστολή Αρχείου</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Desactivar acceso directo al sonido de un video</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Desactivar las teclas de volumen para reproducir el sonido de la vista previa del video</string>
     <string name="DisableAutoWebLogin">Desactivar inicio de sesión web automático</string>
+    <string name="PreviewSendPhoto">Enviar foto</string>
+    <string name="PreviewSendVideo">Enviar vídeo</string>
+    <string name="PreviewSendFile">Enviar archivo</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Poista esikatseluvideon pikakuvake käytöstä</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Poista äänenvoimakkuusnäppäimet käytöstä, jos haluat ottaa esikatsella videon ääntä</string>
     <string name="DisableAutoWebLogin">Poista automaattinen web kirjautuminen käytöstä</string>
+    <string name="PreviewSendPhoto">Lähetä Kuva</string>
+    <string name="PreviewSendVideo">Lähetä Video</string>
+    <string name="PreviewSendFile">Lähetä Tiedosto</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Désactiver le raccourci de l\'aperçu du son vidéo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Désactiver les boutons de volume pour activer la prévisualisation du son vidéo</string>
     <string name="DisableAutoWebLogin">Désactiver la connexion web automatique</string>
+    <string name="PreviewSendPhoto">Envoyer une photo</string>
+    <string name="PreviewSendVideo">Envoyer la vidéo</string>
+    <string name="PreviewSendFile">Envoyer un fichier</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Disabilita la scorciatoia audio anteprima video</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Disabilita i tasti volume per abilitare l\'anteprima del suono video</string>
     <string name="DisableAutoWebLogin">Disabilita il login automatico</string>
+    <string name="PreviewSendPhoto">Invia Foto</string>
+    <string name="PreviewSendVideo">Invia Video</string>
+    <string name="PreviewSendFile">Invia File</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">プレビュービデオサウンドのショートカットを無効にする</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">ビデオのプレビューを有効にするには音量キーを無効にしてください</string>
     <string name="DisableAutoWebLogin">自動ウェブログインを無効にする</string>
+    <string name="PreviewSendPhoto">写真を送信</string>
+    <string name="PreviewSendVideo">動画を送信</string>
+    <string name="PreviewSendFile">ファイルを送信</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Snelkoppeling voor preview video uitschakelen</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Volumeknoppen uitschakelen om preview videogeluid in te schakelen</string>
     <string name="DisableAutoWebLogin">Automatisch web inloggen uitschakelen</string>
+    <string name="PreviewSendPhoto">Foto verzenden</string>
+    <string name="PreviewSendVideo">Video verzenden</string>
+    <string name="PreviewSendFile">Bestand verzenden</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Deaktivere forhåndsvise video lyd snarvei</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Deaktiver volumtastene for å aktivere forhåndsvisningsvideo lyd</string>
     <string name="DisableAutoWebLogin">Deaktiver innlogging med automatisk</string>
+    <string name="PreviewSendPhoto">Send bilde</string>
+    <string name="PreviewSendVideo">Send video</string>
+    <string name="PreviewSendFile">Send fil</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Wyłącz podgląd skrótu dźwięku wideo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Wyłącz przyciski głośności, aby włączyć podgląd dźwięku wideo</string>
     <string name="DisableAutoWebLogin">Wyłącz automatyczne logowanie</string>
+    <string name="PreviewSendPhoto">Wyślij zdjęcie</string>
+    <string name="PreviewSendVideo">Wyślij wideo</string>
+    <string name="PreviewSendFile">Wyślij plik</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Desativar pré-visualização de atalho sonoro de vídeo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Desativar as teclas de volume para habilitar a visualização do som de vídeo</string>
     <string name="DisableAutoWebLogin">Desativar o login via web automático</string>
+    <string name="PreviewSendPhoto">Enviar Foto</string>
+    <string name="PreviewSendVideo">Enviar vídeo</string>
+    <string name="PreviewSendFile">Enviar Arquivo</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Desativar pré-visualização de atalho sonoro de vídeo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Desativar as teclas de volume para habilitar a visualização do som de vídeo</string>
     <string name="DisableAutoWebLogin">Desativar o login via web automático</string>
+    <string name="PreviewSendPhoto">Enviar Foto</string>
+    <string name="PreviewSendVideo">Enviar vídeo</string>
+    <string name="PreviewSendFile">Enviar Arquivo</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Dezactivează scurtătură sunet previzualizare</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Dezactivează tastele de volum pentru a activa previzualizarea sunetului video</string>
     <string name="DisableAutoWebLogin">Dezactivează autentificarea automată pe web</string>
+    <string name="PreviewSendPhoto">Trimite fotografie</string>
+    <string name="PreviewSendVideo">Trimite videoclip</string>
+    <string name="PreviewSendFile">Trimite fișier</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Отключить ярлык предварительного просмотра звука видео</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Отключить кнопки громкости для предварительного просмотра звука видео</string>
     <string name="DisableAutoWebLogin">Отключить автоматический веб-логин</string>
+    <string name="PreviewSendPhoto">Отправить фото</string>
+    <string name="PreviewSendVideo">Отправить видео</string>
+    <string name="PreviewSendFile">Отправить файл</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Inaktivera förhandsgranskning av videoljudgenväg</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Inaktivera volymknappar för att förhandsgranska videoljud</string>
     <string name="DisableAutoWebLogin">Inaktivera automatisk webbinloggning</string>
+    <string name="PreviewSendPhoto">Skicka foto</string>
+    <string name="PreviewSendVideo">Skicka video</string>
+    <string name="PreviewSendFile">Skicka fil</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-tr-rTR/strings_na.xml b/TMessagesProj/src/main/res/values-tr-rTR/strings_na.xml
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Önizleme videosu ses kısayolunu devre dışı bırak</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Önizleme video sesini etkinleştirmek için ses seviyesi tuşlarını devre dışı bırakın</string>
     <string name="DisableAutoWebLogin">Disable auto web login</string>
+    <string name="PreviewSendPhoto">Send Photo</string>
+    <string name="PreviewSendVideo">Send Video</string>
+    <string name="PreviewSendFile">Send File</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
@@ -140,4 +140,7 @@
     <string name="DisablePreviewVideoSoundShortcut">Вимкнути ярлик під час перегляду відео звукового звуку</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Вимкніть клавіші гучності, щоб увімкнути попередній перегляд відео звуку</string>
     <string name="DisableAutoWebLogin">Вимкнути автоматичний веб-логін</string>
+    <string name="PreviewSendPhoto">Надіслати фото</string>
+    <string name="PreviewSendVideo">Надіслати відео</string>
+    <string name="PreviewSendFile">Надіслати файл</string>
 </resources>