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

add exception handling when loading default resource

Browse source
This commit is contained in:
Daniel Gultsch 2016-10-17 09:53:08 +02:00
parent dc02e2b498
commit 22d13a3dcd
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -997,8 +997,16 @@ public class XmppConnectionService extends Service {
public XmppConnection createConnection(final Account account) { public XmppConnection createConnection(final Account account) {
final SharedPreferences sharedPref = getPreferences(); final SharedPreferences sharedPref = getPreferences();
account.setResource(sharedPref.getString("resource", getString(R.string.default_resource)) String resource;
.toLowerCase(Locale.getDefault())); try {
resource = sharedPref.getString("resource", getString(R.string.default_resource)).toLowerCase(Locale.ENGLISH);
if (resource.trim().isEmpty()) {
throw new Exception();
}
} catch (Exception e) {
resource = "conversations";
}
account.setResource(resource);
final XmppConnection connection = new XmppConnection(account, this); final XmppConnection connection = new XmppConnection(account, this);
connection.setOnMessagePacketReceivedListener(this.mMessageParser); connection.setOnMessagePacketReceivedListener(this.mMessageParser);
connection.setOnStatusChangedListener(this.statusListener); connection.setOnStatusChangedListener(this.statusListener);