solve merge conflict

app/src/main/java/org/schabi/newpipe/App.java

@@ -5,11 +5,14 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
 
 import org.acra.ACRA;
 import org.acra.config.ACRAConfiguration;
@@ -54,6 +57,7 @@ import io.reactivex.plugins.RxJavaPlugins;
 
 public class App extends Application {
     protected static final String TAG = App.class.toString();
+    private RefWatcher refWatcher;
 
     @SuppressWarnings("unchecked")
     private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
@@ -69,6 +73,13 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
 
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        refWatcher = installLeakCanary();
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
@@ -157,4 +168,13 @@ public class App extends Application {
         mNotificationManager.createNotificationChannel(mChannel);
     }
 
+    @Nullable
+    public static RefWatcher getRefWatcher(Context context) {
+        final App application = (App) context.getApplicationContext();
+        return application.refWatcher;
+    }
+
+    protected RefWatcher installLeakCanary() {
+        return RefWatcher.DISABLED;
+    }
 }

app/src/main/java/org/schabi/newpipe/BaseFragment.java

@@ -13,6 +13,7 @@ import android.view.View;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+import com.squareup.leakcanary.RefWatcher;
 
 import icepick.Icepick;
 
@@ -67,6 +68,14 @@ public abstract class BaseFragment extends Fragment {
     protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        RefWatcher refWatcher = App.getRefWatcher(getActivity());
+        if (refWatcher != null) refWatcher.watch(this);
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -20,12 +20,14 @@
 
 package org.schabi.newpipe;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.GravityCompat;
@@ -39,6 +41,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.fragments.BackPressable;
@@ -211,6 +214,22 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    @SuppressLint("ShowToast")
+    private void onHeapDumpToggled(@NonNull MenuItem item) {
+        final boolean isHeapDumpEnabled = !item.isChecked();
+
+        PreferenceManager.getDefaultSharedPreferences(this).edit()
+                .putBoolean(getString(R.string.allow_heap_dumping_key), isHeapDumpEnabled).apply();
+        item.setChecked(isHeapDumpEnabled);
+
+        final String heapDumpNotice;
+        if (isHeapDumpEnabled) {
+            heapDumpNotice = getString(R.string.enable_leak_canary_notice);
+        } else {
+            heapDumpNotice = getString(R.string.disable_leak_canary_notice);
+        }
+        Toast.makeText(getApplicationContext(), heapDumpNotice, Toast.LENGTH_SHORT).show();
+    }
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -232,6 +251,10 @@ public class MainActivity extends AppCompatActivity {
             inflater.inflate(R.menu.main_menu, menu);
         }
 
+        if (DEBUG) {
+            getMenuInflater().inflate(R.menu.debug_menu, menu);
+        }
+
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(false);
@@ -242,6 +265,17 @@ public class MainActivity extends AppCompatActivity {
         return true;
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem heapDumpToggle = menu.findItem(R.id.action_toggle_heap_dump);
+        if (heapDumpToggle != null) {
+            final boolean isToggled = PreferenceManager.getDefaultSharedPreferences(this)
+                    .getBoolean(getString(R.string.allow_heap_dumping_key), false);
+            heapDumpToggle.setChecked(isToggled);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
@@ -262,6 +296,9 @@ public class MainActivity extends AppCompatActivity {
             case R.id.action_history:
                 NavigationHelper.openHistory(this);
                 return true;
+            case R.id.action_toggle_heap_dump:
+                onHeapDumpToggled(item);
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }