diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-12 18:47:41 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-13 21:56:15 +0200 |
| commit | cf5e35fe9ff1de50d83b0a97ceadba4111975409 (patch) | |
| tree | b0359d528e40fbb9752f576fd8217ce3b0a085a2 /src | |
| parent | ed6a572bde9750f5df497f1db83a89cc18c079e7 (diff) | |
use 'phone' or 'tablet' as default resource
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 | ||||
| -rw-r--r-- | src/main/res/values-sw600dp/defaults.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 4 |
3 files changed, 9 insertions, 1 deletions
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 @@ +<?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 |