From 36f73d4c7e881a3ec42da5403a6bf18155cf717e Mon Sep 17 00:00:00 2001
From: Sam Steele <sam.steele@gmail.com>
Date: Fri, 31 Mar 2017 09:26:14 -0400
Subject: [PATCH] remove LeakCanary

---
 build.gradle                                              | 6 ------
 irccloud-android.iml                                      | 1 -
 release-src/com/irccloud/android/IRCCloudApplication.java | 5 -----
 res/xml/preferences_debug.xml                             | 6 ------
 src/com/irccloud/android/NetworkConnection.java           | 2 +-
 src/com/irccloud/android/RemoteInputService.java          | 8 --------
 .../irccloud/android/activity/PreferencesActivity.java    | 2 +-
 src/com/irccloud/android/fragment/AcceptListFragment.java | 1 -
 src/com/irccloud/android/fragment/AddChannelFragment.java | 1 -
 .../irccloud/android/fragment/BufferOptionsFragment.java  | 1 -
 .../irccloud/android/fragment/BuffersListFragment.java    | 4 ----
 .../irccloud/android/fragment/ChannelListFragment.java    | 1 -
 .../android/fragment/ChannelModeListFragment.java         | 1 -
 .../irccloud/android/fragment/ChannelOptionsFragment.java | 1 -
 .../irccloud/android/fragment/EditConnectionFragment.java | 1 -
 src/com/irccloud/android/fragment/IgnoreListFragment.java | 1 -
 .../irccloud/android/fragment/MessageViewFragment.java    | 4 ----
 src/com/irccloud/android/fragment/NamesListFragment.java  | 1 -
 src/com/irccloud/android/fragment/NickservFragment.java   | 3 ++-
 src/com/irccloud/android/fragment/UsersListFragment.java  | 4 ----
 src/com/irccloud/android/fragment/WhoListFragment.java    | 1 -
 src/com/irccloud/android/fragment/WhoisFragment.java      | 3 ++-
 22 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/build.gradle b/build.gradle
index 370b563cc..01d465343 100644
--- a/build.gradle
+++ b/build.gradle
@@ -348,10 +348,4 @@ dependencies {
         transitive = true;
     }
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    //debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-SNAPSHOT'
-
-    //enterprisedebugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-SNAPSHOT'
-    compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4'
-    enterprisereleaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4'
-    debugTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4'
 }
diff --git a/irccloud-android.iml b/irccloud-android.iml
index 4e93644e8..a609d57fb 100644
--- a/irccloud-android.iml
+++ b/irccloud-android.iml
@@ -112,7 +112,6 @@
     <orderEntry type="library" exported="" name="handy-uri-templates-2.0.2" level="project" />
     <orderEntry type="library" exported="" name="play-services-basement-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-25.2.0" level="project" />
-    <orderEntry type="library" exported="" name="leakcanary-android-no-op-1.4" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-25.2.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-gcm-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.2.0" level="project" />
diff --git a/release-src/com/irccloud/android/IRCCloudApplication.java b/release-src/com/irccloud/android/IRCCloudApplication.java
index 28507de96..6e6773ce7 100644
--- a/release-src/com/irccloud/android/IRCCloudApplication.java
+++ b/release-src/com/irccloud/android/IRCCloudApplication.java
@@ -17,7 +17,6 @@
 package com.irccloud.android;
 
 import android.content.Context;
-import com.squareup.leakcanary.RefWatcher;
 
 @SuppressWarnings("unused")
 public class IRCCloudApplication extends IRCCloudApplicationBase {
@@ -31,10 +30,6 @@ public static IRCCloudApplication getInstance() {
         }
     }
 
