chore(deps): Upgrade ktlint to v0.50

.editorconfig

@@ -1,6 +1,10 @@
 # http://editorconfig.org
 root = true
 
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+
 [*]
 charset = utf-8
 end_of_line = lf

lib/build.gradle

@@ -121,7 +121,7 @@ dokkaHtml.configure {
 ktlint {
   verbose = true
   android = true
-  version = "0.43.2"
+  version = "0.50.0"
 }
 
 afterEvaluate {

lib/src/main/java/tech/relaycorp/awaladroid/AndroidPrivateKeyStore.kt

@@ -3,9 +3,9 @@ package tech.relaycorp.awaladroid
 import android.content.Context
 import androidx.security.crypto.EncryptedFile
 import androidx.security.crypto.MasterKey
-import java.io.File
 import tech.relaycorp.awala.keystores.file.FileKeystoreRoot
 import tech.relaycorp.awala.keystores.file.FilePrivateKeyStore
+import java.io.File
 
 internal class AndroidPrivateKeyStore(
     root: FileKeystoreRoot,
@@ -20,7 +20,7 @@ internal class AndroidPrivateKeyStore(
             context,
             file,
             masterKey,
-            EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB
+            EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB,
         ).build()
 
     private val masterKey by lazy {

lib/src/main/java/tech/relaycorp/awaladroid/Awala.kt

@@ -1,7 +1,6 @@
 package tech.relaycorp.awaladroid
 
 import android.content.Context
-import java.io.File
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import tech.relaycorp.awala.keystores.file.FileCertificateStore
@@ -15,6 +14,7 @@ import tech.relaycorp.awaladroid.endpoint.RenewExpiringCertificates
 import tech.relaycorp.awaladroid.storage.StorageImpl
 import tech.relaycorp.awaladroid.storage.persistence.DiskPersistence
 import tech.relaycorp.relaynet.nodes.EndpointManager
+import java.io.File
 
 public object Awala {
     internal const val POWEB_PORT = 13276
@@ -42,7 +42,7 @@ public object Awala {
         this.context = AwalaContext(
             StorageImpl(DiskPersistence(context.filesDir.path.toString())),
             GatewayClientImpl(
-                serviceInteractorBuilder = { ServiceInteractor(context) }
+                serviceInteractorBuilder = { ServiceInteractor(context) },
             ),
             EndpointManager(androidPrivateKeyStore, fileSessionPublicKeystore),
             ChannelManager {
@@ -51,7 +51,7 @@ public object Awala {
             androidPrivateKeyStore,
             fileSessionPublicKeystore,
             fileCertificateStore,
-            HandleGatewayCertificateChange(androidPrivateKeyStore)
+            HandleGatewayCertificateChange(androidPrivateKeyStore),
         )
 
         coroutineScope {

lib/src/main/java/tech/relaycorp/awaladroid/AwalaContext.kt

@@ -16,5 +16,5 @@ internal data class AwalaContext(
     val privateKeyStore: PrivateKeyStore,
     val sessionPublicKeyStore: SessionPublicKeyStore,
     val certificateStore: CertificateStore,
-    val handleGatewayCertificateChange: HandleGatewayCertificateChange
+    val handleGatewayCertificateChange: HandleGatewayCertificateChange,
 )

lib/src/main/java/tech/relaycorp/awaladroid/GatewayClientImpl.kt

@@ -1,11 +1,5 @@
 package tech.relaycorp.awaladroid
 
-import java.security.KeyPair
-import java.util.logging.Level
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -28,6 +22,12 @@ import tech.relaycorp.relaynet.bindings.pdc.PDCClient
 import tech.relaycorp.relaynet.bindings.pdc.ServerException
 import tech.relaycorp.relaynet.messages.control.PrivateNodeRegistration
 import tech.relaycorp.relaynet.messages.control.PrivateNodeRegistrationRequest
+import java.security.KeyPair
+import java.util.logging.Level
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
 
 /**
  * Private gateway client.
@@ -39,7 +39,7 @@ internal constructor(
     private val pdcClientBuilder: () -> PDCClient =
         { PoWebClient.initLocal(port = Awala.POWEB_PORT) },
     private val sendMessage: SendMessage = SendMessage(),
-    private val receiveMessages: ReceiveMessages = ReceiveMessages()
+    private val receiveMessages: ReceiveMessages = ReceiveMessages(),
 ) {
 
     // Gateway
@@ -59,12 +59,12 @@ internal constructor(
                     bind(
                         Awala.GATEWAY_SYNC_ACTION,
                         Awala.GATEWAY_PACKAGE,
-                        Awala.GATEWAY_SYNC_COMPONENT
+                        Awala.GATEWAY_SYNC_COMPONENT,
                     )
                 } catch (exp: ServiceInteractor.BindFailedException) {
                     throw GatewayBindingException(
                         "Failed binding to Awala Gateway for registration",
-                        exp
+                        exp,
                     )
                 }
             }
@@ -86,12 +86,11 @@ internal constructor(
 
     @Throws(
         RegistrationFailedException::class,
-        GatewayProtocolException::class
+        GatewayProtocolException::class,
     )
     internal suspend fun registerEndpoint(keyPair: KeyPair): PrivateNodeRegistration =
         withContext(coroutineContext) {
             try {
-
                 val preAuthSerialized = preRegister()
                 val request = PrivateNodeRegistrationRequest(keyPair.public, preAuthSerialized)
                 val requestSerialized = request.serialize(keyPair.private)
@@ -117,14 +116,14 @@ internal constructor(
     @Throws(
         ServiceInteractor.BindFailedException::class,
         ServiceInteractor.SendFailedException::class,
-        GatewayProtocolException::class
+        GatewayProtocolException::class,
     )
     private suspend fun preRegister(): ByteArray {
         val interactor = serviceInteractorBuilder().apply {
             bind(
                 Awala.GATEWAY_PRE_REGISTER_ACTION,
                 Awala.GATEWAY_PACKAGE,
-                Awala.GATEWAY_PRE_REGISTER_COMPONENT
+                Awala.GATEWAY_PRE_REGISTER_COMPONENT,
             )
         }
 
@@ -134,7 +133,7 @@ internal constructor(
                 if (replyMessage.what != REGISTRATION_AUTHORIZATION) {
                     interactor.unbind()
                     cont.resumeWithException(
-                        GatewayProtocolException("Pre-registration failed, received wrong reply")
+                        GatewayProtocolException("Pre-registration failed, received wrong reply"),
                     )
                     return@sendMessage
                 }
@@ -150,7 +149,7 @@ internal constructor(
         GatewayBindingException::class,
         GatewayProtocolException::class,
         SendMessageException::class,
-        RejectedMessageException::class
+        RejectedMessageException::class,
     )
     public suspend fun sendMessage(message: OutgoingMessage) {
         if (gwServiceInteractor == null) {
@@ -178,7 +177,7 @@ internal constructor(
                     logger.log(
                         Level.SEVERE,
                         "Could not bind to gateway to receive new messages",
-                        exp
+                        exp,
                     )
                     return@withContext
                 }

lib/src/main/java/tech/relaycorp/awaladroid/background/GatewayCertificateChangeBroadcastReceiver.kt

@@ -3,11 +3,11 @@ package tech.relaycorp.awaladroid.background
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import tech.relaycorp.awaladroid.Awala
+import kotlin.coroutines.CoroutineContext
 
 internal class GatewayCertificateChangeBroadcastReceiver : BroadcastReceiver() {
 

lib/src/main/java/tech/relaycorp/awaladroid/background/IncomingParcelBroadcastReceiver.kt

@@ -3,11 +3,11 @@ package tech.relaycorp.awaladroid.background
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import tech.relaycorp.awaladroid.Awala
+import kotlin.coroutines.CoroutineContext
 
 internal class IncomingParcelBroadcastReceiver : BroadcastReceiver() {
 

lib/src/main/java/tech/relaycorp/awaladroid/background/ServiceInteractor.kt

@@ -10,13 +10,13 @@ import android.os.Looper
 import android.os.Message
 import android.os.Messenger
 import android.os.RemoteException
+import tech.relaycorp.awaladroid.common.Logging.logger
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
-import tech.relaycorp.awaladroid.common.Logging.logger
 
 internal class ServiceInteractor(
-    private val context: Context
+    private val context: Context,
 ) {
 
     private var serviceConnection: ServiceConnection? = null
@@ -66,14 +66,14 @@ internal class ServiceInteractor(
             val intent = Intent(action).apply {
                 component = ComponentName(
                     packageName,
-                    componentName
+                    componentName,
                 )
             }
 
             val bindWasSuccessful = context.bindService(
                 intent,
                 serviceConnection,
-                Context.BIND_AUTO_CREATE
+                Context.BIND_AUTO_CREATE,
             )
             if (!bindWasSuccessful) cont.resumeWithException(BindFailedException("Binding failed"))
         }

lib/src/main/java/tech/relaycorp/awaladroid/common/Keys.kt

@@ -1,12 +1,12 @@
 package tech.relaycorp.awaladroid.common
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider
 import java.security.KeyFactory
 import java.security.KeyPair
 import java.security.PrivateKey
 import java.security.PublicKey
 import java.security.interfaces.RSAPrivateCrtKey
 import java.security.spec.RSAPublicKeySpec
-import org.bouncycastle.jce.provider.BouncyCastleProvider
 
 internal fun PrivateKey.toKeyPair(): KeyPair =
     KeyPair(toPublicKey(), this)

lib/src/main/java/tech/relaycorp/awaladroid/endpoint/ChannelManager.kt

@@ -1,35 +1,35 @@
 package tech.relaycorp.awaladroid.endpoint
 
 import android.content.SharedPreferences
-import java.security.PublicKey
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import tech.relaycorp.relaynet.wrappers.nodeId
+import java.security.PublicKey
+import kotlin.coroutines.CoroutineContext
 
 internal class ChannelManager(
     internal val coroutineContext: CoroutineContext = Dispatchers.IO,
-    sharedPreferencesGetter: () -> SharedPreferences
+    sharedPreferencesGetter: () -> SharedPreferences,
 ) {
     internal val sharedPreferences by lazy(sharedPreferencesGetter)
 
     suspend fun create(
         firstPartyEndpoint: FirstPartyEndpoint,
-        thirdPartyEndpoint: ThirdPartyEndpoint
+        thirdPartyEndpoint: ThirdPartyEndpoint,
     ) {
         create(firstPartyEndpoint, thirdPartyEndpoint.nodeId)
     }
 
     suspend fun create(
         firstPartyEndpoint: FirstPartyEndpoint,
-        thirdPartyEndpointPublicKey: PublicKey
+        thirdPartyEndpointPublicKey: PublicKey,
     ) {
         create(firstPartyEndpoint, thirdPartyEndpointPublicKey.nodeId)
     }
 
     private suspend fun create(
         firstPartyEndpoint: FirstPartyEndpoint,
-        thirdPartyEndpointNodeId: String
+        thirdPartyEndpointNodeId: String,
     ) {
         withContext(coroutineContext) {
             val originalValue =
@@ -38,7 +38,7 @@ internal class ChannelManager(
             with(sharedPreferences.edit()) {
                 putStringSet(
                     firstPartyEndpoint.nodeId,
-                    originalValue + mutableListOf(thirdPartyEndpointNodeId)
+                    originalValue + mutableListOf(thirdPartyEndpointNodeId),
                 )
                 commit()
             }
@@ -57,7 +57,7 @@ internal class ChannelManager(
     }
 
     suspend fun delete(
-        thirdPartyEndpoint: ThirdPartyEndpoint
+        thirdPartyEndpoint: ThirdPartyEndpoint,
     ) {
         withContext(coroutineContext) {
             sharedPreferences.all.forEach { (key, value) ->
@@ -85,7 +85,7 @@ internal class ChannelManager(
         withContext(coroutineContext) {
             return@withContext sharedPreferences.getStringSet(
                 firstPartyEndpoint.nodeId,
-                emptySet()
+                emptySet(),
             ) ?: emptySet()
         }
 }