From 76d6d225b51ffab8c1f9e1f534f7a7d9cce09164 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 27 Mar 2020 13:07:34 +0100
Subject: [PATCH] Update leakcanary
---
app/build.gradle.kts | 5 +----
.../main/java/de/kuschku/quasseldroid/app/AppDelegate.kt | 5 ++---
.../de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt | 6 ++----
.../kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt | 4 ----
.../de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt | 5 ++---
5 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e7bdcdb7b..38acdf4b9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -176,11 +176,8 @@ dependencies {
// Quality Assurance
implementation(project(":malheur"))
- withVersion("1.6.3") {
+ withVersion("2.2") {
debugImplementation("com.squareup.leakcanary", "leakcanary-android", version)
- releaseImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
- testImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
- androidTestImplementation("com.squareup.leakcanary", "leakcanary-android-no-op", version)
}
// Dependency Injection
diff --git a/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt b/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt
index 474ba1d65..d0f388010 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/app/AppDelegate.kt
@@ -1,8 +1,8 @@
/*
* Quasseldroid - Quassel client for Android
*
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
@@ -20,7 +20,6 @@
package de.kuschku.quasseldroid.app
interface AppDelegate {
- fun shouldInit(): Boolean
fun onAttachBaseContext()
fun onPreInit()
fun onInit()
diff --git a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt
index e3d50a251..72d158d93 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidBaseDelegate.kt
@@ -1,8 +1,8 @@
/*
* Quasseldroid - Quassel client for Android
*
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
@@ -29,8 +29,6 @@ import de.kuschku.quasseldroid.util.compatibility.AndroidLoggingHandler
import de.kuschku.quasseldroid.util.compatibility.AndroidStreamChannelFactory
open class QuasseldroidBaseDelegate(private val app: Quasseldroid) : AppDelegate {
- override fun shouldInit() = true
-
override fun onPreInit() = Unit
override fun onInit() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt
index ef97f538c..0d274270a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/app/QuasseldroidReleaseDelegate.kt
@@ -22,7 +22,6 @@ package de.kuschku.quasseldroid.app
import android.annotation.SuppressLint
import android.os.Build
import android.os.StrictMode
-import com.squareup.leakcanary.LeakCanary
import de.kuschku.malheur.CrashHandler
import de.kuschku.quasseldroid.BuildConfig
import de.kuschku.quasseldroid.Quasseldroid
@@ -38,10 +37,7 @@ import de.kuschku.quasseldroid.settings.SettingsMigrationManager
import de.kuschku.quasseldroid.util.helper.letIf
class QuasseldroidReleaseDelegate(private val app: Quasseldroid) : QuasseldroidBaseDelegate(app) {
- override fun shouldInit() = !LeakCanary.isInAnalyzerProcess(app)
-
override fun onPreInit() {
- LeakCanary.install(app)
CrashHandler.init<BuildConfig>(application = app)
}
diff --git a/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt b/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt
index e886329b5..b831a91d9 100644
--- a/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt
+++ b/app/src/test/java/de/kuschku/quasseldroid/app/QuasseldroidTestDelegate.kt
@@ -1,8 +1,8 @@
/*
* Quasseldroid - Quassel client for Android
*
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
@@ -20,7 +20,6 @@
package de.kuschku.quasseldroid.app
class QuasseldroidTestDelegate : AppDelegate {
- override fun shouldInit() = true
override fun onAttachBaseContext() = Unit
override fun onPreInit() = Unit
override fun onInit() = Unit
--
GitLab