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

Conflicts:
	src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

1 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index dec387b6..acddef2e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -29,6 +29,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -262,7 +264,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 						});
 			}
 		});
-		this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false);
+		this.mAdvancedMode = ConversationsPlusPreferences.advancedMucMode();
 		this.mConferenceInfoTable = (TableLayout) findViewById(R.id.muc_info_more);
 		mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);
 		this.mConferenceInfoMam = (TextView) findViewById(R.id.muc_info_mam);
@@ -291,7 +293,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			case R.id.action_advanced_mode:
 				this.mAdvancedMode = !menuItem.isChecked();
 				menuItem.setChecked(this.mAdvancedMode);
-				getPreferences().edit().putBoolean("advanced_muc_mode", mAdvancedMode).commit();
+				ConversationsPlusPreferences.commitAdvancedMucMode(mAdvancedMode);
 				mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);
 				invalidateOptionsMenu();
 				updateView();
@@ -468,7 +470,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			bookmark.setNick(mConversation.getJid().getResourcepart());
 		}
 		bookmark.setBookmarkName(mConversation.getMucOptions().getSubject());
-		bookmark.setAutojoin(getPreferences().getBoolean("autojoin",true));
+		bookmark.setAutojoin(ConversationsPlusPreferences.autojoin());
 		account.getBookmarks().add(bookmark);
 		xmppConnectionService.pushBookmarks(account);
 		mConversation.setBookmark(bookmark);