From 7421d33c3ae832ebe31a24b280bb4be566a55fa3 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Mon, 7 Mar 2016 22:44:17 +1100 Subject: [PATCH] Expand null check to include `isAdded()` check Also, don't call `getActivity()` in the separate thread. Instead, use the `Activity` which we have already checked and ensured is not null. --- .../fdroid/views/fragments/AvailableAppsFragment.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index f0b595f08..ad75ec25c 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -82,18 +82,14 @@ public class AvailableAppsFragment extends AppListFragment implements // me that "Only the original thread that created a view // hierarchy can touch its views." final Activity activity = getActivity(); - // this nullguard is temporary, this Fragment really needs to merged into the Activity - if (activity == null) { + if (!isAdded() || adapter == null || activity == null) { return; } activity.runOnUiThread(new Runnable() { @Override public void run() { - if (adapter == null) { - return; - } adapter.clear(); - categories = AppProvider.Helper.categories(getActivity()); + categories = AppProvider.Helper.categories(activity); ArrayAdapterCompat.addAll(adapter, translateCategories(categories)); } });