diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/management/ServiceWatcherUtil.java b/app/src/main/java/com/amaze/filemanager/asynchronous/management/ServiceWatcherUtil.java index 38030c793a..5cc17c1685 100644 --- a/app/src/main/java/com/amaze/filemanager/asynchronous/management/ServiceWatcherUtil.java +++ b/app/src/main/java/com/amaze/filemanager/asynchronous/management/ServiceWatcherUtil.java @@ -47,6 +47,7 @@ import android.content.Intent; import android.text.format.Formatter; +import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; public class ServiceWatcherUtil { @@ -194,15 +195,15 @@ public void stopWatch() { * closed as there are higher chances for android system to GC the thread when it is running low * on memory */ - public static synchronized void runService(final Context context, final Intent intent) { + public static synchronized void runService(@Nullable final Context context, final Intent intent) { switch (pendingIntents.size()) { case 0: - context.startService(intent); + if (context != null) context.startService(intent); break; case 1: // initialize waiting handlers pendingIntents.add(intent); - postWaiting(context); + if (context != null) postWaiting(context); break; case 2: // to avoid notifying repeatedly diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/files/EncryptDecryptUtils.java b/app/src/main/java/com/amaze/filemanager/filesystem/files/EncryptDecryptUtils.java index 5355727bf1..66ce02a424 100644 --- a/app/src/main/java/com/amaze/filemanager/filesystem/files/EncryptDecryptUtils.java +++ b/app/src/main/java/com/amaze/filemanager/filesystem/files/EncryptDecryptUtils.java @@ -117,7 +117,7 @@ public static void decryptFile( (dialog, which) -> { AppCompatEditText editText = dialog.getView().findViewById(R.id.singleedittext_input); decryptIntent.putExtra(EncryptService.TAG_PASSWORD, editText.getText().toString()); - ServiceWatcherUtil.runService(main.getContext(), decryptIntent); + ServiceWatcherUtil.runService(c, decryptIntent); dialog.dismiss(); }, null); @@ -142,7 +142,7 @@ public static void decryptFile( new DecryptButtonCallbackInterface() { @Override public void confirm(Intent intent) { - ServiceWatcherUtil.runService(main.getContext(), intent); + ServiceWatcherUtil.runService(c, intent); } @Override