Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

1 files changed, 32 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppConnectionServiceAccessor.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppConnectionServiceAccessor.java
new file mode 100644
index 00000000..20cd7361
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppConnectionServiceAccessor.java
@@ -0,0 +1,32 @@
+package de.thedevstack.conversationsplus.utils;
+
+import de.thedevstack.android.logcat.Logging;
+
+import eu.siacs.conversations.services.XmppConnectionService;
+
+/**
+ * Accessor utility to access XmppConnectionService without having to pass the XmppConnectionService every time.
+ */
+public final class XmppConnectionServiceAccessor {
+    public static XmppConnectionService xmppConnectionService;
+
+    /**
+     * Initializes the XmppConnectionService.
+     * This method needs to be called once in XmppConnectionService#onCreate.
+     * @param xmppConnectionService
+     */
+    public static void initXmppConnectionService(XmppConnectionService xmppConnectionService) {
+        if (null == XmppConnectionServiceAccessor.xmppConnectionService) {
+            XmppConnectionServiceAccessor.xmppConnectionService = xmppConnectionService;
+        } else {
+            Logging.e("XmppConnectionServiceAccessor", "XMPP Connection Service already instantiated.");
+        }
+    }
+
+    /**
+     * Avoid instantiation
+     */
+    private XmppConnectionServiceAccessor() {
+        // avoid instantiation
+    }
+}