Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand null check to include isAdded() check

Browse Source 
Also, don't call `getActivity()` in the separate thread. Instead, use the
`Activity` which we have already checked and ensured is not null.
This commit is contained in:
Peter Serwylo 2016-03-07 22:44:17 +11:00
parent 3c33e55fd3
commit 7421d33c3a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
View File

@ -82,18 +82,14 @@ public class AvailableAppsFragment extends AppListFragment implements
// me that "Only the original thread that created a view // me that "Only the original thread that created a view
// hierarchy can touch its views." // hierarchy can touch its views."
final Activity activity = getActivity(); final Activity activity = getActivity();
// this nullguard is temporary, this Fragment really needs to merged into the Activity if (!isAdded() || adapter == null || activity == null) {
if (activity == null) {
return; return;
} }
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
if (adapter == null) {
return;
}
adapter.clear(); adapter.clear();
categories = AppProvider.Helper.categories(getActivity()); categories = AppProvider.Helper.categories(activity);
ArrayAdapterCompat.addAll(adapter, translateCategories(categories)); ArrayAdapterCompat.addAll(adapter, translateCategories(categories));
} }
}); });