-    public static RefWatcher getRefWatcher(Context context) {
-        return RefWatcher.DISABLED;
-    }
-
     @Override
     public void onCreate() {
         instance = this;
diff --git a/res/xml/preferences_debug.xml b/res/xml/preferences_debug.xml
index 3c36efb63..54fb20cbf 100644
--- a/res/xml/preferences_debug.xml
+++ b/res/xml/preferences_debug.xml
@@ -17,12 +17,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory android:title="Debugging">
-        <com.cgollner.unclouded.preferences.SwitchPreferenceCompat
-            android:key="detect_leaks"
-            android:defaultValue="true"
-            android:summaryOn="Memory leaks will be caught and automatically reported via Crashlytics"
-            android:summaryOff="Memory leaks will be ignored"
-            android:title="Detect Memory Leaks" />
         <!--<com.cgollner.unclouded.preferences.SwitchPreferenceCompat
             android:key="background_sync"
             android:defaultValue="true"
diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
index 1319553fa..f166178ff 100644
--- a/src/com/irccloud/android/NetworkConnection.java
+++ b/src/com/irccloud/android/NetworkConnection.java
@@ -3094,7 +3094,7 @@ public String fetch(URL url, String postdata, String sk, String token, HashMap<S
             HttpsURLConnection https = (HttpsURLConnection) ((proxy != null) ? url.openConnection(proxy) : url.openConnection(Proxy.NO_PROXY));
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1 && url.getHost().equals(IRCCLOUD_HOST))
                 https.setSSLSocketFactory(IRCCloudSocketFactory);
-            else
+            else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
                 https.setSSLSocketFactory(TrustKit.getInstance().getSSLSocketFactory(url.getHost()));
             conn = https;
         } else {
diff --git a/src/com/irccloud/android/RemoteInputService.java b/src/com/irccloud/android/RemoteInputService.java
index cfa85864d..0bbfbe311 100644
--- a/src/com/irccloud/android/RemoteInputService.java
+++ b/src/com/irccloud/android/RemoteInputService.java
@@ -27,7 +27,6 @@
 import com.crashlytics.android.Crashlytics;
 import com.irccloud.android.data.collection.NotificationsList;
 import com.irccloud.android.data.collection.RecentConversationsList;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.json.JSONObject;
 
@@ -86,11 +85,4 @@ protected void onHandleIntent(Intent intent) {
             }
         }
     }
-
-    @Override public void onDestroy() {
-        super.onDestroy();
-        RefWatcher refWatcher = IRCCloudApplication.getRefWatcher(this);
-        if(refWatcher != null)
-            refWatcher.watch(this);
-    }
 }
