Fix gradle format task.

2026-05-08 09:18:39 +01:00 · 2026-02-16 14:22:44 -05:00
parent 9cefe0bc04
commit b48b1f031e
57 changed files with 164 additions and 186 deletions
@@ -127,7 +127,7 @@ tasks.register("format") {
  dependsOn(
    gradle.includedBuild("build-logic").task(":plugins:ktlintFormat"),
    gradle.includedBuild("build-logic").task(":tools:ktlintFormat"),
-    *subprojects.mapNotNull { tasks.findByPath(":${it.name}:ktlintFormat") }.toTypedArray()
+    *subprojects.mapNotNull { tasks.findByPath(":${it.path}:ktlintFormat") }.toTypedArray()
  )
 }

@@ -34,8 +34,8 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.R
@@ -22,7 +22,7 @@ class CoreUiDependenciesRule(

  private class Provider(
    val isIncognitoKeyboardEnabled: Boolean
-  ): CoreUiDependencies.Provider {
+  ) : CoreUiDependencies.Provider {
    override fun providePackageId(): String = "org.thoughtcrime.securesms"
    override fun provideIsIncognitoKeyboardEnabled(): Boolean = isIncognitoKeyboardEnabled
    override fun provideIsScreenSecurityEnabled(): Boolean = false
@@ -150,7 +150,7 @@ private fun Message<*, *>.appendSizeTree(name: String, depth: Int, sb: StringBui
          if (isMessageList) {
            for (i in value.indices) {
              sb.append("\n")
-              (value[i] as Message<*, *>).appendSizeTree("${fieldName}[$i]", depth + 2, sb)
+              (value[i] as Message<*, *>).appendSizeTree("$fieldName[$i]", depth + 2, sb)
            }
          }
        }
@@ -10,7 +10,6 @@ import org.signal.core.util.Hex
 import org.signal.core.util.isNotNullOrBlank
 import java.util.regex.Matcher
 import java.util.regex.Pattern
-import kotlin.io.path.Path

 /** Given a [Matcher], update the [StringBuilder] with the scrubbed output you want for a given match. */
 private typealias MatchProcessor = (Matcher, StringBuilder) -> Unit
@@ -1,13 +1,11 @@
 package org.signal.camera.demo

-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

-import org.junit.Assert.*
-
 /**
 * Instrumented test, which will execute on an Android device.
 *
@@ -1,22 +1,15 @@
 package org.signal.camera.demo

-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.ContentTransform
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
-import androidx.navigation3.runtime.NavKey
 import androidx.compose.ui.Modifier
 import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
-import androidx.navigation3.scene.Scene
 import androidx.navigation3.ui.NavDisplay
 import org.signal.camera.demo.screens.gallery.GalleryScreen
 import org.signal.camera.demo.screens.imageviewer.ImageViewerScreen
@@ -56,7 +49,7 @@ fun NavGraph(
        animationSpec = tween(500)
      ) togetherWith
        // Camera stays in place and fades out
-      slideOutHorizontally (
+        slideOutHorizontally(
          targetOffsetX = { fullWidth -> -fullWidth },
          animationSpec = tween(500)
        )
@@ -5,8 +5,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
@@ -17,10 +15,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.PlayArrow
@@ -5,6 +5,7 @@ package org.signal.camera.demo.screens.main
 import android.Manifest
 import android.os.Build
 import android.widget.Toast
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -25,28 +26,27 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation3.runtime.NavBackStack
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.MultiplePermissionsState
 import com.google.accompanist.permissions.PermissionState
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
-import androidx.compose.foundation.background
-import androidx.compose.ui.graphics.Color
-import androidx.navigation3.runtime.NavBackStack
-import org.signal.camera.demo.Screen
-import org.signal.camera.hud.StandardCameraHudEvents
 import org.signal.camera.CameraScreen
 import org.signal.camera.CameraScreenEvents
 import org.signal.camera.CameraScreenViewModel
+import org.signal.camera.demo.Screen
 import org.signal.camera.hud.StandardCameraHud
+import org.signal.camera.hud.StandardCameraHudEvents

@Composable
 fun MainScreen(
  backStack: NavBackStack<Screen>,
-  viewModel: MainScreenViewModel = viewModel(),
+  viewModel: MainScreenViewModel = viewModel()
 ) {
  val cameraViewModel: CameraScreenViewModel = viewModel()

@@ -126,7 +126,7 @@ fun MainScreen(
                    }
                  )
                }
-                is StandardCameraHudEvents.VideoCaptureStopped-> {
+                is StandardCameraHudEvents.VideoCaptureStopped -> {
                  cameraViewModel.stopRecording()
                }
                is StandardCameraHudEvents.GalleryClick -> {
@@ -9,11 +9,11 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import org.signal.camera.VideoCaptureResult
-import org.signal.camera.VideoOutput
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.signal.camera.VideoCaptureResult
+import org.signal.camera.VideoOutput
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -27,7 +27,6 @@ import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 import androidx.navigation3.runtime.NavBackStack
 import org.signal.camera.demo.Screen
-import java.io.File

@OptIn(UnstableApi::class)
@Composable
@@ -1,6 +1,5 @@
 package org.signal.camera.demo.ui.theme

-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -1,9 +1,8 @@
 package org.signal.camera.demo

+import org.junit.Assert.assertEquals
 import org.junit.Test

-import org.junit.Assert.*
-
 /**
 * Example local unit test, which will execute on the development machine (host).
 *
@@ -59,12 +59,15 @@ class RegistrationApplication : Application() {
      )
    )

-    CoreUiDependencies.init(this, object : CoreUiDependencies.Provider {
+    CoreUiDependencies.init(
+      this,
+      object : CoreUiDependencies.Provider {
        override fun providePackageId(): String = BuildConfig.APPLICATION_ID
        override fun provideIsIncognitoKeyboardEnabled(): Boolean = false
        override fun provideIsScreenSecurityEnabled(): Boolean = false
        override fun provideForceSplitPane(): Boolean = false
-    })
+      }
+    )
  }

  private fun createPushServiceSocket(configuration: SignalServiceConfiguration): PushServiceSocket {
@@ -8,7 +8,6 @@ package org.signal.registration.sample.absbackup
 import android.app.backup.BackupAgent
 import android.app.backup.BackupDataInput
 import android.app.backup.BackupDataOutput
-import android.app.backup.FullBackupDataOutput
 import android.os.ParcelFileDescriptor
 import org.signal.core.util.logging.Log
 import org.signal.registration.NetworkController
@@ -17,7 +16,6 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.DataInputStream
 import java.io.DataOutputStream
-import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
@@ -10,6 +10,8 @@ import org.signal.core.util.logging.Log
 import org.signal.registration.NetworkController
 import org.signal.registration.NetworkController.AccountAttributes
 import org.signal.registration.NetworkController.BackupMasterKeyError
+import org.signal.registration.NetworkController.CheckSvrCredentialsError
+import org.signal.registration.NetworkController.CheckSvrCredentialsResponse
 import org.signal.registration.NetworkController.CreateSessionError
 import org.signal.registration.NetworkController.GetSessionStatusError
 import org.signal.registration.NetworkController.GetSvrCredentialsError
@@ -27,8 +29,6 @@ import org.signal.registration.NetworkController.SubmitVerificationCodeError
 import org.signal.registration.NetworkController.SvrCredentials
 import org.signal.registration.NetworkController.UpdateSessionError
 import org.signal.registration.NetworkController.VerificationCodeTransport
-import org.signal.registration.NetworkController.CheckSvrCredentialsError
-import org.signal.registration.NetworkController.CheckSvrCredentialsResponse
 import java.util.Locale

 /**
@@ -17,6 +17,8 @@ import org.signal.libsignal.net.Network
 import org.signal.libsignal.protocol.util.Hex
 import org.signal.registration.NetworkController
 import org.signal.registration.NetworkController.AccountAttributes
+import org.signal.registration.NetworkController.CheckSvrCredentialsRequest
+import org.signal.registration.NetworkController.CheckSvrCredentialsResponse
 import org.signal.registration.NetworkController.CreateSessionError
 import org.signal.registration.NetworkController.GetSessionStatusError
 import org.signal.registration.NetworkController.PreKeyCollection
@@ -25,8 +27,6 @@ import org.signal.registration.NetworkController.RegisterAccountResponse
 import org.signal.registration.NetworkController.RegistrationLockResponse
 import org.signal.registration.NetworkController.RegistrationNetworkResult
 import org.signal.registration.NetworkController.RequestVerificationCodeError
-import org.signal.registration.NetworkController.CheckSvrCredentialsRequest
-import org.signal.registration.NetworkController.CheckSvrCredentialsResponse
 import org.signal.registration.NetworkController.SessionMetadata
 import org.signal.registration.NetworkController.SubmitVerificationCodeError
 import org.signal.registration.NetworkController.ThirdPartyServiceErrorResponse
@@ -5,7 +5,6 @@ import androidx.camera.compose.CameraXViewfinder
 import androidx.camera.core.SurfaceRequest
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.viewfinder.compose.MutableCoordinateTransformer
-import androidx.camera.core.Preview as CameraPreview
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.Spring
@@ -45,6 +44,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.signal.core.ui.compose.Previews
+import androidx.camera.core.Preview as CameraPreview

 /**
 * A camera screen that handles core camera functionality, such as:
@@ -45,4 +45,3 @@ enum class FlashMode(val cameraxMode: Int) {
    }
  }
 }
-
@@ -3,8 +3,8 @@ package org.signal.camera
 import android.Manifest
 import android.app.Activity
 import android.content.Context
-import android.content.pm.PackageManager
 import android.content.ContextWrapper
+import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.graphics.Matrix
 import android.os.Build
@@ -133,7 +133,7 @@ class CameraScreenViewModel : ViewModel() {
  @androidx.annotation.OptIn(markerClass = [androidx.camera.core.ExperimentalGetImage::class])
  fun capturePhoto(
    context: Context,
-    onPhotoCaptured: (Bitmap) -> Unit,
+    onPhotoCaptured: (Bitmap) -> Unit
  ) {
    val state = _state.value
    val capture = imageCapture ?: run {
@@ -22,12 +22,12 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
@@ -32,9 +32,9 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.signal.glide.compose.GlideImage
 import org.signal.glide.compose.GlideImageScaleType
-import kotlinx.coroutines.withContext

 /**
 * A button that displays a thumbnail of the most recent image or video from the gallery.
@@ -413,7 +413,7 @@ private fun MediaCountIndicator(
      .padding(horizontal = 12.dp),
    verticalAlignment = Alignment.CenterVertically
  ) {
-    val size = with (LocalDensity.current) {
+    val size = with(LocalDensity.current) {
      22.sp.toDp()
    }
    Box(
@@ -8,7 +8,6 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.FragmentActivity
@@ -6,7 +6,6 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContract
-import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
@@ -38,4 +38,3 @@ data class RegistrationFlowState(
  /** If true, do not attempt any flows where we generate RRP's. Create a session instead. */
  val doNotAttemptRecoveryPassword: Boolean = false
 ) : Parcelable
-
@@ -26,10 +26,7 @@ import org.signal.registration.RegistrationFlowState
 import org.signal.registration.RegistrationRepository
 import org.signal.registration.RegistrationRoute
 import org.signal.registration.screens.phonenumber.PhoneNumberEntryState.OneTimeEvent
-import org.signal.registration.screens.phonenumber.PhoneNumberEntryState.OneTimeEvent.*
 import org.signal.registration.screens.util.navigateTo
-import org.signal.registration.screens.verificationcode.VerificationCodeState
-import org.signal.registration.screens.verificationcode.VerificationCodeViewModel

 class PhoneNumberEntryViewModel(
  val repository: RegistrationRepository,
@@ -238,7 +235,7 @@ class PhoneNumberEntryViewModel(
    if (state.restoredSvrCredentials.isNotEmpty()) {
      when (val result = repository.checkSvrCredentials(e164, state.restoredSvrCredentials)) {
        is NetworkController.RegistrationNetworkResult.Success -> {
-          Log.i(TAG, "[CheckSVRCredentials] Successfully validated credentials for ${e164}.")
+          Log.i(TAG, "[CheckSVRCredentials] Successfully validated credentials for $e164.")
          val credential = result.data.validCredential
          if (credential != null) {
            parentEventEmitter(RegistrationFlowEvent.E164Chosen(e164))
@@ -19,4 +19,3 @@ object MasterKeyParceler : Parceler<MasterKey?> {
    parcel.writeByteArray(this?.serialize())
  }
 }
-
@@ -7,11 +7,11 @@ package org.signal.registration

 import android.app.Application
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.test.core.app.ApplicationProvider
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.lifecycle.SavedStateHandle
+import androidx.test.core.app.ApplicationProvider
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import io.mockk.mockk
 import org.junit.Before
@@ -7,11 +7,11 @@ package org.signal.registration.screens.phonenumber

 import android.app.Application
 import androidx.compose.ui.test.assertIsEnabled
-import androidx.test.core.app.ApplicationProvider
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
+import androidx.test.core.app.ApplicationProvider
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -7,12 +7,12 @@ package org.signal.registration.screens.verificationcode

 import android.app.Application
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.test.core.app.ApplicationProvider
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
+import androidx.test.core.app.ApplicationProvider
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -7,10 +7,10 @@ package org.signal.registration.screens.welcome

 import android.app.Application
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.test.core.app.ApplicationProvider
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
+import androidx.test.core.app.ApplicationProvider
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -48,7 +48,7 @@ internal class GroupChangeActionsBuilderChangeSetModifier(private val result: Gr
  }

  override fun clearModifyDisappearingMessagesTimer() {
-    result.modifyDisappearingMessageTimer= null
+    result.modifyDisappearingMessageTimer = null
  }

  override fun clearModifyAttributesAccess() {