PresenceParser: work around for ejabberd not including status code 110 in shut down presence

Daniel Gultsch created 8 years ago

Change summary

src/main/java/eu/siacs/conversations/parser/PresenceParser.java   | 4 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 4 
2 files changed, 5 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/parser/PresenceParser.java

@@ -115,7 +115,9 @@ public class PresenceParser extends AbstractParser implements
 					}
 				}
 			} else if (type.equals("unavailable")) {
-				if (codes.contains(MucOptions.STATUS_CODE_SELF_PRESENCE)) {
+				if (codes.contains(MucOptions.STATUS_CODE_SHUTDOWN) && from.equals(mucOptions.getSelf().getFullJid())) {
+					mucOptions.setError(MucOptions.Error.SHUTDOWN);
+				} else if (codes.contains(MucOptions.STATUS_CODE_SELF_PRESENCE)) {
 					if (codes.contains(MucOptions.STATUS_CODE_KICKED)) {
 						mucOptions.setError(MucOptions.Error.KICKED);
 					} else if (codes.contains(MucOptions.STATUS_CODE_BANNED)) {

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -1107,10 +1107,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					showSnackbar(R.string.conference_kicked, R.string.join, joinMuc);
 					break;
 				case UNKNOWN:
-					showSnackbar(R.string.conference_unknown_error, R.string.join, joinMuc);
+					showSnackbar(R.string.conference_unknown_error, R.string.try_again, joinMuc);
 					break;
 				case SHUTDOWN:
-					showSnackbar(R.string.conference_shutdown, R.string.join, joinMuc);
+					showSnackbar(R.string.conference_shutdown, R.string.try_again, joinMuc);
 					break;
 				default:
 					hideSnackbar();