Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 2d3d670

Browse files
committed
chore(deps): upgrade ktfmt to 0.42
1 parent 9f89e1d commit 2d3d670

File tree

9 files changed

+29
-40
lines changed

9 files changed

+29
-40
lines changed

app/src/main/java/app/passwordstore/ui/dialogs/TextInputDialog.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
1616
* General purpose [DialogFragment] that can be used to accept a single text input. It provides a
1717
* configurable title and text input hint through the instantiation helper at
1818
* [TextInputDialog.newInstance]. Typical usage would look something like this:
19-
*
2019
* ```kotlin
2120
* val dialog = TextInputDialog.newInstance(getString(R.string.dialog_title), getString(R.string.dialog_hint))
2221
* dialog.show(supportFragmentManager, "text_input_dialog")

app/src/main/java/app/passwordstore/ui/git/base/BaseGitActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ abstract class BaseGitActivity : AppCompatActivity() {
6565

6666
/**
6767
* Attempt to launch the requested Git operation.
68+
*
6869
* @param operation The type of git operation to launch
6970
*/
7071
suspend fun launchGitOperation(operation: GitOp): Result<Unit, Throwable> {

app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,8 @@ class PasswordStore : BaseGitActivity() {
463463
*
464464
* @param oldCategory The category to change its name
465465
* @param error Determines whether to show an error to the user in the alert dialog, this error
466-
* may be due to the new category the user entered already exists or the field was empty or the
467-
* destination path is outside the repository
468-
*
466+
* may be due to the new category the user entered already exists or the field was empty or the
467+
* destination path is outside the repository
469468
* @see [CategoryRenameError]
470469
* @see [isInsideRepository]
471470
*/

autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/FeatureAndTrustDetection.kt

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ import androidx.annotation.RequiresApi
1616

1717
/**
1818
* In order to add a new browser, do the following:
19-
*
2019
* 1. Obtain the .apk from a trusted source. For example, download it from the Play Store on your
21-
* phone and use adb pull to get it onto your computer. We will assume that it is called
22-
* browser.apk.
23-
*
20+
* phone and use adb pull to get it onto your computer. We will assume that it is called
21+
* browser.apk.
2422
* 2. Run
2523
*
2624
* aapt dump badging browser.apk | grep package: | grep -Eo " name='[a-zA-Z0-9_\.]*" | cut -c8-
2725
*
2826
* to obtain the package name (actually, the application ID) of the app in the .apk.
29-
*
3027
* 3. Run
3128
*
3229
* apksigner verify --print-certs browser.apk | grep "#1 certificate SHA-256" | grep -Eo
@@ -36,19 +33,15 @@ import androidx.annotation.RequiresApi
3633
* the apk has a single signing certificate. Apps with multiple signers are very rare, so there is
3734
* probably no need to add them. Refer to computeCertificatesHash to learn how the hash would be
3835
* computed in this case.
39-
*
4036
* 4. Verify the package name and the hash, for example by asking other people to repeat the steps
41-
* above.
42-
*
37+
* above.
4338
* 5. Add an entry with the browser apps's package name and the hash to
44-
* TRUSTED_BROWSER_CERTIFICATE_HASH.
45-
*
39+
* TRUSTED_BROWSER_CERTIFICATE_HASH.
4640
* 6. Optionally, try adding the browser's package name to BROWSERS_WITH_SAVE_SUPPORT and check
47-
* whether a save request to Password Store is triggered when you submit a registration form.
48-
*
41+
* whether a save request to Password Store is triggered when you submit a registration form.
4942
* 7. Optionally, try adding the browser's package name to BROWSERS_WITH_MULTI_ORIGIN_SUPPORT and
50-
* check whether it correctly distinguishes web origins even if iframes are present on the page. You
51-
* can use https://fabianhenneke.github.io/Android-Password-Store/ as a test form.
43+
* check whether it correctly distinguishes web origins even if iframes are present on the page.
44+
* You can use https://fabianhenneke.github.io/Android-Password-Store/ as a test form.
5245
*
5346
* **Security assumption**: Browsers on this list correctly report the web origin of the top-level
5447
* window as part of their AssistStructure.
@@ -112,9 +105,9 @@ internal enum class BrowserMultiOriginMethod {
112105
*
113106
* There are two methods used by browsers:
114107
* - Browsers based on Android's WebView report web domains on each WebView view node, which then
115-
* needs to be propagated to the child nodes ( [BrowserMultiOriginMethod.WebView]).
108+
* needs to be propagated to the child nodes ( [BrowserMultiOriginMethod.WebView]).
116109
* - Browsers with custom Autofill implementations report web domains on each input field (
117-
* [BrowserMultiOriginMethod.Field]).
110+
* [BrowserMultiOriginMethod.Field]).
118111
*/
119112
private val BROWSER_MULTI_ORIGIN_METHOD =
120113
mapOf(

autofill-parser/src/main/java/mozilla/components/lib/publicsuffixlist/PublicSuffixList.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ import kotlinx.coroutines.async
1717

1818
/**
1919
* API for reading and accessing the public suffix list.
20-
*
2120
* > A "public suffix" is one under which Internet users can (or historically could) directly
22-
* register names. Some > examples of public suffixes are .com, .co.uk and pvt.k12.ma.us. The Public
23-
* Suffix List is a list of all known > public suffixes.
21+
* > register names. Some > examples of public suffixes are .com, .co.uk and pvt.k12.ma.us. The
22+
* > Public Suffix List is a list of all known > public suffixes.
2423
*
2524
* Note that this implementation applies the rules of the public suffix list only and does not
2625
* validate domains.
@@ -51,8 +50,8 @@ internal class PublicSuffixList(
5150
* ```
5251
*
5352
* @param [domain] _must_ be a valid domain. [PublicSuffixList] performs no validation, and if any
54-
* unexpected values are passed (e.g., a full URL, a domain with a trailing '/', etc) this may
55-
* return an incorrect result.
53+
* unexpected values are passed (e.g., a full URL, a domain with a trailing '/', etc) this may
54+
* return an incorrect result.
5655
*/
5756
fun getPublicSuffixPlusOneAsync(domain: String): Deferred<String?> =
5857
scope.async {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ build-detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0"
4141
build-diffutils = "io.github.java-diff-utils:java-diff-utils:4.12"
4242
build-download = "de.undercouch:gradle-download-task:5.3.0"
4343
build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
44-
build-ktfmt = "com.facebook:ktfmt:0.41"
44+
build-ktfmt = "com.facebook:ktfmt:0.42"
4545
build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.22.0"
4646
build-metalava = "me.tylerbwong.gradle.metalava:plugin:0.3.2"
4747
build-okhttp = "com.squareup.okhttp3:okhttp:4.10.0"

openpgp-ktx/src/main/java/me/msfjarvis/openpgpktx/util/OpenPgpServiceConnection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class OpenPgpServiceConnection(context: Context, providerPackageName: Str
3131
*
3232
* @param context
3333
* @param providerPackageName specify package name of OpenPGP provider, e.g.,
34-
* "org.sufficientlysecure.keychain"
34+
* "org.sufficientlysecure.keychain"
3535
* @param onBoundListener callback, executed when connection to service has been established
3636
*/
3737
public constructor(

passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPasswordGenerator.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ internal object RandomPasswordGenerator {
1111
/**
1212
* Generates a random password of length [targetLength], taking the following flags in [pwFlags]
1313
* into account, or fails to do so and returns null:
14-
*
1514
* - [PasswordGenerator.DIGITS]: If set, the password will contain at least one digit; if not set,
16-
* the password will not contain any digits.
15+
* the password will not contain any digits.
1716
* - [PasswordGenerator.UPPERS]: If set, the password will contain at least one uppercase letter;
18-
* if not set, the password will not contain any uppercase letters.
17+
* if not set, the password will not contain any uppercase letters.
1918
* - [PasswordGenerator.LOWERS]: If set, the password will contain at least one lowercase letter;
20-
* if not set, the password will not contain any lowercase letters.
19+
* if not set, the password will not contain any lowercase letters.
2120
* - [PasswordGenerator.SYMBOLS]: If set, the password will contain at least one symbol; if not
22-
* set, the password will not contain any symbols.
21+
* set, the password will not contain any symbols.
2322
* - [PasswordGenerator.NO_AMBIGUOUS]: If set, the password will not contain any ambiguous
24-
* characters.
23+
* characters.
2524
*/
2625
fun generate(targetLength: Int, pwFlags: Int): String? {
2726
val bank =

passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPhonemesGenerator.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,17 @@ internal object RandomPhonemesGenerator {
6969
/**
7070
* Generates a random human-readable password of length [targetLength], taking the following flags
7171
* in [pwFlags] into account, or fails to do so and returns null:
72-
*
7372
* - [PasswordGenerator.DIGITS]: If set, the password will contain at least one digit; if not set,
74-
* the password will not contain any digits.
73+
* the password will not contain any digits.
7574
* - [PasswordGenerator.UPPERS]: If set, the password will contain at least one uppercase letter;
76-
* if not set, the password will not contain any uppercase letters.
75+
* if not set, the password will not contain any uppercase letters.
7776
* - [PasswordGenerator.LOWERS]: If set, the password will contain at least one lowercase letter;
78-
* if not set and [PasswordGenerator.UPPERS] is set, the password will not contain any lowercase
79-
* characters; if both are not set, an exception is thrown.
77+
* if not set and [PasswordGenerator.UPPERS] is set, the password will not contain any lowercase
78+
* characters; if both are not set, an exception is thrown.
8079
* - [PasswordGenerator.SYMBOLS]: If set, the password will contain at least one symbol; if not
81-
* set, the password will not contain any symbols.
80+
* set, the password will not contain any symbols.
8281
* - [PasswordGenerator.NO_AMBIGUOUS]: If set, the password will not contain any ambiguous
83-
* characters.
82+
* characters.
8483
*/
8584
fun generate(targetLength: Int, pwFlags: Int): String? {
8685
require(pwFlags hasFlag PasswordGenerator.UPPERS || pwFlags hasFlag PasswordGenerator.LOWERS)

0 commit comments

Comments
 (0)