From cf5e35fe9ff1de50d83b0a97ceadba4111975409 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch 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 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/main/res/values-sw600dp/defaults.xml create mode 100644 src/main/res/values/defaults.xml (limited to 'src/main') diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index f422f8df5..9f6d21e28 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -846,7 +846,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 @@ + + + Tablet + \ 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 @@ + + + Phone + \ No newline at end of file -- cgit v1.2.3