From 7113e21a433b04d82a161ea36625d3512a86f18a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 12 May 2016 18:47:41 +0200
Subject: use 'phone' or 'tablet' as default resource

---
 .../java/eu/siacs/conversations/services/XmppConnectionService.java   | 2 +-
 src/main/res/values-sw600dp/defaults.xml                              | 4 ++++
 src/main/res/values/defaults.xml                                      | 4 ++++
 src/main/res/xml/preferences.xml                                      | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/values-sw600dp/defaults.xml
 create mode 100644 src/main/res/values/defaults.xml

(limited to 'src')

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 4a7a8d670..7301c7aa5 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -851,7 +851,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public XmppConnection createConnection(final Account account) {
 		final SharedPreferences sharedPref = getPreferences();
-		account.setResource(sharedPref.getString("resource", "mobile")
+		account.setResource(sharedPref.getString("resource", getString(R.string.default_resource))
 				.toLowerCase(Locale.getDefault()));
 		final XmppConnection connection = new XmppConnection(account, this);
 		connection.setOnMessagePacketReceivedListener(this.mMessageParser);
diff --git a/src/main/res/values-sw600dp/defaults.xml b/src/main/res/values-sw600dp/defaults.xml
new file mode 100644
index 000000000..e23a93de3
--- /dev/null
+++ b/src/main/res/values-sw600dp/defaults.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="default_resource">Tablet</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
new file mode 100644
index 000000000..be795ed40
--- /dev/null
+++ b/src/main/res/values/defaults.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="default_resource">Phone</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 63dc71dbd..80980417d 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -9,7 +9,7 @@
             android:title="@string/pref_grant_presence_updates"/>
 
         <ListPreference
-            android:defaultValue="Mobile"
+            android:defaultValue="@string/default_resource"
             android:entries="@array/resources"
             android:entryValues="@array/resources"
             android:key="resource"
-- 
cgit v1.2.3