Commit 4cabb3ad authored by Geoffrey Métais's avatar Geoffrey Métais

Prevent NPE when VLC Application is null

parent 6cf341d5
...@@ -23,6 +23,7 @@ package org.videolan.vlc.gui.audio; ...@@ -23,6 +23,7 @@ package org.videolan.vlc.gui.audio;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
...@@ -32,6 +33,7 @@ import android.support.annotation.MainThread; ...@@ -32,6 +33,7 @@ import android.support.annotation.MainThread;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -144,7 +146,8 @@ public class AudioBrowserFragment extends BaseAudioBrowser implements SwipeRefre ...@@ -144,7 +146,8 @@ public class AudioBrowserFragment extends BaseAudioBrowser implements SwipeRefre
}; };
mViewPager.setOffscreenPageLimit(MODE_TOTAL - 1); mViewPager.setOffscreenPageLimit(MODE_TOTAL - 1);
mViewPager.setAdapter(new AudioPagerAdapter(mLists, titles)); mViewPager.setAdapter(new AudioPagerAdapter(mLists, titles));
mViewPager.setCurrentItem(VLCApplication.getSettings().getInt(Constants.KEY_AUDIO_CURRENT_TAB, 0)); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
mViewPager.setCurrentItem(prefs.getInt(Constants.KEY_AUDIO_CURRENT_TAB, 0));
final RecyclerView.RecycledViewPool rvp = new RecyclerView.RecycledViewPool(); final RecyclerView.RecycledViewPool rvp = new RecyclerView.RecycledViewPool();
for (int i = 0; i< MODE_TOTAL; ++i) { for (int i = 0; i< MODE_TOTAL; ++i) {
final LinearLayoutManager llm = new LinearLayoutManager(getActivity()); final LinearLayoutManager llm = new LinearLayoutManager(getActivity());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment