From dd7bdd807b732cb8f1f7e6b3030ec57d48009ab1 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 6 Sep 2016 12:15:08 +0200 Subject: show server not found muc error --- src/main/java/de/pixart/messenger/entities/MucOptions.java | 1 + .../java/de/pixart/messenger/services/XmppConnectionService.java | 8 ++++++-- src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger') diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index da2045d26..d74c5549d 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -115,6 +115,7 @@ public class MucOptions { public enum Error { NO_RESPONSE, + SEVRER_NOT_FOUND, NONE, NICK_IN_USE, PASSWORD_REQUIRED, diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index af33475e4..0ac5633c1 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -2110,8 +2110,12 @@ public class XmppConnectionService extends Service { @Override public void onFetchFailed(final Conversation conversation, Element error) { - join(conversation); - fetchConferenceConfiguration(conversation); + if (error != null && "remote-server-not-found".equals(error.getName())) { + conversation.getMucOptions().setError(MucOptions.Error.SEVRER_NOT_FOUND); + } else { + join(conversation); + fetchConferenceConfiguration(conversation); + } } }); updateConversationUi(); diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index b89e8351c..ba093267f 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -876,6 +876,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa case NO_RESPONSE: showSnackbar(R.string.joining_conference, 0, null); break; + case SEVRER_NOT_FOUND: + showSnackbar(R.string.remote_server_not_found,R.string.leave, leaveMuc); + break; case PASSWORD_REQUIRED: showSnackbar(R.string.conference_requires_password, R.string.enter_password, enterPassword); break; -- cgit v1.2.3