Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-07-14 15:15:09 (GMT) |
|---|---|---|
| committer | Nick Hudson <nick.hudson@isode.com> | 2015-07-22 16:34:21 (GMT) |
| commit | 9ead0fdcca595df9dc3f4143122776b398dbe405 (patch) | |
| tree | bf82bac84b07431ea61a5da5865bdc07a3afb53c /src/com/isode/stroke/muc/MUCBookmark.java | |
| parent | 2341df7c72714df988b39cb2019562987ea28cbb (diff) | |
| download | stroke-9ead0fdcca595df9dc3f4143122776b398dbe405.zip stroke-9ead0fdcca595df9dc3f4143122776b398dbe405.tar.bz2 | |
Completes MUC in accordance with Swiften.
Updates MUC to be an abstract class.
Updates MUCBookmark, MUCManager, DirectedPresenceSender.
Adds MUCImpl.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Test updated for MUC, in accordance with Swiften, which passes.
Added MockMUC too.
Change-Id: If5aa672e8adc093162d3c9890c8437d3edadea68
Diffstat (limited to 'src/com/isode/stroke/muc/MUCBookmark.java')
| -rw-r--r-- | src/com/isode/stroke/muc/MUCBookmark.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/isode/stroke/muc/MUCBookmark.java b/src/com/isode/stroke/muc/MUCBookmark.java index 42b9dff..e4a306c 100644 --- a/src/com/isode/stroke/muc/MUCBookmark.java +++ b/src/com/isode/stroke/muc/MUCBookmark.java @@ -16,7 +16,7 @@ import com.isode.stroke.jid.JID; */ public class MUCBookmark { private JID room_; - private String name_; + private String name_ = ""; private String nick_; private String password_; private boolean autojoin_; @@ -136,7 +136,7 @@ public class MUCBookmark { if(!checkEqualsWhenNull(rhs.room_,room_)) return false; if(!checkEqualsWhenNull(rhs.name_,name_)) return false; if(!checkEqualsWhenNull(rhs.nick_,nick_)) return false; - if(!checkEqualsWhenNull(rhs.password_,password_)) return false; + //if(!checkEqualsWhenNull(rhs.password_,password_)) return false; if(!rhs.autojoin_ != autojoin_) return false; return true; } |