From 7a66fbddd96da475f0bff6d4eccfee30a06a40c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Thu, 25 Aug 2016 13:24:02 +0200 Subject: [PATCH] Prevent NPE on TV browsers --- .../videolan/vlc/gui/tv/browser/SortedBrowserFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/browser/SortedBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/tv/browser/SortedBrowserFragment.java index eab682cc1..c22e99dad 100644 --- a/vlc-android/src/org/videolan/vlc/gui/tv/browser/SortedBrowserFragment.java +++ b/vlc-android/src/org/videolan/vlc/gui/tv/browser/SortedBrowserFragment.java @@ -24,6 +24,7 @@ package org.videolan.vlc.gui.tv.browser; import android.annotation.TargetApi; +import android.app.Activity; import android.content.Intent; import android.os.Build; import android.os.Bundle; @@ -181,11 +182,14 @@ public abstract class SortedBrowserFragment extends BrowseFragment implements Br @Override public void updateList() { + Activity activity = getActivity(); + if (activity == null) + return; mAdapter.clear(); ArrayObjectAdapter adapter; HeaderItem header; for (ListItem item : mMediaItemMap.values()){ - adapter = new ArrayObjectAdapter(new CardPresenter(getActivity())); + adapter = new ArrayObjectAdapter(new CardPresenter(activity)); header = new HeaderItem(0, item.Letter); adapter.addAll(0, item.mediaList); mAdapter.add(new ListRow(header, adapter)); -- GitLab