From 8cce653a1f16e7b9ab4dd3aadb7320572928dcde Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 2 Mar 2017 13:03:30 +0100
Subject: [PATCH] changed default setting for enter_is_send on devices with
 keyboard

---
 .../java/eu/siacs/conversations/ui/ConversationActivity.java  | 2 +-
 src/main/res/values-qwerty/defaults.xml                       | 4 ++++
 src/main/res/values/defaults.xml                              | 1 +
 src/main/res/xml/preferences.xml                              | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/values-qwerty/defaults.xml

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 21c2dc783..afd56b528 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1774,7 +1774,7 @@ public class ConversationActivity extends XmppActivity
 	}
 
 	public boolean enterIsSend() {
-		return getPreferences().getBoolean("enter_is_send",false);
+		return getPreferences().getBoolean("enter_is_send",getResources().getBoolean(R.bool.enter_is_send));
 	}
 
 	@Override
diff --git a/src/main/res/values-qwerty/defaults.xml b/src/main/res/values-qwerty/defaults.xml
new file mode 100644
index 000000000..17e88c0bb
--- /dev/null
+++ b/src/main/res/values-qwerty/defaults.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="enter_is_send">true</bool>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 7d613ab5e..eea700694 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="default_resource">Phone</string>
     <bool name="portrait_only">true</bool>
+    <bool name="enter_is_send">false</bool>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 31014d855..3d98dedef 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -220,7 +220,7 @@
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_input_options">
                 <CheckBoxPreference
-                    android:defaultValue="false"
+                    android:defaultValue="@bool/enter_is_send"
                     android:key="enter_is_send"
                     android:summary="@string/pref_enter_is_send_summary"
                     android:title="@string/pref_enter_is_send"/>