From 2decedbf4b48898dc6e26016f120bc20667d34a6 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 27 Nov 2022 12:38:15 +0530 Subject: [PATCH] feat: remove Beagle It breaks WhatTheStack and doesn't offer anything particularly useful --- app/build.gradle.kts | 3 -- .../java/app/passwordstore/Application.kt | 29 +------------------ gradle/libs.versions.toml | 3 -- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 60f3f2f2..c125dd5a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -104,10 +104,7 @@ dependencies { if (snapshot.snapshot) { implementation(libs.thirdparty.whatthestack) - implementation(libs.thirdparty.beagle.ui.drawer) } else { - debugImplementation(libs.thirdparty.beagle.ui.drawer) - releaseImplementation(libs.thirdparty.beagle.noop) debugImplementation(libs.thirdparty.whatthestack) } diff --git a/app/src/main/java/app/passwordstore/Application.kt b/app/src/main/java/app/passwordstore/Application.kt index 997b8744..d52dfacf 100644 --- a/app/src/main/java/app/passwordstore/Application.kt +++ b/app/src/main/java/app/passwordstore/Application.kt @@ -8,10 +8,7 @@ import android.content.SharedPreferences import android.os.Build import android.os.StrictMode import androidx.appcompat.app.AppCompatDelegate -import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY -import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO -import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES +import androidx.appcompat.app.AppCompatDelegate.* import app.passwordstore.injection.context.FilesDirPath import app.passwordstore.injection.prefs.SettingsPreferences import app.passwordstore.util.extensions.getString @@ -23,14 +20,6 @@ import app.passwordstore.util.settings.GitSettings import app.passwordstore.util.settings.PreferenceKeys import app.passwordstore.util.settings.runMigrations import com.google.android.material.color.DynamicColors -import com.pandulapeter.beagle.Beagle -import com.pandulapeter.beagle.modules.AppInfoButtonModule -import com.pandulapeter.beagle.modules.DeviceInfoModule -import com.pandulapeter.beagle.modules.DividerModule -import com.pandulapeter.beagle.modules.HeaderModule -import com.pandulapeter.beagle.modules.LifecycleLogListModule -import com.pandulapeter.beagle.modules.PaddingModule -import com.pandulapeter.beagle.modules.ScreenCaptureToolboxModule import dagger.hilt.android.HiltAndroidApp import io.sentry.Sentry import io.sentry.protocol.User @@ -59,22 +48,6 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere BuildConfig.ENABLE_DEBUG_FEATURES || prefs.getBoolean(PreferenceKeys.ENABLE_DEBUG_LOGGING, false) ) { - Beagle.initialize(application = this) - Beagle.set( - HeaderModule( - title = getString(R.string.app_name), - subtitle = BuildConfig.APPLICATION_ID, - text = - "${BuildConfig.BUILD_TYPE} v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})" - ), - AppInfoButtonModule(), - PaddingModule(), - ScreenCaptureToolboxModule(), - DividerModule(), - LifecycleLogListModule(), - DividerModule(), - DeviceInfoModule(), - ) LogcatLogger.install(AndroidLogcatLogger(DEBUG)) setVmPolicy() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c6ec9b60..23cf7757 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,6 @@ [versions] agp = "7.3.1" androidxActivity = "1.7.0-alpha02" -beagle = "2.9.0" bouncycastle = "1.72" # @keep used for kotlinCompilerExtensionVersion composeCompiler = "1.4.0-alpha02" @@ -76,8 +75,6 @@ testing-robolectric = "org.robolectric:robolectric:4.9" testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0" testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.10" testing-turbine = "app.cash.turbine:turbine:0.12.1" -thirdparty-beagle-noop = { module = "io.github.pandulapeter.beagle:noop", version.ref = "beagle" } -thirdparty-beagle-ui-drawer = { module = "io.github.pandulapeter.beagle:ui-drawer", version.ref = "beagle" } thirdparty-bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "bouncycastle" } thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" } thirdparty-commons_codec = "commons-codec:commons-codec:1.14"