Skip to content
Snippets Groups Projects
Commit 7773f6b7 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Minor cleanup, added leak canary for debug builds

parent ab1cdfec
No related branches found
No related tags found
No related merge requests found
...@@ -144,6 +144,12 @@ dependencies { ...@@ -144,6 +144,12 @@ dependencies {
// Quality Assurance // Quality Assurance
implementation(project(":malheur")) implementation(project(":malheur"))
withVersion("1.5.4") {
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)
}
testImplementation("junit", "junit", "4.12") testImplementation("junit", "junit", "4.12")
withVersion("1.0.1") { withVersion("1.0.1") {
......
...@@ -5,6 +5,8 @@ import android.content.pm.ShortcutInfo ...@@ -5,6 +5,8 @@ import android.content.pm.ShortcutInfo
import android.content.pm.ShortcutManager import android.content.pm.ShortcutManager
import android.graphics.drawable.Icon import android.graphics.drawable.Icon
import android.os.Build import android.os.Build
import android.support.v7.preference.PreferenceManager
import com.squareup.leakcanary.LeakCanary
import de.kuschku.malheur.CrashHandler import de.kuschku.malheur.CrashHandler
import de.kuschku.quasseldroid_ng.util.backport.AndroidThreeTenBackport import de.kuschku.quasseldroid_ng.util.backport.AndroidThreeTenBackport
import de.kuschku.quasseldroid_ng.util.compatibility.AndroidCompatibilityUtils import de.kuschku.quasseldroid_ng.util.compatibility.AndroidCompatibilityUtils
...@@ -14,11 +16,19 @@ import de.kuschku.quasseldroid_ng.util.helper.systemService ...@@ -14,11 +16,19 @@ import de.kuschku.quasseldroid_ng.util.helper.systemService
class QuasseldroidNG : Application() { class QuasseldroidNG : Application() {
override fun onCreate() { override fun onCreate() {
super.onCreate()
if (LeakCanary.isInAnalyzerProcess(this)) {
// This process is dedicated to LeakCanary for heap analysis.
// You should not init your app in this process.
return
}
LeakCanary.install(this)
// Normal app init code...
CrashHandler.init( CrashHandler.init(
application = this, application = this,
buildConfig = BuildConfig::class.java buildConfig = BuildConfig::class.java
) )
super.onCreate()
// Init compatibility utils // Init compatibility utils
AndroidCompatibilityUtils.inject() AndroidCompatibilityUtils.inject()
...@@ -28,7 +38,7 @@ class QuasseldroidNG : Application() { ...@@ -28,7 +38,7 @@ class QuasseldroidNG : Application() {
AndroidThreeTenBackport.init(this) AndroidThreeTenBackport.init(this)
// Initialize preferences unless already set // Initialize preferences unless already set
android.support.v7.preference.PreferenceManager.setDefaultValues(this, R.xml.preferences, false) PreferenceManager.setDefaultValues(this, R.xml.preferences, false)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
systemService<ShortcutManager>().dynamicShortcuts = listOf( systemService<ShortcutManager>().dynamicShortcuts = listOf(
......
...@@ -124,7 +124,6 @@ class Session( ...@@ -124,7 +124,6 @@ class Session(
override fun handle(f: SignalProxyMessage.HeartBeatReply): Boolean { override fun handle(f: SignalProxyMessage.HeartBeatReply): Boolean {
val now = Instant.now() val now = Instant.now()
val latency = now.toEpochMilli() - f.timestamp.toEpochMilli() val latency = now.toEpochMilli() - f.timestamp.toEpochMilli()
log(INFO, "Session", "Latency of $latency ms")
lag.onNext(latency) lag.onNext(latency)
return true return true
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment