From ecbebc7853e06b54852494635e9d9a4e824a7fd8 Mon Sep 17 00:00:00 2001 From: thilo Date: Sun, 8 Sep 2019 17:25:26 +0200 Subject: [PATCH 1/3] reemoved bugsnag --- presentation/build.gradle | 3 -- .../com/moez/QKSMS/common/QKApplication.kt | 18 -------- .../com/moez/QKSMS/common/util/BugsnagTree.kt | 41 ------------------- 3 files changed, 62 deletions(-) delete mode 100644 presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt diff --git a/presentation/build.gradle b/presentation/build.gradle index 1c958fabd..9c68528d6 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -34,8 +34,6 @@ android { versionCode 194 versionName "3.6.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - buildConfigField "String", "BUGSNAG_API_KEY", "\"${System.getenv("BUGSNAG_API_KEY")}\"" } buildTypes { @@ -164,7 +162,6 @@ dependencies { testImplementation "org.mockito:mockito-core:$mockito_version" implementation "com.android.billingclient:billing:1.0" - implementation "com.bugsnag:bugsnag-android:4.1.1" implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.google.android:flexbox:0.3.1" diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index e6a2bdb78..68be638c3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -26,11 +26,7 @@ import androidx.core.provider.FontRequest import androidx.emoji.text.EmojiCompat import androidx.emoji.text.FontRequestEmojiCompatConfig import com.akaita.java.rxjava2debug.RxJava2Debug -import com.bugsnag.android.Bugsnag -import com.bugsnag.android.Configuration -import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import com.moez.QKSMS.common.util.BugsnagTree import com.moez.QKSMS.common.util.FileLoggingTree import com.moez.QKSMS.injection.AppComponentManager import com.moez.QKSMS.injection.appComponent @@ -66,11 +62,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn override fun onCreate() { super.onCreate() - Bugsnag.init(this, Configuration(BuildConfig.BUGSNAG_API_KEY).apply { - appVersion = BuildConfig.VERSION_NAME - projectPackages = packages - }) - RxJava2Debug.enableRxJava2AssemblyTracking() Realm.init(this) @@ -89,15 +80,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn nightModeManager.updateCurrentTheme() - val fontRequest = FontRequest( - "com.google.android.gms.fonts", - "com.google.android.gms", - "Noto Color Emoji Compat", - R.array.com_google_android_gms_fonts_certs) - - EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest)) - - Timber.plant(Timber.DebugTree(), BugsnagTree(), fileLoggingTree) } override fun activityInjector(): AndroidInjector { diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt deleted file mode 100644 index f7d565c52..000000000 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package com.moez.QKSMS.common.util - -import android.util.Log -import com.bugsnag.android.Bugsnag -import com.bugsnag.android.Severity -import timber.log.Timber - -/** - * If an exception is logged with the [Log.WARN] or [Log.ERROR] priority, the exception will be - * sent to Bugsnag - */ -class BugsnagTree : Timber.Tree() { - - override fun isLoggable(tag: String?, priority: Int): Boolean { - return priority == Log.WARN || priority == Log.ERROR - } - - override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { - val severity = if (priority == Log.ERROR) Severity.ERROR else Severity.WARNING - throwable?.run { Bugsnag.notify(this, severity) } - } - -} \ No newline at end of file -- GitLab From 8b4b1da9d0a3abcdf274055ac211f929a224be1d Mon Sep 17 00:00:00 2001 From: thilo Date: Sun, 8 Sep 2019 20:55:04 +0200 Subject: [PATCH 2/3] reverted a little of my overeagerness ;) --- .../java/com/moez/QKSMS/common/QKApplication.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 68be638c3..6ec1e6d1a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -27,20 +27,14 @@ import androidx.emoji.text.EmojiCompat import androidx.emoji.text.FontRequestEmojiCompatConfig import com.akaita.java.rxjava2debug.RxJava2Debug import com.moez.QKSMS.R -import com.moez.QKSMS.common.util.FileLoggingTree import com.moez.QKSMS.injection.AppComponentManager import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.migration.QkRealmMigration import com.moez.QKSMS.util.NightModeManager -import dagger.android.AndroidInjector -import dagger.android.DispatchingAndroidInjector -import dagger.android.HasActivityInjector -import dagger.android.HasBroadcastReceiverInjector -import dagger.android.HasServiceInjector +import dagger.android.* import io.realm.Realm import io.realm.RealmConfiguration -import timber.log.Timber import javax.inject.Inject class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector { @@ -54,7 +48,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector - @Inject lateinit var fileLoggingTree: FileLoggingTree @Inject lateinit var nightModeManager: NightModeManager private val packages = arrayOf("com.moez.QKSMS") @@ -79,6 +72,13 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn } nightModeManager.updateCurrentTheme() + val fontRequest = FontRequest( + "com.google.android.gms.fonts", + "com.google.android.gms", + "Noto Color Emoji Compat", + R.array.com_google_android_gms_fonts_certs) + + EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest)) } -- GitLab From 1fdf256891eec9063f94df412ea2e41947befeec Mon Sep 17 00:00:00 2001 From: thilo Date: Sun, 8 Sep 2019 21:18:36 +0200 Subject: [PATCH 3/3] reverted a little of my overeagerness ;) --- .../src/main/java/com/moez/QKSMS/common/QKApplication.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 6ec1e6d1a..359daeded 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -27,6 +27,7 @@ import androidx.emoji.text.EmojiCompat import androidx.emoji.text.FontRequestEmojiCompatConfig import com.akaita.java.rxjava2debug.RxJava2Debug import com.moez.QKSMS.R +import com.moez.QKSMS.common.util.FileLoggingTree import com.moez.QKSMS.injection.AppComponentManager import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.manager.AnalyticsManager @@ -35,6 +36,7 @@ import com.moez.QKSMS.util.NightModeManager import dagger.android.* import io.realm.Realm import io.realm.RealmConfiguration +import timber.log.Timber import javax.inject.Inject class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector { @@ -48,6 +50,8 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector + @Inject + lateinit var fileLoggingTree: FileLoggingTree @Inject lateinit var nightModeManager: NightModeManager private val packages = arrayOf("com.moez.QKSMS") @@ -79,6 +83,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn R.array.com_google_android_gms_fonts_certs) EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest)) + Timber.plant(Timber.DebugTree(), fileLoggingTree) } -- GitLab