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

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) setText(initialSearch, TextView.BufferType.EDITABLE)
addTextChangedListener { updateSearch() } addTextChangedListener { updateSearch() }
} }
origin.text = origin.text = buildSpannedString {
buildSpannedString { append(getString(R.string.oreo_autofill_select_and_fill_into))
append(getString(R.string.oreo_autofill_select_and_fill_into)) append("\n")
append("\n") bold { append(formOrigin.getPrettyIdentifier(applicationContext, untrusted = true)) }
bold { append(formOrigin.getPrettyIdentifier(applicationContext, untrusted = true)) } }
}
strictDomainSearch.apply { strictDomainSearch.apply {
visibility = if (formOrigin is FormOrigin.Web) View.VISIBLE else View.GONE visibility = if (formOrigin is FormOrigin.Web) View.VISIBLE else View.GONE
isChecked = formOrigin is FormOrigin.Web 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) { editText(PreferenceKeys.GENERAL_SHOW_TIME) {
titleRes = R.string.pref_clipboard_timeout_title titleRes = R.string.pref_clipboard_timeout_title
summaryProvider = summaryProvider = { timeout ->
{ timeout -> activity.getString(R.string.pref_clipboard_timeout_summary, timeout ?: "45")
activity.getString(R.string.pref_clipboard_timeout_summary, timeout ?: "45") }
}
textInputType = InputType.TYPE_CLASS_NUMBER textInputType = InputType.TYPE_CLASS_NUMBER
} }
checkBox(PreferenceKeys.SHOW_PASSWORD) { 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() { private suspend fun prepare() {
sshServiceApi = sshServiceApi = suspendCoroutine { cont ->
suspendCoroutine { cont -> sshServiceConnection.connect(
sshServiceConnection.connect( object : SshAuthenticationConnection.OnBound {
object : SshAuthenticationConnection.OnBound { override fun onBound(sshAgent: ISshAuthenticationService) {
override fun onBound(sshAgent: ISshAuthenticationService) { logcat { "Bound to SshAuthenticationApi: $OPENPGP_PROVIDER" }
logcat { "Bound to SshAuthenticationApi: $OPENPGP_PROVIDER" } cont.resume(SshAuthenticationApi(context, sshAgent))
cont.resume(SshAuthenticationApi(context, sshAgent))
}
override fun onError() {
throw UserAuthException(DisconnectReason.UNKNOWN, "OpenKeychain service unavailable")
}
} }
)
} override fun onError() {
throw UserAuthException(DisconnectReason.UNKNOWN, "OpenKeychain service unavailable")
}
}
)
}
if (keyId == null) { if (keyId == null) {
selectKey() 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") } plugins { id("com.diffplug.spotless") }
val KTFMT_VERSION = "0.33"
spotless { spotless {
kotlin { kotlin {
ktfmt().googleStyle() ktfmt(KTFMT_VERSION).googleStyle()
target("**/*.kt") target("**/*.kt")
targetExclude("**/build/") targetExclude("**/build/")
} }
kotlinGradle { kotlinGradle {
ktfmt().googleStyle() ktfmt(KTFMT_VERSION).googleStyle()
target("**/*.kts") target("**/*.kts")
targetExclude("**/build/") targetExclude("**/build/")
} }