From 64049eb335ef0fe2d0b39340f8e482962e7dc9ad Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 23 Feb 2016 13:07:20 +0100
Subject: Removed unnecessary dependencies to XmppConnectionService and added
 allowMessageCorrection to preferences

---
 .../thedevstack/conversationsplus/ConversationsPlusPreferences.java   | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index 17829998..c135e457 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -193,6 +193,10 @@ public class ConversationsPlusPreferences extends Settings {
         return getBoolean("indicate_received", false);
     }
 
+    public static boolean allowMessageCorrection() {
+        return getBoolean("allow_message_correction", true);
+    }
+
     private ConversationsPlusPreferences(SharedPreferences sharedPreferences) {
         this.sharedPreferences = sharedPreferences;
     }
-- 
cgit v1.2.3


From 8fb6204288d55f8af16ae47e32fa6c049284cadd Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 28 Feb 2016 18:40:20 +0100
Subject: Fixes FS#48 and FS#136 - corrected preference "confirm_messages" to
 "confirm_messages_list" - removed unused "heart message" garbage

---
 .../de/thedevstack/conversationsplus/ConversationsPlusPreferences.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index c135e457..18e54362 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -168,9 +168,6 @@ public class ConversationsPlusPreferences extends Settings {
     public static boolean forceEncryption() {
         return getBoolean("force_encryption", false);
     }
-    public static boolean confirmMessages() {
-        return getBoolean("confirm_messages", true);
-    }
 
     public static boolean dontSaveEncrypted() {
         return getBoolean("dont_save_encrypted", false);
-- 
cgit v1.2.3


From 5d21abac1dd2fed7a5e87f8fb23bc15ee0912322 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Wed, 2 Mar 2016 16:54:18 +0100
Subject: Fixes FS#147: Disable OMEMO

---
 .../thedevstack/conversationsplus/ConversationsPlusPreferences.java   | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index 18e54362..20eca48a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -14,6 +14,10 @@ public class ConversationsPlusPreferences extends Settings {
     private static ConversationsPlusPreferences instance;
     private final SharedPreferences sharedPreferences;
 
+    public static boolean omemoEnabled() {
+        return getBoolean("omemo_enabled", false);
+    }
+
     public static String imgTransferFolder() {
         return getString("img_transfer_folder", getString("app_name", "Conversations+"));
     }
-- 
cgit v1.2.3