remove LeakCanary

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'
 }

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" />

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;

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"

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 {

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);
-    }
 }

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) {

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;
 

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;
 

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")

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

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;
 

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;
 

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;

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;

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;
 

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;

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;
 

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;

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;

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;
 

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;