* Migrate to Ktlint 1.x

* Reformat code

Author: Denis Trotsenko

.editorconfig

@@ -6,8 +6,23 @@ insert_final_newline = true
 ij_continuation_indent_size = 4
 
 [{*.kt,*.kts}]
+ktlint_standard_annotation = disabled
+ktlint_standard_property-naming = disabled
+ktlint_standard_function-naming = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_indent = disabled
+ktlint_standard_discouraged-comment-location = enabled
+ktlint_standard_no-empty-first-line-in-class-body = enabled
+ktlint_standard_blank-line-before-declaration = enabled
+ktlint_standard_if-else-bracing = enabled
+ktlint_standard_no-empty-file = enabled
+ktlint_standard_no-single-line-block-comment = enabled
+
 ij_kotlin_allow_trailing_comma = false
 ij_kotlin_allow_trailing_comma_on_call_site = false
 ij_kotlin_blank_lines_around_block_when_branches = 0
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+ij_kotlin_packages_to_use_import_on_demand = unset

build.gradle.kts

@@ -16,7 +16,7 @@ subprojects {
             target("**/*.kt")
             targetExclude("$buildDir/**/*.kt")
             targetExclude("bin/**/*.kt")
-            ktlint(libs.versions.ktlint.get())
+            ktlint()
         }
     }
 }

gradle/libs.versions.toml

@@ -1,9 +1,8 @@
 [versions]
 kotlin = "1.8.22"
 dokka = "1.9.10"
-ktlint = "0.48.2"
 kotest = "5.6.1"
-spotless = "6.18.0"
+spotless = "6.24.0"
 versions = "0.46.0"
 
 [plugins]

kotpass/src/main/kotlin/app/keemobile/kotpass/builders/Entry.kt

@@ -8,7 +8,7 @@ import app.keemobile.kotpass.models.Entry
 import app.keemobile.kotpass.models.EntryFields
 import app.keemobile.kotpass.models.EntryValue
 import app.keemobile.kotpass.models.TimeData
