From e8bb7da906fc7ef9ce1b8dba55876dec2a98daf9 Mon Sep 17 00:00:00 2001
From: Somethingweirdhere <gtp@g.com>
Date: Thu, 12 Jul 2018 00:41:59 +0200
Subject: [PATCH] Put listener initialization into onCreate

---
 .../newpipe/fragments/MainFragment.java       | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
index bc18bacca..a920ecfe6 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,7 +9,6 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -20,22 +18,15 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.BaseFragment;
-import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.kiosk.KioskList;
 import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
-import org.schabi.newpipe.local.feed.FeedFragment;
 import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
 import org.schabi.newpipe.local.bookmark.BookmarkFragment;
+import org.schabi.newpipe.local.feed.FeedFragment;
 import org.schabi.newpipe.local.history.StatisticsPlaylistFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionFragment;
 import org.schabi.newpipe.report.ErrorActivity;
@@ -46,12 +37,9 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.schabi.newpipe.util.NavigationHelper.MAIN_FRAGMENT_TAG;
-
 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
 
     public int currentServiceId = -1;
@@ -70,11 +58,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     private static final String TAB_NUMBER_HISTORY = "5";
     private static final String TAB_NUMBER_CHANNEL = "6";
 
-    SharedPreferences.OnSharedPreferenceChangeListener listener = (prefs, key) -> {
-        if(key.equals("saveUsedTabs")) {
-            mainPageChanged();
-        }
-    };
+    SharedPreferences.OnSharedPreferenceChangeListener listener;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's LifeCycle
@@ -85,6 +69,11 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         savedInstanceStateBundle = savedInstanceState;
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        listener = (prefs, key) -> {
+            if(key.equals("saveUsedTabs")) {
+                mainPageChanged();
+            }
+        };
     }
 
     @Override