lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix conflict

This commit is contained in:
世界 2021-02-24 07:16:27 +08:00
parent 5c75f74b1d
commit 64f9152f8a
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View File

@ -1072,7 +1072,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private final static int chat_enc_timer = 13;
private final static int chat_menu_attach = 14;
private final static int clear_history = 15;
private final static int delete_history = 26;
private final static int delete_chat = 16;
private final static int share_contact = 17;
private final static int mute = 18;
@ -1090,6 +1090,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private final static int upgrade = 105;
private final static int unpin = 106;
private final static int save = 107;
private final static int delete_history = 108;
private final static int bot_help = 30;
private final static int bot_settings = 31;

4
TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
View File

@ -1432,9 +1432,9 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
inviteLinksCell.setVisibility(View.GONE);
} else {
if (info.invitesCount > 0) {
inviteLinksCell.setTextAndValueAndIcon(LocaleController.getString("InviteLinks", R.string.InviteLinks), Integer.toString(info.invitesCount), R.drawable.actions_link, true);
inviteLinksCell.setTextAndValue(LocaleController.getString("InviteLinks", R.string.InviteLinks), Integer.toString(info.invitesCount), true);
} else {
inviteLinksCell.setTextAndValueAndIcon(LocaleController.getString("InviteLinks", R.string.InviteLinks), "1", R.drawable.actions_link, true);
inviteLinksCell.setTextAndValue(LocaleController.getString("InviteLinks", R.string.InviteLinks), "1", true);
}
}
}