diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java index d08ea68d8..6b65fd7f9 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java @@ -204,6 +204,7 @@ public class MrMailbox { public final static int MR_EVENT_MSG_DELIVERED = 3000; public final static int MR_EVENT_MSG_READ = 3010; public final static int MR_EVENT_CONNECTION_STATE_CHANGED = 3020; + public final static int MR_EVENT_CHAT_MODIFIED = 3030; public static long MrCallback(final int event, final long data1, final long data2) // this function is called from within the C-wrapper { switch(event) { @@ -253,6 +254,18 @@ public class MrMailbox { } }); return 0; + + case MR_EVENT_CHAT_MODIFIED: + AndroidUtilities.runOnUIThread(new Runnable() { + @Override + public void run() { + reloadMainChatlist(); + NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, + MessagesController.UPDATE_MASK_NAME|MessagesController.UPDATE_MASK_CHAT_NAME| + MessagesController.UPDATE_MASK_CHAT_MEMBERS|MessagesController.UPDATE_MASK_AVATAR); + } + }); + return 0; } return 0; } @@ -302,6 +315,10 @@ public class MrMailbox { MrStockAddStr(12, LocaleController.getString("AttachDocument", R.string.AttachDocument)); MrStockAddStr(13, LocaleController.getString("DefaultStatusText", R.string.DefaultStatusText)); MrStockAddStr(14, LocaleController.getString("MsgNewGroupDraft", R.string.MsgNewGroupDraft)); + MrStockAddStr(15, LocaleController.getString("MsgGroupNameChanged", R.string.MsgGroupNameChanged)); + MrStockAddStr(16, LocaleController.getString("MsgGroupImageChanged", R.string.MsgGroupImageChanged)); + MrStockAddStr(17, LocaleController.getString("MsgMemberAddedToGroup", R.string.MsgMemberAddedToGroup)); + MrStockAddStr(18, LocaleController.getString("MsgMemberRemovedFromToGroup", R.string.MsgMemberRemovedFromToGroup)); } public static String getInviteText() { diff --git a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java index 6efde3634..bbf28d8ed 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java @@ -636,7 +636,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif value = preferences.getString("GroupSound", LocaleController.getString("SoundDefault", R.string.SoundDefault)); } if (value.equals("NoSound")) { - value = LocaleController.getString("NoSound", R.string.NoSound); + value = LocaleController.getString("Disabled", R.string.Disabled); } textCell.setTextAndValue(LocaleController.getString("Sound", R.string.Sound), value, true); } else if (i == messageVibrateRow || i == groupVibrateRow) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java index 68ee35c25..b429369ea 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java @@ -600,7 +600,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi } else if (i == settingsSoundRow) { String value = preferences.getString("sound_" + dialog_id, LocaleController.getString("SoundDefault", R.string.SoundDefault)); if (value.equals("NoSound")) { - value = LocaleController.getString("NoSound", R.string.NoSound); + value = LocaleController.getString("Disabled", R.string.Disabled); } textCell.setTextAndValue(LocaleController.getString("Sound", R.string.Sound), value, true); } else if (i == settingsPriorityRow) { diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index 7803084b0..851624511 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -570,4 +570,8 @@ Bitte einen Namen für die Gruppe eingeben. Hallo, ich habe die Gruppe \"_\" für uns erstellt. Eine erste Nachricht schreiben; dann können die anderen in der Gruppe antworten. + Gruppenbild geändert. + Gruppenname von \"_\" in \"_\" geändert. + \"_\" zur Gruppe hinzugefügt. + \"_\" aus Gruppe entfernt. diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index 3d260a4f6..cc804ee8a 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -570,4 +570,8 @@ Please enter a name for the group. Write a first message to allow others to reply in this group. Hello, I\'ve just created the group \"_\" for us. + Group name changed from \"_\" to \"_\". + Group image changed. + Member \"_\" added. + Member \"_\" removed.