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

LiuYi0526 · May 4, 2024 · 7621379 · 7621379
2 parents 69811d4 + 1289ec6
commit 7621379
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1 deletion.
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java b/TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java
@@ -53,6 +53,8 @@
 import java.util.List;
 import java.util.regex.Matcher;
 
+import xyz.nextalone.nagram.NaConfig;
+
 public class Browser {
 
     private static WeakReference<CustomTabsSession> customTabsCurrentSession;
@@ -322,7 +324,7 @@ public static void openUrl(final Context context, Uri uri, final boolean allowCu
                 }
             }
             String host = AndroidUtilities.getHostAuthority(uri.toString().toLowerCase());
-            if (AccountInstance.getInstance(currentAccount).getMessagesController().autologinDomains.contains(host)) {
+            if (AccountInstance.getInstance(currentAccount).getMessagesController().autologinDomains.contains(host) && !NaConfig.INSTANCE.getDisableAutoWebLogin().Bool()) {
                 String token = "autologin_token=" + URLEncoder.encode(AccountInstance.getInstance(UserConfig.selectedAccount).getMessagesController().autologinToken, "UTF-8");
                 String url = uri.toString();
                 int idx = url.indexOf("://");

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
@@ -6289,6 +6289,7 @@ public static void createDeleteMessagesAlert(BaseFragment fragment, TLRPC.User u
                 FrameLayout frameLayout = new FrameLayout(activity);
                 CheckBoxCell cell = new CheckBoxCell(activity, 1, resourcesProvider);
                 cell.setBackgroundDrawable(Theme.getSelectorDrawable(false));
+                deleteForAll[0] = true;
                 if (canDeleteInbox) {
                     cell.setText(LocaleController.formatString("DeleteMessagesOptionAlso", R.string.DeleteMessagesOptionAlso, UserObject.getFirstName(user)), "", true, false);
                 } else if (chat != null && (hasNotOut || myMessagesCount == count)) {

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
@@ -213,6 +213,7 @@ public class NekoGeneralSettingsActivity extends BaseNekoXSettingsActivity {
     private final AbstractConfigCell disableSystemAccountRow = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableSystemAccount));
     private final AbstractConfigCell doNotShareMyPhoneNumberRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDoNotShareMyPhoneNumber()));
     private final AbstractConfigCell disableSuggestionViewRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableSuggestionView()));
+    private final AbstractConfigCell disableAutoWebLoginRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableAutoWebLogin()));
     private final AbstractConfigCell divider6 = cellGroup.appendCell(new ConfigCellDivider());
 
     private final AbstractConfigCell header7 = cellGroup.appendCell(new ConfigCellHeader(LocaleController.getString("General")));

diff --git a/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt b/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt
@@ -584,6 +584,12 @@ object NaConfig {
             ConfigItem.configTypeBool,
             false
         )
+    val disableAutoWebLogin =
+        addConfig(
+            "DisableAutoWebLogin",
+            ConfigItem.configTypeBool,
+            false
+        )
 
     private fun addConfig(
         k: String,

diff --git a/TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml b/TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
@@ -140,4 +140,5 @@
     <string name="DisableChannelMuteButton">禁用频道聊天页面的静音按钮</string>
     <string name="DisablePreviewVideoSoundShortcut">禁用预览视频音量快捷键</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">禁用音量键快捷开启预览视频的声音</string>
+    <string name="DisableAutoWebLogin">禁用官方网页自动登录</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values/strings_na.xml b/TMessagesProj/src/main/res/values/strings_na.xml
@@ -140,4 +140,5 @@
     <string name="DisableChannelMuteButton">Disable channel mute button</string>
     <string name="DisablePreviewVideoSoundShortcut">Disable preview video sound shortcut</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Disable volume keys to enable preview video sound</string>
+    <string name="DisableAutoWebLogin">Disable auto web login</string>
 </resources>