From a892bb6f1685b84b74ba37e5a6a24ee8fb45eee7 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Mon, 7 Aug 2017 12:57:57 +0200
Subject: Simplifying introduction of new XEP implementations, implements
 FS#250 and FS#251 (Privacy and Security settings), refactoring of location of
 some interfaces

---
 .../conversationsplus/ui/SettingsActivity.java           | 16 +++++++++++++++-
 .../ConversationMoreMessagesLoadedListener.java          |  3 ++-
 .../ui/listeners/ConversationSwipeRefreshListener.java   |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
index 296f8f4f..53c3892d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
@@ -24,7 +24,9 @@ import java.util.Locale;
 
 import de.duenndns.ssl.MemorizingTrustManager;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.services.ExportLogsService;
+import de.thedevstack.conversationsplus.xmpp.XepRegistry;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
@@ -187,7 +189,19 @@ public class SettingsActivity extends XmppActivity implements
 			FileBackend.onFileTransferFolderChanged();
 		} else if ("img_transfer_folder".equals(name)) {
             FileBackend.onImageTransferFolderChanged();
-		}
+		} else if ("send_entity_time".equals(name)) {
+            if (ConversationsPlusPreferences.sendEntityTime()) {
+                XepRegistry.enable("time");
+            } else {
+                XepRegistry.disable("time");
+            }
+        } else if ("send_software_info".equals(name)) {
+            if (ConversationsPlusPreferences.sendSoftwareVersion()) {
+                XepRegistry.enable("iq-version");
+            } else {
+                XepRegistry.disable("iq-version");
+            }
+        }
 
 	}
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
index 8e2909ad..fd8b5782 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
@@ -11,6 +11,7 @@ import java.util.List;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.services.mam.OnMoreMessagesLoaded;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
 import de.thedevstack.conversationsplus.ui.ConversationFragment;
 import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter;
@@ -18,7 +19,7 @@ import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter;
 /**
  * This listener updates the UI when messages are loaded from the server.
  */
-public class ConversationMoreMessagesLoadedListener implements XmppConnectionService.OnMoreMessagesLoaded {
+public class ConversationMoreMessagesLoadedListener implements OnMoreMessagesLoaded {
     private SwipyRefreshLayout swipeLayout;
     private List<Message> messageList;
     private ConversationFragment fragment;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
index 6dc9f4a4..d401251d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
@@ -13,7 +13,7 @@ import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.services.MessageArchiveService;
+import de.thedevstack.conversationsplus.services.mam.MessageArchiveService;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
 import de.thedevstack.conversationsplus.ui.ConversationFragment;
 import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter;
-- 
cgit v1.2.3