narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

fixed some NPE

Browse source
This commit is contained in:
Daniel Gultsch 2019-05-22 23:58:39 +02:00
parent e5378df39c
commit 9a8cc5b2e7
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -436,6 +436,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
private void updateView() { private void updateView() {
invalidateOptionsMenu(); invalidateOptionsMenu();
if (mConversation == null) {
return;
}
final MucOptions mucOptions = mConversation.getMucOptions(); final MucOptions mucOptions = mConversation.getMucOptions();
final User self = mucOptions.getSelf(); final User self = mucOptions.getSelf();
String account; String account;

7
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -2606,7 +2606,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
service.sendChatState(conversation); service.sendChatState(conversation);
} }
if (storeNextMessage()) { if (storeNextMessage()) {
runOnUiThread(() -> activity.onConversationsListItemUpdated()); runOnUiThread(() -> {
if (activity == null) {
return;
}
activity.onConversationsListItemUpdated();
});
} }
runOnUiThread(this::updateSendButton); runOnUiThread(this::updateSendButton);
} }