diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-17 20:02:46 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-17 20:02:46 +0100 |
| commit | f41c3eee04a647fa3f44da20ca77928731ce8946 (patch) | |
| tree | 1b60f0b00425ed4d4f354aef33f7a9eb8282337e /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 283d5058e5f91e11fc651a83ce2968580bd94d4a (diff) | |
context menu for muc participants + refactor trueCounterpart to use Jid class
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 0742e17e..cf02c970 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -494,6 +494,9 @@ public class ConversationFragment extends Fragment { } public void reInit(Conversation conversation) { + if (conversation == null) { + return; + } if (this.conversation != null) { this.conversation.setNextMessage(mEditMessage.getText().toString()); } |