From e3d8d6388e14d8c19d4d737899702bda1c60bf1d Mon Sep 17 00:00:00 2001 From: xtaodada Date: Wed, 8 May 2024 22:54:28 +0800 Subject: [PATCH] fix: check user activated before check bot --- .../main/java/org/telegram/messenger/MediaDataController.java | 4 ++-- .../java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java | 2 +- TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java index 830cb915d7..f0878b9cb4 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java @@ -2449,7 +2449,7 @@ public void loadArchivedStickersCount(int type, boolean cache) { archivedStickersCount[type] = count; getNotificationCenter().postNotificationName(NotificationCenter.archivedStickersCountDidLoad, type); } - } else if (getUserConfig().getCurrentUser() != null && !getUserConfig().getCurrentUser().bot) { + } else if (getUserConfig().isClientActivated() && !getUserConfig().getCurrentUser().bot) { TLRPC.TL_messages_getArchivedStickers req = new TLRPC.TL_messages_getArchivedStickers(); req.limit = 0; req.masks = type == TYPE_MASK; @@ -2830,7 +2830,7 @@ public void loadStickers(int type, boolean cache, boolean force, boolean schedul } }); }); - } else if(!getUserConfig().getCurrentUser().bot) { + } else if (getUserConfig().isClientActivated() && !getUserConfig().getCurrentUser().bot) { if (type == TYPE_FEATURED || type == TYPE_FEATURED_EMOJIPACKS) { final boolean emoji = type == TYPE_FEATURED_EMOJIPACKS; TLRPC.TL_messages_allStickers response = new TLRPC.TL_messages_allStickers(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java index 3e0c973d39..d1dcc28305 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java @@ -407,7 +407,7 @@ private void resetItems() { return true; })); } - if (NekoXConfig.disableStatusUpdate && !UserConfig.getInstance(UserConfig.selectedAccount).getCurrentUser().bot) { + if (NekoXConfig.disableStatusUpdate && UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated() && !UserConfig.getInstance(UserConfig.selectedAccount).getCurrentUser().bot) { boolean online = MessagesController.getInstance(UserConfig.selectedAccount).isOnline(); String message = online ? StrUtil.upperFirst(LocaleController.getString("Online", R.string.Online)) : LocaleController.getString("VoipOfflineTitle", R.string.VoipOfflineTitle); if (NekoXConfig.keepOnlineStatus) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index e15eb10510..c6abba7075 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -30405,7 +30405,7 @@ private void startEditingMessageObject(MessageObject messageObject) { updatePinnedMessageView(true); updateVisibleRows(); - if (!messageObject.scheduled && !messageObject.isQuickReply() && !getUserConfig().getCurrentUser().bot) { + if (!messageObject.scheduled && !messageObject.isQuickReply() && getUserConfig().isClientActivated() && !getUserConfig().getCurrentUser().bot) { TLRPC.TL_messages_getMessageEditData req = new TLRPC.TL_messages_getMessageEditData(); req.peer = getMessagesController().getInputPeer(dialog_id); req.id = messageObject.getId();