diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-27 18:16:31 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-27 18:16:31 +0200 |
| commit | 1ae9338fc9d5f8e1f6505445f07f4476efd8f139 (patch) | |
| tree | ab69023e8b39ece36334072ebc9f82e520fddd67 /src/eu/siacs/conversations/entities/MucOptions.java | |
| parent | 4a9ed0e208f716d41e5bd4fb525a64661c0de8f8 (diff) | |
made muc passwords and prefereced encryption method persistant across restarts
Diffstat (limited to 'src/eu/siacs/conversations/entities/MucOptions.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/MucOptions.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java index 676fb4f40..91a3d260a 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() { |