From 289d7a84d6b10d974c2f8db4ce524235f0a26726 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Wed, 10 May 2023 12:14:06 -0400 Subject: [PATCH] fix rare NPE Signed-off-by: androidacy-user --- app/src/main/java/com/fox2code/mmm/MainActivity.java | 9 ++++++--- .../com/fox2code/mmm/markdown/MarkdownActivity.java | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java index 3d001d4..38eec29 100644 --- a/app/src/main/java/com/fox2code/mmm/MainActivity.java +++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java @@ -64,7 +64,6 @@ import timber.log.Timber; public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRefreshListener, SearchView.OnQueryTextListener, SearchView.OnCloseListener, OverScrollManager.OverScrollHelper { private static final int PRECISION = 10000; - private static MainActivity INSTANCE; public static boolean doSetupNowRunning = true; public static boolean doSetupRestarting = false; public static List localModuleInfoList = new ArrayList<>(); @@ -491,8 +490,12 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe if (MainApplication.isBlurEnabled()) { // set bottom navigation bar color to transparent blur BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation); - bottomNavigationView.setBackgroundColor(Color.TRANSPARENT); - bottomNavigationView.setAlpha(0.8F); + if (bottomNavigationView != null) { + bottomNavigationView.setBackgroundColor(Color.TRANSPARENT); + bottomNavigationView.setAlpha(0.8F); + } else { + Timber.w("Bottom navigation view not found"); + } // set dialogs to have transparent blur getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); } diff --git a/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java b/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java index 6ec1519..5750273 100644 --- a/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java +++ b/app/src/main/java/com/fox2code/mmm/markdown/MarkdownActivity.java @@ -32,6 +32,7 @@ import org.matomo.sdk.extra.TrackHelper; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashMap; +import java.util.Objects; import timber.log.Timber; @@ -77,7 +78,7 @@ public class MarkdownActivity extends FoxActivity { this.forceBackPressed(); return; } - String url = intent.getExtras().getString(Constants.EXTRA_MARKDOWN_URL); + String url = Objects.requireNonNull(intent.getExtras()).getString(Constants.EXTRA_MARKDOWN_URL); String title = intent.getExtras().getString(Constants.EXTRA_MARKDOWN_TITLE); String config = intent.getExtras().getString(Constants.EXTRA_MARKDOWN_CONFIG); boolean change_boot = intent.getExtras().getBoolean(Constants.EXTRA_MARKDOWN_CHANGE_BOOT); @@ -152,8 +153,12 @@ public class MarkdownActivity extends FoxActivity { if (MainApplication.isBlurEnabled()) { // set bottom navigation bar color to transparent blur BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation); - bottomNavigationView.setBackgroundColor(Color.TRANSPARENT); - bottomNavigationView.setAlpha(0.8F); + if (bottomNavigationView != null) { + bottomNavigationView.setBackgroundColor(Color.TRANSPARENT); + bottomNavigationView.setAlpha(0.8F); + } else { + Timber.w("Bottom navigation view not found"); + } // set dialogs to have transparent blur getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); }