Swiftdiff options
Diffstat (limited to 'src/com/isode/stroke/muc/MUCBookmarkManager.java')
| -rw-r--r-- | src/com/isode/stroke/muc/MUCBookmarkManager.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/isode/stroke/muc/MUCBookmarkManager.java b/src/com/isode/stroke/muc/MUCBookmarkManager.java index 78bddea..36e6d94 100644 --- a/src/com/isode/stroke/muc/MUCBookmarkManager.java +++ b/src/com/isode/stroke/muc/MUCBookmarkManager.java @@ -1,9 +1,5 @@ /* - * Copyright (c) 2012, Isode Limited, London, England. - * All rights reserved. - */ -/* - * Copyright (c) 2010, Remko Tronçon. + * Copyright (c) 2010-2015, Isode Limited, London, England. * All rights reserved. */ package com.isode.stroke.muc; @@ -116,7 +112,7 @@ public class MUCBookmarkManager { storage = payload; Vector<MUCBookmark> receivedBookmarks = new Vector<MUCBookmark>(); - for (Storage.Room room : payload.getRooms()) { + if (payload != null) for (Storage.Room room : payload.getRooms()) { receivedBookmarks.add(new MUCBookmark(room)); } |