mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 05:48:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade ktfmt to 0.33 (#1753)

Browse Source 
* build: upgrade ktfmt to 0.33

* all: reformat with ktfmt 0.33
This commit is contained in:
Harsh Shandilya 2022-02-26 01:58:20 +05:30 committed by GitHub
parent 0af4e2920c
commit 778834d5e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterView.kt
View File

@ -178,12 +178,11 @@ class AutofillFilterView : AppCompatActivity() {
setText(initialSearch, TextView.BufferType.EDITABLE)
addTextChangedListener { updateSearch() }
}
origin.text =
buildSpannedString {
append(getString(R.string.oreo_autofill_select_and_fill_into))
append("\n")
bold { append(formOrigin.getPrettyIdentifier(applicationContext, untrusted = true)) }
}
origin.text = buildSpannedString {
append(getString(R.string.oreo_autofill_select_and_fill_into))
append("\n")
bold { append(formOrigin.getPrettyIdentifier(applicationContext, untrusted = true)) }
}
strictDomainSearch.apply {
visibility = if (formOrigin is FormOrigin.Web) View.VISIBLE else View.GONE
isChecked = formOrigin is FormOrigin.Web

7
app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt
View File

@ -33,10 +33,9 @@ class PasswordSettings(private val activity: FragmentActivity) : SettingsProvide
}
editText(PreferenceKeys.GENERAL_SHOW_TIME) {
titleRes = R.string.pref_clipboard_timeout_title
summaryProvider =
{ timeout ->
activity.getString(R.string.pref_clipboard_timeout_summary, timeout ?: "45")
}
summaryProvider = { timeout ->
activity.getString(R.string.pref_clipboard_timeout_summary, timeout ?: "45")
}
textInputType = InputType.TYPE_CLASS_NUMBER
}
checkBox(PreferenceKeys.SHOW_PASSWORD) {

27
app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
View File

@ -76,21 +76,20 @@ class OpenKeychainKeyProvider private constructor(val activity: ContinuationCont
}
private suspend fun prepare() {
sshServiceApi =
suspendCoroutine { cont ->
sshServiceConnection.connect(
object : SshAuthenticationConnection.OnBound {
override fun onBound(sshAgent: ISshAuthenticationService) {
logcat { "Bound to SshAuthenticationApi: $OPENPGP_PROVIDER" }
cont.resume(SshAuthenticationApi(context, sshAgent))
}
override fun onError() {
throw UserAuthException(DisconnectReason.UNKNOWN, "OpenKeychain service unavailable")
}
sshServiceApi = suspendCoroutine { cont ->
sshServiceConnection.connect(
object : SshAuthenticationConnection.OnBound {
override fun onBound(sshAgent: ISshAuthenticationService) {
logcat { "Bound to SshAuthenticationApi: $OPENPGP_PROVIDER" }
cont.resume(SshAuthenticationApi(context, sshAgent))
}
)
}
override fun onError() {
throw UserAuthException(DisconnectReason.UNKNOWN, "OpenKeychain service unavailable")
}
}
)
}
if (keyId == null) {
selectKey()

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

@ -5,14 +5,16 @@
plugins { id("com.diffplug.spotless") }
val KTFMT_VERSION = "0.33"
spotless {
kotlin {
ktfmt().googleStyle()
ktfmt(KTFMT_VERSION).googleStyle()
target("**/*.kt")
targetExclude("**/build/")
}
kotlinGradle {
ktfmt().googleStyle()
ktfmt(KTFMT_VERSION).googleStyle()
target("**/*.kts")
targetExclude("**/build/")
}