narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

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

Browse source
This commit is contained in:
Daniel Gultsch 2017-11-30 13:21:03 +01:00
parent 21480c9b98
commit 86f09dd9b9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
View file

@ -115,7 +115,9 @@ public class PresenceParser extends AbstractParser implements
} }
} }
} else if (type.equals("unavailable")) { } 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)) { if (codes.contains(MucOptions.STATUS_CODE_KICKED)) {
mucOptions.setError(MucOptions.Error.KICKED); mucOptions.setError(MucOptions.Error.KICKED);
} else if (codes.contains(MucOptions.STATUS_CODE_BANNED)) { } else if (codes.contains(MucOptions.STATUS_CODE_BANNED)) {

4
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

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