aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2020-06-28 20:58:31 -0700
committerGitHub <noreply@github.com>2020-06-28 20:58:31 -0700
commitaee8e7e00ceb476c6653d6f8328f1b376d747c0d (patch)
tree2b4cf84f4bfce3f1391dafa1e210cfb6eab704fd /app
parent3a3dbbd3e57ecb49c6cc18d20cf2680725ccbfee (diff)
parent9a2f0cde424781ae8b33e05efc1a8d6954ece026 (diff)
downloadfrost-aee8e7e00ceb476c6653d6f8328f1b376d747c0d.tar.gz
frost-aee8e7e00ceb476c6653d6f8328f1b376d747c0d.tar.bz2
frost-aee8e7e00ceb476c6653d6f8328f1b376d747c0d.zip
Merge pull request #1690 from AllanWang/versions
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle18
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt13
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt19
4 files changed, 23 insertions, 29 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 1899058e..c8d46967 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,9 @@
apply plugin: 'com.android.application'
-apply plugin: 'com.bugsnag.android.gradle'
+//apply plugin: 'com.bugsnag.android.gradle'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
-apply plugin: 'com.getkeepsafe.dexcount'
+//apply plugin: 'com.getkeepsafe.dexcount'
apply plugin: 'com.gladed.androidgitversion'
@@ -35,10 +35,10 @@ android {
applicationId "${project.APP_GROUP}.${project.APP_ID.toLowerCase(Locale.CANADA)}"
minSdkVersion kau.Versions.minSdk
targetSdkVersion Versions.targetSdk
- versionCode 2040500
-// versionCode androidGitVersion.code()
- versionName '2.4.5'
-// versionName androidGitVersion.name()
+// versionCode 2040500
+ versionCode androidGitVersion.code()
+// versionName '2.4.5'
+ versionName androidGitVersion.name()
if (System.getenv('TRAVIS') != 'true') {
// Verification for F-Droid builds
@@ -188,7 +188,7 @@ android {
// Always show the result of every unit test, even if it passes.
all {
testLogging {
- events 'passed', 'skipped', 'failed', 'standardError'
+ events 'skipped', 'failed', 'standardError'
}
}
}
@@ -268,8 +268,6 @@ dependencies {
testImplementation kau.Dependencies.koinTest
androidTestImplementation kau.Dependencies.koinTest
-// androidTestImplementation "io.mockk:mockk:${Versions.mockk}"
-
implementation kau.Dependencies.coroutines
implementation "org.apache.commons:commons-text:${Versions.apacheCommonsText}"
@@ -352,5 +350,3 @@ task createGithubReleaseApk {
tasks.findByName('testGithubReleaseApk').mustRunAfter 'lintGithubReleaseApk'
tasks.findByName('assembleGithubReleaseApk').mustRunAfter 'testGithubReleaseApk'
}
-
-apply plugin: 'com.bugsnag.android.gradle' \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 34808e65..247011ac 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -75,7 +75,7 @@ class FrostApp : Application(), KoinComponent {
prefs = get()
showcasePrefs = get()
initPrefs()
- initBugsnag()
+// initBugsnag()
L.i { "Begin Frost for Facebook" }
FrostPglAdBlock.init(this)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
index 974047e8..67d2f55a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
@@ -18,7 +18,6 @@ package com.pitchedapps.frost.utils
import ca.allanwang.kau.logging.KauLogger
import ca.allanwang.kau.logging.KauLoggerExtension
-import com.bugsnag.android.Bugsnag
import com.pitchedapps.frost.BuildConfig
/**
@@ -63,12 +62,12 @@ object L : KauLogger("Frost") {
if (BuildConfig.DEBUG || !hasAnalytics()) {
super.logImpl(priority, message, t)
} else {
- if (message != null) {
- Bugsnag.leaveBreadcrumb(message)
- }
- if (t != null) {
- Bugsnag.notify(t)
- }
+// if (message != null) {
+// Bugsnag.leaveBreadcrumb(message)
+// }
+// if (t != null) {
+// Bugsnag.notify(t)
+// }
}
}
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 1dfd6871..bfd0d2c0 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -23,7 +23,6 @@ import ca.allanwang.kau.kpref.KPrefFactory
import ca.allanwang.kau.utils.colorToForeground
import ca.allanwang.kau.utils.isColorVisibleOn
import ca.allanwang.kau.utils.withAlpha
-import com.bugsnag.android.Bugsnag
import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.enums.FACEBOOK_BLUE
import com.pitchedapps.frost.enums.FeedSort
@@ -165,15 +164,15 @@ class Prefs(factory: KPrefFactory) : KPref("${BuildConfig.APPLICATION_ID}.prefs"
var verboseLogging: Boolean by kpref("verbose_logging", false)
var analytics: Boolean by kpref("analytics", false) {
- if (!BuildConfig.DEBUG) {
- if (it) {
- Bugsnag.setAutoCaptureSessions(true)
- Bugsnag.enableExceptionHandler()
- } else {
- Bugsnag.setAutoCaptureSessions(false)
- Bugsnag.disableExceptionHandler()
- }
- }
+// if (!BuildConfig.DEBUG) {
+// if (it) {
+// Bugsnag.setAutoCaptureSessions(true)
+// Bugsnag.enableExceptionHandler()
+// } else {
+// Bugsnag.setAutoCaptureSessions(false)
+// Bugsnag.disableExceptionHandler()
+// }
+// }
}
var biometricsEnabled: Boolean by kpref("biometrics_enabled", false)