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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 13fcc9a5..e06e6bd8 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -39,6 +39,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import de.thedevstack.conversationsplus.ConversationsPlusColors;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
 
@@ -523,8 +524,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				}
 			}
 		}
-		SharedPreferences preferences = getPreferences();
-		this.mShowOptions = preferences.getBoolean("show_connection_options", false);
+		this.mShowOptions = ConversationsPlusPreferences.showConnectionOptions();
 		this.mNamePort.setVisibility(mShowOptions ? View.VISIBLE : View.GONE);
 	}