diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-04-16 12:16:42 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-04-16 12:16:42 +0200 |
| commit | ed539ec46ce4608b4f2d17f59d956e6272f0e599 (patch) | |
| tree | 780139477078de90bcd75f8df1e4df272e9941a0 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
| parent | 45e4c115d66804d53275d9885fc2b5e64114d134 (diff) | |
show 'try again' button when remote server wasn't found in previously active muc
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index d8eb6eac2..5976bde02 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1072,7 +1072,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa showSnackbar(R.string.joining_conference, 0, null); break; case SERVER_NOT_FOUND: - showSnackbar(R.string.remote_server_not_found, R.string.leave, leaveMuc); + if (conversation.receivedMessagesCount() > 0) { + showSnackbar(R.string.remote_server_not_found, R.string.try_again, joinMuc); + } else { + 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); @@ -1094,6 +1098,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa showSnackbar(R.string.conference_shutdown, R.string.join, joinMuc); break; default: + hideSnackbar(); break; } } else if (account.hasPendingPgpIntent(conversation)) { |