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

Upgrade to ktfmt 0.37 (#1897)

Browse source
This commit is contained in:
Harsh Shandilya 2022-05-05 08:47:15 +05:30 • committed by GitHub
parent 7c035aa042
commit 41213da780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
View file

@ -41,7 +41,8 @@ class LaunchActivity : AppCompatActivity() {
prefs.edit { remove(PreferenceKeys.BIOMETRIC_AUTH) } prefs.edit { remove(PreferenceKeys.BIOMETRIC_AUTH) }
startTargetActivity(false) startTargetActivity(false)
} }
is Result.Failure, Result.Cancelled -> { is Result.Failure,
Result.Cancelled -> {
finish() finish()
} }
is Result.Retry -> {} is Result.Retry -> {}

4
app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
View file

@ -183,8 +183,8 @@ class OpenKeychainKeyProvider private constructor(val activity: ContinuationCont
"Request ${request::class.simpleName} failed: ${error?.message}" "Request ${request::class.simpleName} failed: ${error?.message}"
) )
when (error?.error) { when (error?.error) {
SshAuthenticationApiError.NO_AUTH_KEY, SshAuthenticationApiError.NO_SUCH_KEY -> SshAuthenticationApiError.NO_AUTH_KEY,
ApiResponse.NoSuchKey(exception) SshAuthenticationApiError.NO_SUCH_KEY -> ApiResponse.NoSuchKey(exception)
else -> ApiResponse.GeneralError(exception) else -> ApiResponse.GeneralError(exception)
} }
} }

3
app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
View file

@ -35,7 +35,8 @@ class OpenKeychainWrappedKeyAlgorithm(private val keyAlgorithm: KeyAlgorithm) :
when (keyAlgorithm.keyAlgorithm) { when (keyAlgorithm.keyAlgorithm) {
"rsa-sha2-512" -> SshAuthenticationApi.SHA512 "rsa-sha2-512" -> SshAuthenticationApi.SHA512
"rsa-sha2-256" -> SshAuthenticationApi.SHA256 "rsa-sha2-256" -> SshAuthenticationApi.SHA256
"ssh-rsa", "ssh-rsa-cert-v01@openssh.com" -> SshAuthenticationApi.SHA1 "ssh-rsa",
"ssh-rsa-cert-v01@openssh.com" -> SshAuthenticationApi.SHA1
// Other algorithms don't use this value, but it has to be valid. // Other algorithms don't use this value, but it has to be valid.
else -> SshAuthenticationApi.SHA512 else -> SshAuthenticationApi.SHA512
} }

4
app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
View file

@ -306,8 +306,8 @@ object SshKey {
fun provide(client: SSHClient, passphraseFinder: InteractivePasswordFinder): KeyProvider? = fun provide(client: SSHClient, passphraseFinder: InteractivePasswordFinder): KeyProvider? =
when (type) { when (type) {
Type.LegacyGenerated, Type.Imported -> Type.LegacyGenerated,
client.loadKeys(privateKeyFile.absolutePath, passphraseFinder) Type.Imported -> client.loadKeys(privateKeyFile.absolutePath, passphraseFinder)
Type.KeystoreNative -> KeystoreNativeKeyProvider Type.KeystoreNative -> KeystoreNativeKeyProvider
Type.KeystoreWrappedEd25519 -> KeystoreWrappedEd25519KeyProvider Type.KeystoreWrappedEd25519 -> KeystoreWrappedEd25519KeyProvider
null -> null null -> null

3
autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
View file

@ -166,7 +166,8 @@ private class AutofillFormParser(
// reported web origin if no other web origin appears on the page. // reported web origin if no other web origin appears on the page.
webOriginToFormOrigin(context, webOrigins.singleOrNull() ?: return null) webOriginToFormOrigin(context, webOrigins.singleOrNull() ?: return null)
} }
BrowserMultiOriginMethod.WebView, BrowserMultiOriginMethod.Field -> { BrowserMultiOriginMethod.WebView,
BrowserMultiOriginMethod.Field -> {
// Security assumption: For browsers with full autofill support (the `Field` case), // Security assumption: For browsers with full autofill support (the `Field` case),
// every form field is annotated with its origin. For browsers based on WebView, // every form field is annotated with its origin. For browsers based on WebView,
// this is true after the web origins of WebViews are passed down to their children. // this is true after the web origins of WebViews are passed down to their children.

2
build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
View file

@ -5,7 +5,7 @@
plugins { id("com.diffplug.spotless") } plugins { id("com.diffplug.spotless") }
val KTFMT_VERSION = "0.36" val KTFMT_VERSION = "0.37"
spotless { spotless {
kotlin { kotlin {