diff options
4 files changed, 21 insertions, 21 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt index 37a16b16..930da5cd 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt @@ -165,15 +165,15 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB gpgIdentifierFile.writeText((keyIds + "").joinToString("\n")) } commitChange( - getString( - R.string.git_commit_gpg_id, - getLongName( - gpgIdentifierFile.parentFile!!.absolutePath, - repoPath, - gpgIdentifierFile.name + getString( + R.string.git_commit_gpg_id, + getLongName( + gpgIdentifierFile.parentFile!!.absolutePath, + repoPath, + gpgIdentifierFile.name + ) ) ) - ) .onSuccess { encrypt(encryptionIntent) } } } @@ -552,8 +552,8 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB if (editing) R.string.git_commit_edit_text else R.string.git_commit_add_text lifecycleScope.launch { commitChange( - resources.getString(commitMessageRes, getLongName(fullPath, repoPath, editName)) - ) + resources.getString(commitMessageRes, getLongName(fullPath, repoPath, editName)) + ) .onSuccess { setResult(RESULT_OK, returnIntent) finish() diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt index e6ee7a09..a24fbc9e 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt @@ -429,8 +429,8 @@ class PasswordCreationActivityV2 : BasePgpActivity() { if (editing) R.string.git_commit_edit_text else R.string.git_commit_add_text lifecycleScope.launch { commitChange( - resources.getString(commitMessageRes, getLongName(fullPath, repoPath, editName)) - ) + resources.getString(commitMessageRes, getLongName(fullPath, repoPath, editName)) + ) .onSuccess { setResult(RESULT_OK, returnIntent) finish() diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt index f0405e04..948fbd35 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt @@ -232,15 +232,15 @@ class SshjConfig : ConfigImpl() { private fun initKeyAlgorithms() { keyAlgorithms = listOf( - KeyAlgorithms.SSHRSACertV01(), - KeyAlgorithms.EdDSA25519(), - KeyAlgorithms.ECDSASHANistp521(), - KeyAlgorithms.ECDSASHANistp384(), - KeyAlgorithms.ECDSASHANistp256(), - KeyAlgorithms.RSASHA512(), - KeyAlgorithms.RSASHA256(), - KeyAlgorithms.SSHRSA(), - ) + KeyAlgorithms.SSHRSACertV01(), + KeyAlgorithms.EdDSA25519(), + KeyAlgorithms.ECDSASHANistp521(), + KeyAlgorithms.ECDSASHANistp384(), + KeyAlgorithms.ECDSASHANistp256(), + KeyAlgorithms.RSASHA512(), + KeyAlgorithms.RSASHA256(), + KeyAlgorithms.SSHRSA(), + ) .map { OpenKeychainWrappedKeyAlgorithmFactory(it) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 32e1518f..a51c4469 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,7 +47,7 @@ build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" build-okhttp = "com.squareup.okhttp3:okhttp:4.9.3" build-semver = "com.vdurmont:semver4j:3.1.0" -build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.2.1" +build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.2.2" dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } |