diff --git a/TMessagesProj/src/main/java/com/radolyn/ayugram/AyuConfig.java b/TMessagesProj/src/main/java/com/radolyn/ayugram/AyuConfig.java index b609603f0..3608e39d7 100644 --- a/TMessagesProj/src/main/java/com/radolyn/ayugram/AyuConfig.java +++ b/TMessagesProj/src/main/java/com/radolyn/ayugram/AyuConfig.java @@ -42,7 +42,6 @@ public class AyuConfig { public static boolean saveForBots; public static boolean markReadAfterSend; - public static boolean showFromChannel; public static boolean keepAliveService; public static boolean enableAds; public static boolean localPremium; @@ -97,7 +96,6 @@ public class AyuConfig { saveReactions = preferences.getBoolean("saveReactions", true); // ~ Useful features - showFromChannel = preferences.getBoolean("showFromChannel", true); keepAliveService = preferences.getBoolean("keepAliveService", true); enableAds = preferences.getBoolean("enableAds", false); localPremium = preferences.getBoolean("localPremium", false); diff --git a/TMessagesProj/src/main/java/com/radolyn/ayugram/ui/preferences/AyuGramPreferencesActivity.java b/TMessagesProj/src/main/java/com/radolyn/ayugram/ui/preferences/AyuGramPreferencesActivity.java index bf02f6b61..9fae51130 100644 --- a/TMessagesProj/src/main/java/com/radolyn/ayugram/ui/preferences/AyuGramPreferencesActivity.java +++ b/TMessagesProj/src/main/java/com/radolyn/ayugram/ui/preferences/AyuGramPreferencesActivity.java @@ -52,7 +52,6 @@ public class AyuGramPreferencesActivity extends BasePreferencesActivity implemen private int spyDivider2Row; private int qolHeaderRow; - private int showFromChannelRow; private int keepAliveServiceRow; private int enableAdsRow; private int localPremiumRow; @@ -107,7 +106,6 @@ public class AyuGramPreferencesActivity extends BasePreferencesActivity implemen spyDivider2Row = newRow(); qolHeaderRow = newRow(); - showFromChannelRow = newRow(); keepAliveServiceRow = newRow(); enableAdsRow = newRow(); localPremiumRow = newRow(); @@ -250,9 +248,6 @@ public class AyuGramPreferencesActivity extends BasePreferencesActivity implemen ((TextCheckCell) view).setChecked(AyuConfig.saveMessagesHistory); } else if (position == messageSavingBtnRow) { presentFragment(new MessageSavingPreferencesActivity()); - } else if (position == showFromChannelRow) { - AyuConfig.editor.putBoolean("showFromChannel", AyuConfig.showFromChannel ^= true).apply(); - ((TextCheckCell) view).setChecked(AyuConfig.showFromChannel); } else if (position == keepAliveServiceRow) { AyuConfig.editor.putBoolean("keepAliveService", AyuConfig.keepAliveService ^= true).apply(); ((TextCheckCell) view).setChecked(AyuConfig.keepAliveService); @@ -422,8 +417,6 @@ public class AyuGramPreferencesActivity extends BasePreferencesActivity implemen textCheckCell.setTextAndCheck(LocaleController.getString(R.string.SaveDeletedMessages), AyuConfig.saveDeletedMessages, true); } else if (position == saveMessagesHistoryRow) { textCheckCell.setTextAndCheck(LocaleController.getString(R.string.SaveMessagesHistory), AyuConfig.saveMessagesHistory, false); - } else if (position == showFromChannelRow) { - textCheckCell.setTextAndCheck(LocaleController.getString(R.string.ShowFromChannel), AyuConfig.showFromChannel, true); } else if (position == keepAliveServiceRow) { textCheckCell.setTextAndCheck(LocaleController.getString(R.string.KeepAliveService), AyuConfig.keepAliveService, true); } else if (position == enableAdsRow) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java index e35c864c4..4061eea87 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java @@ -5852,10 +5852,6 @@ public class MessageObject { return messageOwner.from_id instanceof TLRPC.TL_peerChannel && ChatObject.isChannel(chat) && chat.megagroup; } - public boolean isFromChannel() { - return messageOwner.from_id instanceof TLRPC.TL_peerChannel; - } - public boolean isForwardedChannelPost() { return messageOwner.from_id instanceof TLRPC.TL_peerChannel && messageOwner.fwd_from != null && messageOwner.fwd_from.channel_post != 0 && messageOwner.fwd_from.saved_from_peer instanceof TLRPC.TL_peerChannel && messageOwner.from_id.channel_id == messageOwner.fwd_from.saved_from_peer.channel_id; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java index 32b163851..f418f2b16 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -12490,10 +12490,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate adminString = adminLabel; adminWidth = (int) Math.ceil(Theme.chat_adminPaint.measureText(adminString)); nameWidth -= adminWidth; - } else if (AyuConfig.showFromChannel && isMegagroup && currentChat != null && currentMessageObject.isFromChannel()) { - adminString = LocaleController.getString("DiscussChannel", R.string.DiscussChannel);; - adminWidth = (int) Math.ceil(Theme.chat_adminPaint.measureText(adminString)); - nameWidth -= adminWidth; } else { adminString = null; adminWidth = 0;