From 1ae9338fc9d5f8e1f6505445f07f4476efd8f139 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sat, 27 Sep 2014 18:16:31 +0200 Subject: made muc passwords and prefereced encryption method persistant across restarts --- src/eu/siacs/conversations/entities/MucOptions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/eu/siacs/conversations/entities/MucOptions.java') diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java index 676fb4f4..91a3d260 100644 --- a/src/eu/siacs/conversations/entities/MucOptions.java +++ b/src/eu/siacs/conversations/entities/MucOptions.java @@ -323,7 +323,8 @@ public class MucOptions { } public String getPassword() { - if (conversation.getBookmark() != null + this.password = conversation.getAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD); + if (this.password == null && conversation.getBookmark() != null && conversation.getBookmark().getPassword() != null) { return conversation.getBookmark().getPassword(); } else { @@ -338,6 +339,7 @@ public class MucOptions { } else { this.password = password; } + conversation.setAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD, password); } public boolean isPasswordChanged() { -- cgit v1.2.3