From 1ec3c9de1a62f123e40beede2b99d1d541ecb3ec Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Sun, 28 Nov 2021 14:02:57 +0800
Subject: [PATCH] fix

---
 .../org/telegram/messenger/MessagesController.java |  2 --
 .../main/java/org/telegram/ui/ChatActivity.java    |  9 +++++++--
 .../java/tw/nekomimi/nekogram/utils/DnsFactory.kt  | 14 +++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
index f636ea615..758328084 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
@@ -14048,8 +14048,6 @@ public class MessagesController extends BaseController implements NotificationCe
     }
 
     public ArrayList<MessageObject> getSponsoredMessages(long dialogId) {
-        if (NekomuraConfig.hideSponsoredMessage.Bool())
-            return null;
         SponsoredMessagesInfo info = sponsoredMessages.get(dialogId);
         if (info != null && (info.loading || Math.abs(SystemClock.elapsedRealtime() - info.loadTime) <= 5 * 60 * 1000)) {
             return info.messages;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 45373fe4c..b002d4d1f 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -64,6 +64,7 @@ import android.text.TextUtils;
 import android.text.style.CharacterStyle;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.URLSpan;
+import android.util.Log;
 import android.util.Property;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
@@ -20394,7 +20395,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                             } else {
                                 if (!selectedObject.isAnimatedSticker()) {
                                     items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery));
-                                    options.add(nkbtn_savemessage);
+                                    options.add(nkbtn_stickerdl);
                                     icons.add(R.drawable.baseline_image_24);
                                 }
                                 items.add(LocaleController.getString("AddToStickers", R.string.AddToStickers));
@@ -23482,6 +23483,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     }
 
     private void markSponsoredAsRead(MessageObject object) {
+        if (object.isSponsored() && NekomuraConfig.hideSponsoredMessage.Bool()) {
+            ArrayList<Integer> mids = new ArrayList<>();
+            mids.add(object.messageOwner.id);
+            AndroidUtilities.runOnUIThread(() -> NotificationCenter.getInstance(currentAccount).postNotificationName(NotificationCenter.messagesDeleted, mids, -dialog_id, false));
+        }
         if (!object.isSponsored() || object.viewsReloaded) {
             return;
         }
@@ -23490,7 +23496,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         req.channel = MessagesController.getInputChannel(currentChat);
         req.random_id = object.sponsoredId;
         getConnectionsManager().sendRequest(req, (response, error) -> {
-
         });
         getMessagesController().markSponsoredAsRead(dialog_id, object);
     }
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/DnsFactory.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/DnsFactory.kt
index afb21ad80..accfaa69e 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/DnsFactory.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/DnsFactory.kt
@@ -29,7 +29,7 @@ object DnsFactory {
             // behaviour: try all concurrently and stop when the first result returns.
             "https://1.1.1.1/dns-query",
             "https://1.0.0.1/dns-query",
-            "https://8.8.8.8/resolve",
+            "https://8.8.8.8/dns-query",
             "https://101.101.101.101/dns-query",
             "https://9.9.9.9/dns-query",
             "https://185.222.222.222/dns-query",
@@ -133,7 +133,11 @@ object DnsFactory {
                                     it.resume(ret)
                                 }
                             } catch (e: Exception) {
-                                if (e is CustomException) FileLog.e(e)
+                                if (e is CustomException) {
+                                    FileLog.e(e)
+                                } else {
+                                    FileLog.w(e.stackTraceToString())
+                                }
                             }
                             if (counterAll.incrementAndGet() == providers().size && counterGood.get() == 0) {
                                 it.resume(null)
@@ -222,7 +226,11 @@ object DnsFactory {
                                 it.resume(ret)
                             }
                         } catch (e: Exception) {
-                            if (e is CustomException) FileLog.e(e)
+                            if (e is CustomException) {
+                                FileLog.e(e)
+                            } else {
+                                FileLog.w(e.stackTraceToString())
+                            }
                         }
                         if (counterAll.incrementAndGet() == providers().size && counterGood.get() == 0) {
                             //all failed