TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "feat: show forwarder name"

Browse Source 
This reverts commit 032886d1c7.
This commit is contained in:
Next Alone 2022-06-30 01:18:50 +08:00
parent 6d80a94de3
commit 45d70e459e
No known key found for this signature in database
GPG Key ID: DBA7B0AEF8C1CD2C
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View File

@ -84,7 +84,6 @@ import java.util.Stack;
import tw.nekomimi.nekogram.ui.MessageHelper;
import tw.nekomimi.nekogram.NekoConfig;
import xyz.nextalone.nagram.NaConfig;
public class DialogCell extends BaseCell {
@ -1099,9 +1098,9 @@ public class DialogCell extends BaseCell {
if (chat != null && chat.id > 0 && fromChat == null && (!ChatObject.isChannel(chat) || ChatObject.isMegagroup(chat))) {
if (message.isOutOwner()) {
messageNameString = LocaleController.getString("FromYou", R.string.FromYou);
// NekoX: fix show forwarded name as sender
} else if (message != null && message.messageOwner.fwd_from != null && message.messageOwner.fwd_from.from_name != null && !NaConfig.INSTANCE.getShowForwarderName().Bool()) {
messageNameString = message.messageOwner.fwd_from.from_name;
// NekoX: fix show forwarded name as sender
/*} else if (message != null && message.messageOwner.fwd_from != null && message.messageOwner.fwd_from.from_name != null) {
messageNameString = message.messageOwner.fwd_from.from_name;*/
} else if (fromUser != null) {
if (useForceThreeLines || SharedConfig.useThreeLinesLayout) {
if (UserObject.isDeleted(fromUser)) {

1
TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
View File

@ -123,7 +123,6 @@ public class NekoChatSettingsActivity extends BaseFragment implements Notificati
}, null));
private final AbstractConfigCell scrollableChatPreviewRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getScrollableChatPreview()));
private final AbstractConfigCell dateOfForwardMsgRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDateOfForwardedMsg()));
private final AbstractConfigCell showForwarderNameRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getShowForwarderName()));
private final AbstractConfigCell divider1 = cellGroup.appendCell(new ConfigCellDivider());
private final AbstractConfigCell header2 = cellGroup.appendCell(new ConfigCellHeader(LocaleController.getString("AutoDownload")));
private final AbstractConfigCell win32Row = cellGroup.appendCell(new ConfigCellTextCheck(NekoConfig.disableAutoDownloadingWin32Executable));

5
TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt
View File

@ -172,11 +172,6 @@ object NaConfig {
ConfigItem.configTypeBool,
false
)
val ShowForwarderName = addConfig(
"ShowForwarderName",
ConfigItem.configTypeBool,
false
)
fun addConfig(
k: String,

1
TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
View File

@ -31,5 +31,4 @@
<string name="PhotoCopied">图片已复制到剪贴板</string>
<string name="ToTheBeginning">回到顶部</string>
<string name="DateOfForwardedMsg">显示转发消息日期</string>
<string name="ShowForwarderName">显示转发者名字</string>
</resources>

1
TMessagesProj/src/main/res/values/strings_na.xml
View File

@ -31,5 +31,4 @@
<string name="PhotoCopied">Photo copied to Clipboard</string>
<string name="ToTheBeginning">To the beginning</string>
<string name="DateOfForwardedMsg">Show date of forward message</string>
<string name="ShowForwarderName">Show forwarder name</string>
</resources>