From 163f5ae6229c99d72a73215ce1ba72827eefd93b Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 9 Feb 2019 15:22:29 +0100 Subject: use the term channel in destroy dialog and some other strings --- .../de/pixart/messenger/ui/ConversationsActivity.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index e7343ce63..e84e657b7 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -96,7 +96,7 @@ import rocks.xmpp.addr.Jid; import static de.pixart.messenger.ui.ConversationFragment.REQUEST_DECRYPT_PGP; -public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged { +public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoomDestroy { public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW"; public static final String EXTRA_CONVERSATION = "conversationUuid"; @@ -607,7 +607,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio Log.d(Config.LOGTAG, "Get " + intent.getAction() + " intent for " + extras.getString("MUC_UUID")); Conversation conversation = xmppConnectionService.findConversationByUuid(extras.getString("MUC_UUID")); ConversationsActivity.this.xmppConnectionService.clearConversationHistory(conversation); - xmppConnectionService.destroyRoom(conversation); + xmppConnectionService.destroyRoom(conversation, ConversationsActivity.this); endConversation(conversation); } } @@ -932,4 +932,18 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio Log.d(Config.LOGTAG, "AppUpdater stopped"); } } + + @Override + public void onRoomDestroySucceeded() { + Conversation conversation = ConversationFragment.getConversationReliable(this); + final boolean groupChat = conversation != null && conversation.isPrivateAndNonAnonymous(); + displayToast(getString(groupChat ? R.string.destroy_room_succeed : R.string.destroy_channel_succeed)); + } + + @Override + public void onRoomDestroyFailed() { + Conversation conversation = ConversationFragment.getConversationReliable(this); + final boolean groupChat = conversation != null && conversation.isPrivateAndNonAnonymous(); + displayToast(getString(groupChat ? R.string.destroy_room_failed : R.string.destroy_channel_failed)); + } } \ No newline at end of file -- cgit v1.2.3