From 6e5408848fd911d23b9f85698df4da41db079baa Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 29 Mar 2016 18:27:36 +0200 Subject: [PATCH] Fixed to NPEs. --- .../ui/fragments/mainactivity/library/LibraryFragment.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java index 475a4756..ae199bf0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java @@ -1,6 +1,7 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivity.library; +import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; @@ -174,13 +175,17 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde menu.removeItem(R.id.action_grid_size); menu.removeItem(R.id.action_colored_footers); } + Activity activity = getActivity(); + if (activity == null) return; ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(toolbar)); } @Override public void onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - ToolbarContentTintHelper.handleOnPrepareOptionsMenu(getActivity(), toolbar); + Activity activity = getActivity(); + if (activity == null) return; + ToolbarContentTintHelper.handleOnPrepareOptionsMenu(activity, toolbar); } @Override