-import java.util.*
+import java.util.UUID
 
 internal class MutableEntry(
     var uuid: UUID,

kotpass/src/main/kotlin/app/keemobile/kotpass/builders/Group.kt

@@ -6,7 +6,7 @@ import app.keemobile.kotpass.models.CustomDataValue
 import app.keemobile.kotpass.models.Entry
 import app.keemobile.kotpass.models.Group
 import app.keemobile.kotpass.models.TimeData
-import java.util.*
+import java.util.UUID
 
 internal class MutableGroup(
     var uuid: UUID,

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/AesEngine.kt

@@ -8,7 +8,6 @@ import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
 internal object AesEngine {
-
     fun encrypt(
         key: ByteArray,
         iv: ByteArray,

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/AesKdf.kt

@@ -9,7 +9,6 @@ import javax.crypto.Cipher
 import javax.crypto.spec.SecretKeySpec
 
 internal object AesKdf {
-
     fun transformKey(
         key: ByteArray,
         seed: ByteArray,

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/Argon2Engine.kt

@@ -29,10 +29,10 @@ private const val Argon2PreHashDigestLength = 64
 private const val Argon2PreHashSeedLength = 72
 private const val Argon2SyncPoints = 4
 
-/* Minimum and maximum digest size in bytes */
+// Minimum and maximum digest size in bytes
 private const val MinOutLen = 4
 
-/* Minimum and maximum number of passes */
+// Minimum and maximum number of passes
 private const val M32L = 0xFFFFFFFFL
 
 private val ZeroBytes = ByteArray(4)
@@ -70,16 +70,18 @@ internal class Argon2Engine(
     }
 
     init {
-        /* 2. Align memory size */
-        /* Minimum memoryBlocks = 8L blocks, where L is the number of lanes */
+        /**
+         * 2. Align memory size
+         * Minimum memoryBlocks = 8L blocks, where L is the number of lanes
+         */
         var memoryBlocks = memory
         if (memoryBlocks < 2 * Argon2SyncPoints * parallelism) {
             memoryBlocks = 2 * Argon2SyncPoints * parallelism
         }
         segmentLength = memoryBlocks / (parallelism * Argon2SyncPoints)
         laneLength = segmentLength * Argon2SyncPoints
 
-        /* Ensure that all segments have equal length */
+        // Ensure that all segments have equal length
         memoryBlocks = segmentLength * (parallelism * Argon2SyncPoints)
 
         blocks = Array(memoryBlocks) { Block() }
@@ -145,7 +147,7 @@ internal class Argon2Engine(
             val refLane = getRefLane(position, pseudoRandom)
             val refColumn = getRefColumn(position, index, pseudoRandom, refLane == position.lane)
 
-            /* 2 Creating a new block */
+            // 2 Creating a new block
             val prevBlock = blocks[prevOffset]
             val refBlock = blocks[laneLength * refLane + refColumn]
             val currentBlock = blocks[currentOffset]
@@ -177,7 +179,7 @@ internal class Argon2Engine(
         inputBlock.v[5] = intToLong(type.id)
 
         if (position.pass == 0 && position.slice == 0) {
-            /* Don't forget to generate the first block of addresses: */
+            // Don't forget to generate the first block of addresses:
             nextAddresses(filler, inputBlock, addressBlock)
         }
     }
@@ -188,10 +190,10 @@ internal class Argon2Engine(
 
     private fun getPrevOffset(currentOffset: Int): Int {
         return if (currentOffset % laneLength == 0) {
-            /* Last block in this lane */
+            // Last block in this lane
             currentOffset + laneLength - 1
         } else {
-            /* Previous block */
+            // Previous block
             currentOffset - 1
         }
     }
@@ -202,8 +204,10 @@ internal class Argon2Engine(
         filler.fillBlock(addressBlock, addressBlock)
     }
 
-    /* 1.2 Computing the index of the reference block */
-    /* 1.2.1 Taking pseudo-random value from the previous block */
+    /**
+     * 1.2 Computing the index of the reference block
+     * 1.2.1 Taking pseudo-random value from the previous block
+     */
     private fun getPseudoRandom(
         filler: FillBlock,
         index: Int,
@@ -226,7 +230,7 @@ internal class Argon2Engine(
     private fun getRefLane(position: Position, pseudoRandom: Long): Int {
         var refLane = ((pseudoRandom ushr 32) % parallelism).toInt()
         if (position.pass == 0 && position.slice == 0) {
-            /* Can not reference other lanes yet */
+            // Can not reference other lanes yet
             refLane = position.lane
         }
         return refLane
@@ -244,10 +248,10 @@ internal class Argon2Engine(
         if (position.pass == 0) {
             startPosition = 0
             referenceAreaSize = if (sameLane) {
-                /* The same lane => add current segment */
+                // The same lane => add current segment
                 position.slice * segmentLength + index - 1
             } else {
-                /* pass == 0 && !sameLane => position.slice > 0*/
+                // pass == 0 && !sameLane => position.slice > 0
                 position.slice * segmentLength + if (index == 0) -1 else 0
             }
         } else {
@@ -268,7 +272,7 @@ internal class Argon2Engine(
     private fun digest(tmpBlockBytes: ByteArray, out: ByteArray, outOff: Int, outLen: Int) {
         val finalBlock = blocks[laneLength - 1]
 
-        /* XOR the last blocks */
+        // XOR the last blocks
         for (i in 1 until parallelism) {
             val lastBlockInLane = i * laneLength + (laneLength - 1)
             finalBlock.xorWith(blocks[lastBlockInLane])
@@ -294,7 +298,7 @@ internal class Argon2Engine(
             var digest = Blake2bDigest(blake2bLength * 8)
             val outBuffer = ByteArray(blake2bLength)
 
-            /* V1 */
+            // V1
             digest.update(outLenBytes, 0, outLenBytes.size)
             digest.update(input, 0, input.size)
             digest.doFinal(outBuffer, 0)
@@ -306,7 +310,7 @@ internal class Argon2Engine(
             var i = 2
 
             while (i <= r) {
-                /* V2 to Vr */
+                // V2 to Vr
                 digest.update(outBuffer, 0, outBuffer.size)
                 digest.doFinal(outBuffer, 0)
                 System.arraycopy(outBuffer, 0, out, outPos, halfLen)
@@ -315,7 +319,7 @@ internal class Argon2Engine(
             }
             val lastLength = outLen - 32 * r
 
-            /* Vr+1 */
+            // Vr+1
             digest = Blake2bDigest(lastLength * 8)
             digest.update(outBuffer, 0, outBuffer.size)
             digest.doFinal(out, outPos)
@@ -375,9 +379,9 @@ internal class Argon2Engine(
 
         private fun applyBlake() {
             /*
-            * Apply Blake2 on columns of 64-bit words: (0,1,...,15),
-            * then (16,17,..31)... finally (112,113,...127)
-            */
+             * Apply Blake2 on columns of 64-bit words: (0,1,...,15),
+             * then (16,17,..31)... finally (112,113,...127)
+             */
             for (i in 0..7) {
                 val i16 = 16 * i
                 roundFunction(
@@ -431,7 +435,7 @@ internal class Argon2Engine(
     private class Block {
         private val Size = Argon2QwordsInBlock
 
-        /* 128 * 8 Byte QWords */
+        // 128 * 8 Byte QWords
         val v: LongArray = LongArray(Size)
 
         fun fromBytes(input: ByteArray) {
@@ -488,7 +492,7 @@ internal class Argon2Engine(
 
     private fun getStartingIndex(position: Position): Int {
         return if (position.pass == 0 && position.slice == 0) {
-            2 /* we have already generated the first two blocks */
+            2 // we have already generated the first two blocks
         } else {
             0
         }

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/Argon2Kdf.kt

@@ -1,7 +1,6 @@
 package app.keemobile.kotpass.cryptography
 
 internal object Argon2Kdf {
-
     fun transformKey(
         type: Argon2Engine.Type,
         version: Argon2Engine.Version,

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/Blake2bDigest.kt

@@ -3,14 +3,15 @@
  *
  * Copyright (c) 2000-2021 The Legion Of The Bouncy Castle Inc. (https://www.bouncycastle.org)
  * <p>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so,
  * subject to the following conditions:
  * <p>
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
  * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
  * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
@@ -47,17 +48,20 @@ internal class Blake2bDigest {
 
     private var key: ByteArray? = null
 
-    // Tree hashing parameters:
-    // Because this class does not implement the Tree Hashing Mode,
-    // these parameters can be treated as constants (see init() function)
-    /*
-     * private int fanout = 1; // 0-255 private int depth = 1; // 1 - 255
-     * private int leafLength= 0; private long nodeOffset = 0L; private int
-     * nodeDepth = 0; private int innerHashLength = 0;
+    /**
+     * Tree hashing parameters:
+     * Because this class does not implement the Tree Hashing Mode,
+     * these parameters can be treated as constants (see init() function)
+     *
+     * private int fanout = 1;
+     * 0-255 private int depth = 1;
+     * 1-255 private int leafLength= 0;
+     * private long nodeOffset = 0L;
+     * private int nodeDepth = 0;
+     * private int innerHashLength = 0;
+     * whenever this buffer overflows, it will be processed in the compress() function.
+     * For performance issues, long messages will not use this buffer.
      */
-    // whenever this buffer overflows, it will be processed
-    // in the compress() function.
-    // For performance issues, long messages will not use this buffer.
     private val buffer: ByteArray // new byte[BLOCK_LENGTH_BYTES];
 
     // Position of last inserted byte:

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/ContentEncryption.kt

@@ -3,7 +3,6 @@ package app.keemobile.kotpass.cryptography
 import app.keemobile.kotpass.database.header.DatabaseHeader
 
 internal object ContentEncryption {
-
     fun encrypt(
         cipherId: DatabaseHeader.CipherId,
         key: ByteArray,

kotpass/src/main/kotlin/app/keemobile/kotpass/cryptography/KeyTransform.kt

@@ -11,7 +11,6 @@ import app.keemobile.kotpass.extensions.sha256
 import app.keemobile.kotpass.extensions.sha512
 
 internal object KeyTransform {
-
     fun compositeKey(credentials: Credentials): ByteArray {
         val items = listOfNotNull(
             credentials.passphrase?.getBinary(),

kotpass/src/main/kotlin/app/keemobile/kotpass/database/Credentials.kt

@@ -24,7 +24,6 @@ class Credentials private constructor(
     val passphrase: EncryptedValue?,
     val key: EncryptedValue?
 ) {
-
     companion object {
         fun from(passphrase: EncryptedValue) = Credentials(
             passphrase = EncryptedValue.fromBinary(passphrase.getHash()),

kotpass/src/main/kotlin/app/keemobile/kotpass/database/KeePassDatabase.kt

@@ -10,7 +10,7 @@ import app.keemobile.kotpass.models.DatabaseElement
 import app.keemobile.kotpass.models.Entry
 import app.keemobile.kotpass.models.Group
 import app.keemobile.kotpass.models.Meta
-import java.util.*
+import java.util.UUID
 
 /**
  * Main class which describes Keepass database.
@@ -25,7 +25,6 @@ sealed class KeePassDatabase {
         override val header: DatabaseHeader.Ver3x,
         override val content: DatabaseContent
     ) : KeePassDatabase() {
-
         companion object {
             /**
              * Creates blank database with default settings.
@@ -61,7 +60,6 @@ sealed class KeePassDatabase {
         override val content: DatabaseContent,
         val innerHeader: DatabaseInnerHeader
     ) : KeePassDatabase() {
-
         companion object {
             /**
              * Creates blank database with default settings.

kotpass/src/main/kotlin/app/keemobile/kotpass/database/header/DatabaseHeader.kt

@@ -15,7 +15,7 @@ import okio.BufferedSource
 import okio.ByteString
 import java.nio.ByteBuffer
 import java.security.SecureRandom
-import java.util.*
+import java.util.UUID
 
 private val EndOfHeaderBytes = ByteString.of(0x0D, 0x0A, 0x0D, 0x0A)
 
@@ -40,7 +40,6 @@ sealed class DatabaseHeader {
         val innerRandomStreamKey: ByteString,
         val streamStartBytes: ByteString
     ) : DatabaseHeader() {
-
         companion object {
             fun create() = with(SecureRandom()) {
                 Ver3x(
@@ -70,7 +69,6 @@ sealed class DatabaseHeader {
         val kdfParameters: KdfParameters,
         val publicCustomData: Map<String, VariantItem>
     ) : DatabaseHeader() {
-
         companion object {
             fun create() = with(SecureRandom()) {
                 Ver4x(

kotpass/src/main/kotlin/app/keemobile/kotpass/database/header/DatabaseInnerHeader.kt

@@ -25,7 +25,6 @@ data class DatabaseInnerHeader(
     @PublishedApi
     internal val binaries: Map<ByteString, BinaryData> = linkedMapOf()
 ) {
-
     internal fun writeTo(sink: BufferedSink) = with(sink) {
         writeByte(InnerHeaderFieldId.StreamId)
         writeIntLe(Int.SIZE_BYTES)

kotpass/src/main/kotlin/app/keemobile/kotpass/database/header/Signature.kt

@@ -9,7 +9,6 @@ class Signature(
     val base: ByteString,
     val secondary: ByteString
 ) {
-
     internal fun writeTo(sink: BufferedSink) = with(sink) {
         write(base)
         write(secondary)