kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat: remove Beagle

Browse source 
It breaks WhatTheStack and doesn't offer anything particularly useful
This commit is contained in:
Harsh Shandilya 2022-11-27 12:38:15 +05:30
parent 7c7218ef22
commit 2decedbf4b
No known key found for this signature in database
3 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle.kts
View file

@ -104,10 +104,7 @@ dependencies {
if (snapshot.snapshot) { if (snapshot.snapshot) {
implementation(libs.thirdparty.whatthestack) implementation(libs.thirdparty.whatthestack)
implementation(libs.thirdparty.beagle.ui.drawer)
} else { } else {
debugImplementation(libs.thirdparty.beagle.ui.drawer)
releaseImplementation(libs.thirdparty.beagle.noop)
debugImplementation(libs.thirdparty.whatthestack) debugImplementation(libs.thirdparty.whatthestack)
} }

29
app/src/main/java/app/passwordstore/Application.kt
View file

@ -8,10 +8,7 @@ import android.content.SharedPreferences
import android.os.Build import android.os.Build
import android.os.StrictMode import android.os.StrictMode
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY import androidx.appcompat.app.AppCompatDelegate.*
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 app.passwordstore.injection.context.FilesDirPath import app.passwordstore.injection.context.FilesDirPath
import app.passwordstore.injection.prefs.SettingsPreferences import app.passwordstore.injection.prefs.SettingsPreferences
import app.passwordstore.util.extensions.getString 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.PreferenceKeys
import app.passwordstore.util.settings.runMigrations import app.passwordstore.util.settings.runMigrations
import com.google.android.material.color.DynamicColors 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 dagger.hilt.android.HiltAndroidApp
import io.sentry.Sentry import io.sentry.Sentry
import io.sentry.protocol.User import io.sentry.protocol.User
@ -59,22 +48,6 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere
BuildConfig.ENABLE_DEBUG_FEATURES || BuildConfig.ENABLE_DEBUG_FEATURES ||
prefs.getBoolean(PreferenceKeys.ENABLE_DEBUG_LOGGING, false) 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)) LogcatLogger.install(AndroidLogcatLogger(DEBUG))
setVmPolicy() setVmPolicy()
} }

3
gradle/libs.versions.toml
View file

@ -1,7 +1,6 @@
[versions] [versions]
agp = "7.3.1" agp = "7.3.1"
androidxActivity = "1.7.0-alpha02" androidxActivity = "1.7.0-alpha02"
beagle = "2.9.0"
bouncycastle = "1.72" bouncycastle = "1.72"
# @keep used for kotlinCompilerExtensionVersion # @keep used for kotlinCompilerExtensionVersion
composeCompiler = "1.4.0-alpha02" 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-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0"
testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.10" testing-testparameterinjector = "com.google.testparameterinjector:test-parameter-injector:1.10"
testing-turbine = "app.cash.turbine:turbine:0.12.1" 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-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "bouncycastle" }
thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" } thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" }
thirdparty-commons_codec = "commons-codec:commons-codec:1.14" thirdparty-commons_codec = "commons-codec:commons-codec:1.14"