fix

TeamPGM · Feb 16, 2024 · a3891f6 · a3891f6
1 parent ed9ffa9
commit a3891f6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -181,7 +181,7 @@ jobs:
     strategy:
       matrix:
         flavor:
-          - FullRelease
+#          - FullRelease
           - MiniRelease
     steps:
       - name: Checkout
@@ -266,10 +266,10 @@ jobs:
           # send release via telegram bot api
           export mini64=$(find artifacts -name "*mini-arm64-v8a*")
           export mini32=$(find artifacts -name "*mini-armeabi-v7a*")
-          export full64=$(find artifacts -name "*full-arm64-v8a*")
-          export full32=$(find artifacts -name "*full-armeabi-v7a*")
+          # export full64=$(find artifacts -name "*full-arm64-v8a*")
+          # export full32=$(find artifacts -name "*full-armeabi-v7a*")
           echo $mini64
-          curl --http0.9 http://127.0.0.1:8081/bot${{ secrets.HELPER_BOT_TOKEN }}/sendMediaGroup --form-string chat_id=${{ secrets.HELPER_BOT_TARGET }} --form apk1=@"${mini64}" --form apk2=@"${mini32}" --form apk3=@"${full64}" --form apk4=@"${full32}" --form-string media="[{\"type\": \"document\",\"media\": \"attach://apk1\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk2\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk3\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk4\",\"caption\": \"${{ github.event.head_commit.message }}\",\"parse_mode\": \"Markdown\"}]" --verbose >/dev/null
+          curl --http0.9 http://127.0.0.1:8081/bot${{ secrets.HELPER_BOT_TOKEN }}/sendMediaGroup --form-string chat_id=${{ secrets.HELPER_BOT_TARGET }} --form apk1=@"${mini64}" --form apk2=@"${mini32}" --form-string media="[{\"type\": \"document\",\"media\": \"attach://apk1\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk2\",\"caption\": \"${{ github.event.head_commit.message }}\",\"parse_mode\": \"Markdown\"}]" --verbose >/dev/null
 
           pkill telegram-bot
   telegram-bot-api:

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
@@ -8979,7 +8979,7 @@ private void checkPromoInfoInternal(boolean reset) {
                 TLRPC.TL_help_promoData res = (TLRPC.TL_help_promoData) response;
 
                 SharedConfig.ProxyInfo proxy = SharedConfig.currentProxy;
-                if (res.proxy && (NekoConfig.hideProxySponsorChannel.Bool() || (proxy != null && proxy.subId == 1L))) {
+                if (res.proxy && (NekoConfig.hideProxySponsorChannel.Bool())) {
                     nextPromoInfoCheckTime = getConnectionsManager().getCurrentTime() + 60 * 60;
                     noDialog = true;
                 } else {

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -29560,12 +29560,7 @@ private void processSelectedOption(int option) {
                         AlertUtil.showConfirm(getParentActivity(),
                                 LocaleController.getString("ImportProxyList", R.string.ImportProxyList),
                                 R.drawable.menu_secret, LocaleController.getString("Import", R.string.Import),
-                                false, () -> {
-                                    String status = ProxyListActivity.processProxyListFile(getParentActivity(), finalLocFile1);
-                                    if (!StrUtil.isBlank(status)) {
-                                        presentFragment(new ProxyListActivity(status));
-                                    }
-                                });
+                                false, () -> {});
 
                     } else if (locFile.getName().toLowerCase().endsWith(".nekox-stickers.json")) {
 
@@ -35016,12 +35011,7 @@ public void didPressImage(ChatMessageCell cell, float x, float y) {
                                 AlertUtil.showConfirm(getParentActivity(),
                                         LocaleController.getString("ImportProxyList", R.string.ImportProxyList),
                                         R.drawable.menu_secret, LocaleController.getString("Import", R.string.Import),
-                                        false, () -> {
-                                            String status = ProxyListActivity.processProxyListFile(getParentActivity(), finalLocFile);
-                                            if (!StrUtil.isBlank(status)) {
-                                                presentFragment(new ProxyListActivity(status));
-                                            }
-                                        });
+                                        false, () -> {});
 
                             } else if (message.getDocumentName().toLowerCase().endsWith(".nekox-stickers.json")) {
 

diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
@@ -99,11 +99,6 @@ object ProxyUtil {
         }
     }
 
-    @JvmStatic
-    fun importProxy(ctx: Context, link: String): Boolean {
-
-    }
-
     @JvmStatic
     fun getOwnerActivity(ctx: Context): Activity {