diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 7d70e04770..9bb865374d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -20,6 +20,7 @@ package eu.faircode.email; */ import android.Manifest; +import android.app.Activity; import android.app.PendingIntent; import android.content.ClipboardManager; import android.content.Context; @@ -524,13 +525,15 @@ public class FragmentCompose extends FragmentEx { } private void check() { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) - checkInternet(); - } - }); + Activity activity = getActivity(); + if (activity != null) + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) + checkInternet(); + } + }); } }; diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 2118502dda..7c12f38b00 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -19,6 +19,7 @@ package eu.faircode.email; Copyright 2018 by Marcel Bokhorst (M66B) */ +import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -1396,13 +1397,15 @@ public class FragmentMessages extends FragmentEx { } private void check() { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) - adapter.checkInternet(); - } - }); + Activity activity = getActivity(); + if (activity != null) + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) + adapter.checkInternet(); + } + }); } };