Removed LeakCanary

This commit is contained in:
Karim Abou Zeid 2015-12-30 16:18:33 +01:00
commit 5aebf4709a
18 changed files with 26 additions and 75 deletions

View file

@ -108,8 +108,6 @@ dependencies {
transitive = true transitive = true
} }
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
compile 'com.android.support:support-v4:23.1.1' compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:support-v13:23.1.1' compile 'com.android.support:support-v13:23.1.1'
compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:appcompat-v7:23.1.1'

View file

@ -1,7 +1,6 @@
package com.kabouzeid.gramophone; package com.kabouzeid.gramophone;
import android.app.Application; import android.app.Application;
import android.content.Context;
import com.crashlytics.android.Crashlytics; import com.crashlytics.android.Crashlytics;
import com.kabouzeid.gramophone.imageloader.PhonographExecutor; import com.kabouzeid.gramophone.imageloader.PhonographExecutor;
@ -9,8 +8,6 @@ import com.kabouzeid.gramophone.imageloader.PhonographImageDownloader;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.utils.L; import com.nostra13.universalimageloader.utils.L;
import com.squareup.leakcanary.LeakCanary;
import com.squareup.leakcanary.RefWatcher;
import io.fabric.sdk.android.Fabric; import io.fabric.sdk.android.Fabric;
@ -22,21 +19,12 @@ public class App extends Application {
public static final String GOOGLE_PLAY_LICENSE_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjMeADN5Ffnt/ml5SYxNPCn8kGcOYGpHEfNSCts99vVxqmCn6C01E94c17j7rUK2aeHur5uxphZylzopPlQ8P8l1fqty0GPUNRSo18FCJzfGH8HZAwZYOcnRFPaXdaq3InyFJhBiODh2oeAcVK/idH6QraQ4r9HIlzigAg6lgwzxl2wJKDh7X/GMdDntCyzDh8xDQ0wIawFgvgojHwqh2Ci8Gnq6EYRwPA9yHiIIksT8Q30QyM5ewl5QcnWepsls7enNqeHarhpmSibRUDgCsxHoOpny7SyuvZvUI3wuLckDR0ds9hrt614scHHqDOBp/qWCZiAgOPVAEQcURbV09qQIDAQAB"; public static final String GOOGLE_PLAY_LICENSE_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjMeADN5Ffnt/ml5SYxNPCn8kGcOYGpHEfNSCts99vVxqmCn6C01E94c17j7rUK2aeHur5uxphZylzopPlQ8P8l1fqty0GPUNRSo18FCJzfGH8HZAwZYOcnRFPaXdaq3InyFJhBiODh2oeAcVK/idH6QraQ4r9HIlzigAg6lgwzxl2wJKDh7X/GMdDntCyzDh8xDQ0wIawFgvgojHwqh2Ci8Gnq6EYRwPA9yHiIIksT8Q30QyM5ewl5QcnWepsls7enNqeHarhpmSibRUDgCsxHoOpny7SyuvZvUI3wuLckDR0ds9hrt614scHHqDOBp/qWCZiAgOPVAEQcURbV09qQIDAQAB";
private RefWatcher refWatcher;
public static RefWatcher getRefWatcher(Context context) {
App application = (App) context.getApplicationContext();
return application.refWatcher;
}
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
if (!BuildConfig.DEBUG) Fabric.with(this, new Crashlytics()); if (!BuildConfig.DEBUG) Fabric.with(this, new Crashlytics());
refWatcher = LeakCanary.install(this);
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this) ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this)
.imageDownloader(new PhonographImageDownloader(this)) .imageDownloader(new PhonographImageDownloader(this))
.taskExecutor(new PhonographExecutor()) .taskExecutor(new PhonographExecutor())

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.view.View; import android.view.View;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@ -18,7 +19,7 @@ import java.util.List;
/** /**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/ */
public class AddToPlaylistDialog extends LeakDetectDialogFragment { public class AddToPlaylistDialog extends DialogFragment {
@NonNull @NonNull
public static AddToPlaylistDialog create(Song song) { public static AddToPlaylistDialog create(Song song) {

View file

@ -7,6 +7,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.view.InflateException; import android.view.InflateException;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -25,7 +26,7 @@ import java.io.InputStreamReader;
/** /**
* @author Aidan Follestad (afollestad) * @author Aidan Follestad (afollestad)
*/ */
public class ChangelogDialog extends LeakDetectDialogFragment { public class ChangelogDialog extends DialogFragment {
public static ChangelogDialog create() { public static ChangelogDialog create() {
return new ChangelogDialog(); return new ChangelogDialog();

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
@ -13,7 +14,7 @@ import com.kabouzeid.gramophone.model.smartplaylist.AbsSmartPlaylist;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class ClearSmartPlaylistDialog extends LeakDetectDialogFragment { public class ClearSmartPlaylistDialog extends DialogFragment {
@NonNull @NonNull
public static ClearSmartPlaylistDialog create(AbsSmartPlaylist playlist) { public static ClearSmartPlaylistDialog create(AbsSmartPlaylist playlist) {

View file

@ -4,6 +4,7 @@ import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.text.InputType; import android.text.InputType;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@ -16,7 +17,7 @@ import java.util.ArrayList;
/** /**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/ */
public class CreatePlaylistDialog extends LeakDetectDialogFragment { public class CreatePlaylistDialog extends DialogFragment {
@NonNull @NonNull
public static CreatePlaylistDialog create() { public static CreatePlaylistDialog create() {

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
@ -16,7 +17,7 @@ import java.util.ArrayList;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class DeletePlaylistDialog extends LeakDetectDialogFragment { public class DeletePlaylistDialog extends DialogFragment {
@NonNull @NonNull
public static DeletePlaylistDialog create(Playlist playlist) { public static DeletePlaylistDialog create(Playlist playlist) {

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
@ -16,7 +17,7 @@ import java.util.ArrayList;
/** /**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/ */
public class DeleteSongsDialog extends LeakDetectDialogFragment { public class DeleteSongsDialog extends DialogFragment {
@NonNull @NonNull
public static DeleteSongsDialog create(Song song) { public static DeleteSongsDialog create(Song song) {

View file

@ -7,6 +7,7 @@ import android.graphics.Paint;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -39,7 +40,7 @@ import butterknife.ButterKnife;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class DonationDialog extends LeakDetectDialogFragment implements BillingProcessor.IBillingHandler { public class DonationDialog extends DialogFragment implements BillingProcessor.IBillingHandler {
public static final String TAG = DonationDialog.class.getSimpleName(); public static final String TAG = DonationDialog.class.getSimpleName();
private static final int DONATION_PRODUCT_IDS = R.array.donation_ids; private static final int DONATION_PRODUCT_IDS = R.array.donation_ids;

View file

@ -1,21 +0,0 @@
package com.kabouzeid.gramophone.dialogs;
import android.support.v4.app.DialogFragment;
import com.kabouzeid.gramophone.App;
import com.squareup.leakcanary.RefWatcher;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class LeakDetectDialogFragment extends DialogFragment {
@Override
public void onDestroy() {
super.onDestroy();
if (getActivity() != null) {
RefWatcher refWatcher = App.getRefWatcher(getActivity());
refWatcher.watch(this);
}
}
}

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.Html; import android.text.Html;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
@ -16,7 +17,7 @@ import java.util.ArrayList;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class RemoveFromPlaylistDialog extends LeakDetectDialogFragment { public class RemoveFromPlaylistDialog extends DialogFragment {
@NonNull @NonNull
public static RemoveFromPlaylistDialog create(PlaylistSong song) { public static RemoveFromPlaylistDialog create(PlaylistSong song) {

View file

@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.InputType; import android.text.InputType;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@ -12,7 +13,7 @@ import com.kabouzeid.gramophone.util.PlaylistsUtil;
/** /**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/ */
public class RenamePlaylistDialog extends LeakDetectDialogFragment { public class RenamePlaylistDialog extends DialogFragment {
@NonNull @NonNull
public static RenamePlaylistDialog create(long playlistId) { public static RenamePlaylistDialog create(long playlistId) {

View file

@ -13,6 +13,7 @@ import android.os.Bundle;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -34,7 +35,7 @@ import butterknife.ButterKnife;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class SleepTimerDialog extends LeakDetectDialogFragment { public class SleepTimerDialog extends DialogFragment {
@Bind(R.id.seek_arc) @Bind(R.id.seek_arc)
SeekArc seekArc; SeekArc seekArc;
@Bind(R.id.timer_display) @Bind(R.id.timer_display)

View file

@ -5,6 +5,7 @@ import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.text.Html; import android.text.Html;
import android.text.Spanned; import android.text.Spanned;
import android.util.Log; import android.util.Log;
@ -30,7 +31,7 @@ import java.io.IOException;
/** /**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/ */
public class SongDetailDialog extends LeakDetectDialogFragment { public class SongDetailDialog extends DialogFragment {
public static final String TAG = SongDetailDialog.class.getSimpleName(); public static final String TAG = SongDetailDialog.class.getSimpleName();

View file

@ -4,6 +4,7 @@ import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.view.View; import android.view.View;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@ -14,7 +15,7 @@ import com.kabouzeid.gramophone.util.MusicUtil;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class SongShareDialog extends LeakDetectDialogFragment { public class SongShareDialog extends DialogFragment {
@NonNull @NonNull
public static SongShareDialog create(final Song song) { public static SongShareDialog create(final Song song) {
final SongShareDialog dialog = new SongShareDialog(); final SongShareDialog dialog = new SongShareDialog();

View file

@ -1,20 +0,0 @@
package com.kabouzeid.gramophone.ui.fragments;
import android.support.v4.app.Fragment;
import com.kabouzeid.gramophone.App;
import com.squareup.leakcanary.RefWatcher;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class LeakDetectFragment extends Fragment {
@Override
public void onDestroy() {
super.onDestroy();
if (getActivity() != null) {
RefWatcher refWatcher = App.getRefWatcher(getActivity());
refWatcher.watch(this);
}
}
}

View file

@ -2,15 +2,15 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
import com.kabouzeid.gramophone.ui.activities.MainActivity; import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.ui.fragments.LeakDetectFragment;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public abstract class AbsMainActivityFragment extends LeakDetectFragment implements KabViewsDisableAble { public abstract class AbsMainActivityFragment extends Fragment implements KabViewsDisableAble {
private boolean areViewsEnabled; private boolean areViewsEnabled;
@NonNull @NonNull

View file

@ -28,12 +28,6 @@
<copyright>Copyright 2016 Aidan Follestad</copyright> <copyright>Copyright 2016 Aidan Follestad</copyright>
<license>Apache Software License 2.0</license> <license>Apache Software License 2.0</license>
</notice> </notice>
<notice>
<name>LeakCanary</name>
<url>https://github.com/square/leakcanary</url>
<copyright>Copyright 2015 Square, Inc.</copyright>
<license>Apache Software License 2.0</license>
</notice>
<notice> <notice>
<name>Android Support Libraries</name> <name>Android Support Libraries</name>
<url>http://developer.android.com/tools/support-library/index.html</url> <url>http://developer.android.com/tools/support-library/index.html</url>