Add option to swap enter/emoticon key

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 69dd47e7..0deeacf0 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -96,6 +96,7 @@ public abstract class XmppActivity extends Activity {
 
 	private DisplayMetrics metrics;
 	protected int mTheme;
+	protected boolean mUsingEnterKey = false;
 
 	protected interface OnValueEdited {
 		public void onValueEdited(String value);
@@ -303,9 +304,14 @@ public abstract class XmppActivity extends Activity {
 				R.color.secondarybackground);
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
+		this.mUsingEnterKey = usingEnterKey();
 		mUseSubject = getPreferences().getBoolean("use_subject", true);
 	}
 
+	protected boolean usingEnterKey() {
+		return getPreferences().getBoolean("display_enter_key", false);
+	}
+
 	protected SharedPreferences getPreferences() {
 		return PreferenceManager
 			.getDefaultSharedPreferences(getApplicationContext());