From 8b9e2ea33f8fa18a9c579b190220ab9df79760cc Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 28 Feb 2023 11:25:42 -0300 Subject: [PATCH] [app] don't show app details menu before the app and its preferences haven't been loaded Fixes acra-crash-reports#185, acra-crash-reports#197 --- .../main/java/org/fdroid/fdroid/views/AppDetailsActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java index 10165a904..a8082d407 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java @@ -244,7 +244,8 @@ public class AppDetailsActivity extends AppCompatActivity public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); final AppPrefs prefs = appPrefs; - if (prefs == null) return true; + // don't show menu before appPrefs haven't been loaded + if (prefs == null || app == null) return false; MenuItem itemIgnoreAll = menu.findItem(R.id.action_ignore_all); itemIgnoreAll.setChecked(prefs.getIgnoreAllUpdates());