From 92c0e993ad3362d1b2ec75f7886bbc2e01f3d253 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 18 Oct 2016 21:52:03 +0200
Subject: add exception handling when loading default resource

---
 .../de/pixart/messenger/services/XmppConnectionService.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 8f66b1971..02725991b 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1131,7 +1131,16 @@ public class XmppConnectionService extends Service {
 
 	public XmppConnection createConnection(final Account account) {
 		final SharedPreferences sharedPref = getPreferences();
-		account.setResource(sharedPref.getString("resource", "mobile").toLowerCase(Locale.getDefault()));
+        String resource;
+        try {
+            resource = sharedPref.getString("resource", getString(R.string.default_resource)).toLowerCase(Locale.ENGLISH);
+            if (resource.trim().isEmpty()) {
+                throw new Exception();
+            }
+        } catch (Exception e) {
+            resource = "Pix-Art Messenger";
+        }
+        account.setResource(resource);
 		final XmppConnection connection = new XmppConnection(account, this);
 		connection.setOnMessagePacketReceivedListener(this.mMessageParser);
 		connection.setOnStatusChangedListener(this.statusListener);
-- 
cgit v1.2.3