diff --git a/app/build.gradle b/app/build.gradle index 19896c91..48793dfa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,8 +108,6 @@ dependencies { 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-v13:23.1.1' compile 'com.android.support:appcompat-v7:23.1.1' diff --git a/app/src/main/java/com/kabouzeid/gramophone/App.java b/app/src/main/java/com/kabouzeid/gramophone/App.java index 7e40ff43..5ad41ca9 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/App.java +++ b/app/src/main/java/com/kabouzeid/gramophone/App.java @@ -1,7 +1,6 @@ package com.kabouzeid.gramophone; import android.app.Application; -import android.content.Context; import com.crashlytics.android.Crashlytics; 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.ImageLoaderConfiguration; import com.nostra13.universalimageloader.utils.L; -import com.squareup.leakcanary.LeakCanary; -import com.squareup.leakcanary.RefWatcher; 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"; - private RefWatcher refWatcher; - - public static RefWatcher getRefWatcher(Context context) { - App application = (App) context.getApplicationContext(); - return application.refWatcher; - } - @Override public void onCreate() { super.onCreate(); if (!BuildConfig.DEBUG) Fabric.with(this, new Crashlytics()); - refWatcher = LeakCanary.install(this); - ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this) .imageDownloader(new PhonographImageDownloader(this)) .taskExecutor(new PhonographExecutor()) diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java index e98d495f..ac96afed 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java @@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.view.View; import com.afollestad.materialdialogs.MaterialDialog; @@ -18,7 +19,7 @@ import java.util.List; /** * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) */ -public class AddToPlaylistDialog extends LeakDetectDialogFragment { +public class AddToPlaylistDialog extends DialogFragment { @NonNull public static AddToPlaylistDialog create(Song song) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java index 449756f5..99e235c1 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java @@ -7,6 +7,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.view.InflateException; import android.view.LayoutInflater; import android.view.View; @@ -25,7 +26,7 @@ import java.io.InputStreamReader; /** * @author Aidan Follestad (afollestad) */ -public class ChangelogDialog extends LeakDetectDialogFragment { +public class ChangelogDialog extends DialogFragment { public static ChangelogDialog create() { return new ChangelogDialog(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java index 02e60c3b..d71fa011 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java @@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.text.Html; import com.afollestad.materialdialogs.DialogAction; @@ -13,7 +14,7 @@ import com.kabouzeid.gramophone.model.smartplaylist.AbsSmartPlaylist; /** * @author Karim Abou Zeid (kabouzeid) */ -public class ClearSmartPlaylistDialog extends LeakDetectDialogFragment { +public class ClearSmartPlaylistDialog extends DialogFragment { @NonNull public static ClearSmartPlaylistDialog create(AbsSmartPlaylist playlist) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java index 74e0a5f6..937fb4df 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java @@ -4,6 +4,7 @@ import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; import android.text.InputType; import com.afollestad.materialdialogs.MaterialDialog; @@ -16,7 +17,7 @@ import java.util.ArrayList; /** * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) */ -public class CreatePlaylistDialog extends LeakDetectDialogFragment { +public class CreatePlaylistDialog extends DialogFragment { @NonNull public static CreatePlaylistDialog create() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java index 79519dfa..ea69ddaf 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java @@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.text.Html; import com.afollestad.materialdialogs.DialogAction; @@ -16,7 +17,7 @@ import java.util.ArrayList; /** * @author Karim Abou Zeid (kabouzeid) */ -public class DeletePlaylistDialog extends LeakDetectDialogFragment { +public class DeletePlaylistDialog extends DialogFragment { @NonNull public static DeletePlaylistDialog create(Playlist playlist) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java index 3405bc6b..da7ef178 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java @@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.text.Html; import com.afollestad.materialdialogs.DialogAction; @@ -16,7 +17,7 @@ import java.util.ArrayList; /** * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) */ -public class DeleteSongsDialog extends LeakDetectDialogFragment { +public class DeleteSongsDialog extends DialogFragment { @NonNull public static DeleteSongsDialog create(Song song) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationDialog.java index 55174802..37e0ea63 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationDialog.java @@ -7,6 +7,7 @@ import android.graphics.Paint; import android.os.Bundle; import android.support.annotation.LayoutRes; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -39,7 +40,7 @@ import butterknife.ButterKnife; /** * @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(); private static final int DONATION_PRODUCT_IDS = R.array.donation_ids; diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/LeakDetectDialogFragment.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/LeakDetectDialogFragment.java deleted file mode 100644 index 6dd34b33..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/LeakDetectDialogFragment.java +++ /dev/null @@ -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); - } - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java index 13ecf897..b19205b0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java @@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.text.Html; import com.afollestad.materialdialogs.DialogAction; @@ -16,7 +17,7 @@ import java.util.ArrayList; /** * @author Karim Abou Zeid (kabouzeid) */ -public class RemoveFromPlaylistDialog extends LeakDetectDialogFragment { +public class RemoveFromPlaylistDialog extends DialogFragment { @NonNull public static RemoveFromPlaylistDialog create(PlaylistSong song) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java index f1e2bb05..b3405a24 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java @@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.text.InputType; import com.afollestad.materialdialogs.MaterialDialog; @@ -12,7 +13,7 @@ import com.kabouzeid.gramophone.util.PlaylistsUtil; /** * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad) */ -public class RenamePlaylistDialog extends LeakDetectDialogFragment { +public class RenamePlaylistDialog extends DialogFragment { @NonNull public static RenamePlaylistDialog create(long playlistId) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java index 7e658570..19712b1e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java @@ -13,6 +13,7 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.SystemClock; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.widget.FrameLayout; import android.widget.TextView; import android.widget.Toast; @@ -34,7 +35,7 @@ import butterknife.ButterKnife; /** * @author Karim Abou Zeid (kabouzeid) */ -public class SleepTimerDialog extends LeakDetectDialogFragment { +public class SleepTimerDialog extends DialogFragment { @Bind(R.id.seek_arc) SeekArc seekArc; @Bind(R.id.timer_display) diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java index 92a4b713..87ce7204 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java @@ -5,6 +5,7 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.text.Html; import android.text.Spanned; import android.util.Log; @@ -30,7 +31,7 @@ import java.io.IOException; /** * @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(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongShareDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongShareDialog.java index 65ce9c9c..3a6e97fe 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongShareDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SongShareDialog.java @@ -4,6 +4,7 @@ import android.app.Dialog; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; import android.view.View; import com.afollestad.materialdialogs.MaterialDialog; @@ -14,7 +15,7 @@ import com.kabouzeid.gramophone.util.MusicUtil; /** * @author Karim Abou Zeid (kabouzeid) */ -public class SongShareDialog extends LeakDetectDialogFragment { +public class SongShareDialog extends DialogFragment { @NonNull public static SongShareDialog create(final Song song) { final SongShareDialog dialog = new SongShareDialog(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/LeakDetectFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/LeakDetectFragment.java deleted file mode 100644 index f010fe98..00000000 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/LeakDetectFragment.java +++ /dev/null @@ -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); - } - } -} diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java index a7f81aae..e046ad27 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java @@ -2,15 +2,15 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; import com.kabouzeid.gramophone.ui.activities.MainActivity; -import com.kabouzeid.gramophone.ui.fragments.LeakDetectFragment; /** * @author Karim Abou Zeid (kabouzeid) */ -public abstract class AbsMainActivityFragment extends LeakDetectFragment implements KabViewsDisableAble { +public abstract class AbsMainActivityFragment extends Fragment implements KabViewsDisableAble { private boolean areViewsEnabled; @NonNull diff --git a/app/src/main/res/raw/notices.xml b/app/src/main/res/raw/notices.xml index 0fd0a273..32d5db0f 100644 --- a/app/src/main/res/raw/notices.xml +++ b/app/src/main/res/raw/notices.xml @@ -28,12 +28,6 @@ Copyright 2016 Aidan Follestad Apache Software License 2.0 - - LeakCanary - https://github.com/square/leakcanary - Copyright 2015 Square, Inc. - Apache Software License 2.0 - Android Support Libraries http://developer.android.com/tools/support-library/index.html