sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show regitration failed try again later in UI

This commit is contained in:
Daniel Gultsch 2016-05-24 13:26:30 +02:00
parent abbdf232c6
commit b69ab65b12
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/entities/Account.java
View File

@ -99,7 +99,8 @@ public class Account extends AbstractEntity {
INCOMPATIBLE_SERVER(true), INCOMPATIBLE_SERVER(true),
TOR_NOT_AVAILABLE(true), TOR_NOT_AVAILABLE(true),
BIND_FAILURE(true), BIND_FAILURE(true),
HOST_UNKNOWN(true); HOST_UNKNOWN(true),
REGISTRATION_PLEASE_WAIT(true);
private final boolean isError; private final boolean isError;
@ -149,6 +150,8 @@ public class Account extends AbstractEntity {
return R.string.account_status_bind_failure; return R.string.account_status_bind_failure;
case HOST_UNKNOWN: case HOST_UNKNOWN:
return R.string.account_status_host_unknown; return R.string.account_status_host_unknown;
case REGISTRATION_PLEASE_WAIT:
return R.string.registration_please_wait;
default: default:
return R.string.account_status_unknown; return R.string.account_status_unknown;
} }

21
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -183,14 +183,21 @@ public class XmppConnection implements Runnable {
account.setOption(Account.OPTION_REGISTER, false); account.setOption(Account.OPTION_REGISTER, false);
forceCloseSocket(); forceCloseSocket();
changeStatus(Account.State.REGISTRATION_SUCCESSFUL); changeStatus(Account.State.REGISTRATION_SUCCESSFUL);
} else if (packet.hasChild("error")
&& (packet.findChild("error").hasChild("conflict"))) {
forceCloseSocket();
changeStatus(Account.State.REGISTRATION_CONFLICT);
} else { } else {
forceCloseSocket(); Element error = packet.findChild("error");
changeStatus(Account.State.REGISTRATION_FAILED); if (error != null && error.hasChild("conflict")) {
Log.d(Config.LOGTAG, packet.toString()); forceCloseSocket();
changeStatus(Account.State.REGISTRATION_CONFLICT);
} else if (error != null
&& "wait".equals(error.getAttribute("type"))
&& error.hasChild("resource-constraint")) {
forceCloseSocket();
changeStatus(Account.State.REGISTRATION_PLEASE_WAIT);
} else {
forceCloseSocket();
changeStatus(Account.State.REGISTRATION_FAILED);
Log.d(Config.LOGTAG, packet.toString());
}
} }
} }
}; };

1
src/main/res/values/strings.xml
View File

@ -641,4 +641,5 @@
<string name="secure_password_generated">A secure password has been generated</string> <string name="secure_password_generated">A secure password has been generated</string>
<string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string> <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
<string name="show_password">Show password</string> <string name="show_password">Show password</string>
<string name="registration_please_wait">Registration failed: Try again later</string>
</resources> </resources>