diff --git a/src/com/irccloud/android/activity/PreferencesActivity.java b/src/com/irccloud/android/activity/PreferencesActivity.java
index 8a67337c4..92e42012e 100644
--- a/src/com/irccloud/android/activity/PreferencesActivity.java
+++ b/src/com/irccloud/android/activity/PreferencesActivity.java
@@ -245,7 +245,7 @@ public void onClick(View v) {
         if (foundSony)
             findPreference("notify_sony").setOnPreferenceChangeListener(sonytoggle);
         if(BuildConfig.DEBUG) {
-            addPreferencesFromResource(R.xml.preferences_debug);
+            //addPreferencesFromResource(R.xml.preferences_debug);
             /*findPreference("enable_cache").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object o) {
diff --git a/src/com/irccloud/android/fragment/AcceptListFragment.java b/src/com/irccloud/android/fragment/AcceptListFragment.java
index a3965f67d..0bfa4340b 100644
--- a/src/com/irccloud/android/fragment/AcceptListFragment.java
+++ b/src/com/irccloud/android/fragment/AcceptListFragment.java
@@ -43,7 +43,6 @@
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
 import com.irccloud.android.databinding.RowAcceptlistBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
diff --git a/src/com/irccloud/android/fragment/AddChannelFragment.java b/src/com/irccloud/android/fragment/AddChannelFragment.java
index ab1af3bc7..06622917e 100644
--- a/src/com/irccloud/android/fragment/AddChannelFragment.java
+++ b/src/com/irccloud/android/fragment/AddChannelFragment.java
@@ -38,7 +38,6 @@
 import com.irccloud.android.activity.EditConnectionActivity;
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
-import com.squareup.leakcanary.RefWatcher;
 
 import java.util.ArrayList;
 
diff --git a/src/com/irccloud/android/fragment/BufferOptionsFragment.java b/src/com/irccloud/android/fragment/BufferOptionsFragment.java
index e14124298..21df34190 100644
--- a/src/com/irccloud/android/fragment/BufferOptionsFragment.java
+++ b/src/com/irccloud/android/fragment/BufferOptionsFragment.java
@@ -35,7 +35,6 @@
 import com.irccloud.android.IRCCloudApplication;
 import com.irccloud.android.NetworkConnection;
 import com.irccloud.android.R;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.json.JSONException;
 import org.json.JSONObject;@SuppressLint("ValidFragment")
diff --git a/src/com/irccloud/android/fragment/BuffersListFragment.java b/src/com/irccloud/android/fragment/BuffersListFragment.java
index c0a29bfb4..046cbcba7 100644
--- a/src/com/irccloud/android/fragment/BuffersListFragment.java
+++ b/src/com/irccloud/android/fragment/BuffersListFragment.java
@@ -50,7 +50,6 @@
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
 import com.irccloud.android.databinding.RowBufferBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -675,9 +674,6 @@ public void onResume() {
         super.onDestroy();
         if (conn != null)
             conn.removeHandler(this);
-        RefWatcher refWatcher = IRCCloudApplication.getRefWatcher(getActivity());
-        if(refWatcher != null)
-            refWatcher.watch(this);
     }
 
     @Override
diff --git a/src/com/irccloud/android/fragment/ChannelListFragment.java b/src/com/irccloud/android/fragment/ChannelListFragment.java
index 671a19e4b..a94547c07 100644
--- a/src/com/irccloud/android/fragment/ChannelListFragment.java
+++ b/src/com/irccloud/android/fragment/ChannelListFragment.java
@@ -40,7 +40,6 @@
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
 import com.irccloud.android.databinding.RowChannelBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
diff --git a/src/com/irccloud/android/fragment/ChannelModeListFragment.java b/src/com/irccloud/android/fragment/ChannelModeListFragment.java
index 110b21dc1..9d12da87c 100644
--- a/src/com/irccloud/android/fragment/ChannelModeListFragment.java
+++ b/src/com/irccloud/android/fragment/ChannelModeListFragment.java
@@ -49,7 +49,6 @@
 import com.irccloud.android.data.model.User;
 import com.irccloud.android.data.collection.UsersList;
 import com.irccloud.android.databinding.RowChannelmodeBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
diff --git a/src/com/irccloud/android/fragment/ChannelOptionsFragment.java b/src/com/irccloud/android/fragment/ChannelOptionsFragment.java
index 891648cac..464d6f124 100644
--- a/src/com/irccloud/android/fragment/ChannelOptionsFragment.java
+++ b/src/com/irccloud/android/fragment/ChannelOptionsFragment.java
@@ -33,7 +33,6 @@
 import com.irccloud.android.IRCCloudApplication;
 import com.irccloud.android.NetworkConnection;
 import com.irccloud.android.R;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/src/com/irccloud/android/fragment/EditConnectionFragment.java b/src/com/irccloud/android/fragment/EditConnectionFragment.java
index 137d10f86..2e0fb6dc2 100644
--- a/src/com/irccloud/android/fragment/EditConnectionFragment.java
+++ b/src/com/irccloud/android/fragment/EditConnectionFragment.java
@@ -51,7 +51,6 @@
 import com.irccloud.android.R;
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/src/com/irccloud/android/fragment/IgnoreListFragment.java b/src/com/irccloud/android/fragment/IgnoreListFragment.java
index 31ae5bf0f..d837dfb00 100644
--- a/src/com/irccloud/android/fragment/IgnoreListFragment.java
+++ b/src/com/irccloud/android/fragment/IgnoreListFragment.java
@@ -44,7 +44,6 @@
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
 import com.irccloud.android.databinding.RowHostmaskBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
diff --git a/src/com/irccloud/android/fragment/MessageViewFragment.java b/src/com/irccloud/android/fragment/MessageViewFragment.java
index 46fe6d625..e7305318f 100644
--- a/src/com/irccloud/android/fragment/MessageViewFragment.java
+++ b/src/com/irccloud/android/fragment/MessageViewFragment.java
@@ -97,7 +97,6 @@
 import com.irccloud.android.data.collection.EventsList;
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.fragment.BuffersListFragment.OnBufferSelectedListener;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -2056,9 +2055,6 @@ public void onStart() {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        RefWatcher refWatcher = IRCCloudApplication.getRefWatcher(getActivity());
-        if (refWatcher != null)
-            refWatcher.watch(this);
         if (tapTimer != null) {
             tapTimer.cancel();
             tapTimer = null;
diff --git a/src/com/irccloud/android/fragment/NamesListFragment.java b/src/com/irccloud/android/fragment/NamesListFragment.java
index 47de7ed21..50ff07648 100644
--- a/src/com/irccloud/android/fragment/NamesListFragment.java
+++ b/src/com/irccloud/android/fragment/NamesListFragment.java
@@ -38,7 +38,6 @@
 import com.irccloud.android.NetworkConnection;
 import com.irccloud.android.R;
 import com.irccloud.android.databinding.RowWhoBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
diff --git a/src/com/irccloud/android/fragment/NickservFragment.java b/src/com/irccloud/android/fragment/NickservFragment.java
index f1734852d..6123bf2ff 100644
--- a/src/com/irccloud/android/fragment/NickservFragment.java
+++ b/src/com/irccloud/android/fragment/NickservFragment.java
@@ -36,7 +36,8 @@
 import com.irccloud.android.R;
 import com.irccloud.android.data.model.Server;
 import com.irccloud.android.data.collection.ServersList;
-import com.squareup.leakcanary.RefWatcher;public class NickservFragment extends DialogFragment {
+
+public class NickservFragment extends DialogFragment {
     Server server;
     EditText pass;
     TextView nick;
diff --git a/src/com/irccloud/android/fragment/UsersListFragment.java b/src/com/irccloud/android/fragment/UsersListFragment.java
index cc219dd2e..20c17baab 100644
--- a/src/com/irccloud/android/fragment/UsersListFragment.java
+++ b/src/com/irccloud/android/fragment/UsersListFragment.java
@@ -44,7 +44,6 @@
 import com.irccloud.android.data.model.User;
 import com.irccloud.android.data.collection.UsersList;
 import com.irccloud.android.databinding.RowUserBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -347,9 +346,6 @@ public void onResume() {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        RefWatcher refWatcher = IRCCloudApplication.getRefWatcher(getActivity());
-        if (refWatcher != null)
-            refWatcher.watch(this);
         if (tapTimer != null) {
             tapTimer.cancel();
             tapTimer = null;
diff --git a/src/com/irccloud/android/fragment/WhoListFragment.java b/src/com/irccloud/android/fragment/WhoListFragment.java
index ad90067aa..89e45cc62 100644
--- a/src/com/irccloud/android/fragment/WhoListFragment.java
+++ b/src/com/irccloud/android/fragment/WhoListFragment.java
@@ -43,7 +43,6 @@
 import com.irccloud.android.NetworkConnection;
 import com.irccloud.android.R;
 import com.irccloud.android.databinding.RowWhoBinding;
-import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
diff --git a/src/com/irccloud/android/fragment/WhoisFragment.java b/src/com/irccloud/android/fragment/WhoisFragment.java
index 1eb01f99a..999ba699d 100644
--- a/src/com/irccloud/android/fragment/WhoisFragment.java
+++ b/src/com/irccloud/android/fragment/WhoisFragment.java
@@ -39,7 +39,8 @@
 import com.irccloud.android.IRCCloudLinkMovementMethod;
 import com.irccloud.android.R;
 import com.irccloud.android.data.collection.ServersList;
-import com.squareup.leakcanary.RefWatcher;public class WhoisFragment extends DialogFragment {
+
+public class WhoisFragment extends DialogFragment {
     IRCCloudJSONObject event;
     TextView extra, name, mask, server, time, timeTitle, channels, channelsTitle, opChannels, opTitle,
             operChannels, operTitle, ownerChannels, ownerTitle, adminChannels, adminTitle, halfopChannels, halfopTitle, voicedChannels, voicedTitle, awayTitle, away;