Merge branch 'trz/rebase' into trz/rename

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
	src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
index b620887e..8d879fa0 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
@@ -128,6 +128,7 @@ public class Account extends AbstractEntity {
 	private final Roster roster = new Roster(this);
 	private List<Bookmark> bookmarks = new CopyOnWriteArrayList<>();
 	private final Collection<Jid> blocklist = new CopyOnWriteArraySet<>();
+	private XmppConnectionService mXmppConnectionService;
 
 	public Account() {
 		this.uuid = "0";
@@ -278,6 +279,7 @@ public class Account extends AbstractEntity {
 	}
 
 	public void initAccountServices(final XmppConnectionService context) {
+		this.mXmppConnectionService = context;
 		this.mOtrService = new OtrService(context, this);
 	}
 
@@ -418,4 +420,8 @@ public class Account extends AbstractEntity {
 	public boolean isOnlineAndConnected() {
 		return this.getStatus() == State.ONLINE && this.getXmppConnection() != null;
 	}
+
+	public XmppConnectionService getXmppConnectionService() {
+		return mXmppConnectionService;
+	}
 }