fixed some NPE

Daniel Gultsch created 6 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 3 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java      | 7 
2 files changed, 9 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

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

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

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