chore: reformat with trailing commas changes

Author: msfjarvis

app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt

@@ -77,11 +77,6 @@ constructor(
         .withAsciiArmor(settings.getBoolean(PreferenceKeys.ASCII_ARMOR, false))
         .build()
     val keys = identities.map { id -> pgpKeyManager.getKeyById(id) }.filterValues()
-    return pgpCryptoHandler.encrypt(
-      keys,
-      content,
-      out,
-      encryptionOptions,
-    )
+    return pgpCryptoHandler.encrypt(keys, content, out, encryptionOptions)
   }
 }

app/src/main/java/app/passwordstore/data/crypto/PGPPassphraseCache.kt

@@ -11,35 +11,21 @@ import javax.inject.Inject
 import kotlinx.coroutines.withContext
 
 /** Implements a rudimentary [EncryptedSharedPreferences]-backed cache for GPG passphrases. */
-class PGPPassphraseCache
-@Inject
-constructor(
-  private val dispatcherProvider: DispatcherProvider,
-) {
+class PGPPassphraseCache @Inject constructor(private val dispatcherProvider: DispatcherProvider) {
 
-  suspend fun cachePassphrase(
-    context: Context,
-    identifier: PGPIdentifier,
-    passphrase: String,
-  ) {
+  suspend fun cachePassphrase(context: Context, identifier: PGPIdentifier, passphrase: String) {
     withContext(dispatcherProvider.io()) {
       getPreferences(context).edit { putString(identifier.toString(), passphrase) }
     }
   }
 
-  suspend fun retrieveCachedPassphrase(
-    context: Context,
-    identifier: PGPIdentifier,
-  ): String? {
+  suspend fun retrieveCachedPassphrase(context: Context, identifier: PGPIdentifier): String? {
     return withContext(dispatcherProvider.io()) {
       getPreferences(context).getString(identifier.toString())
     }
   }
 
-  suspend fun clearCachedPassphrase(
-    context: Context,
-    identifier: PGPIdentifier,
-  ) {
+  suspend fun clearCachedPassphrase(context: Context, identifier: PGPIdentifier) {
     withContext(dispatcherProvider.io()) {
       getPreferences(context).edit { remove(identifier.toString()) }
     }

app/src/main/java/app/passwordstore/data/password/FieldItem.kt

@@ -10,7 +10,7 @@ import app.passwordstore.data.passfile.Totp
 class FieldItem(val key: String, val value: String, val action: ActionType) {
   enum class ActionType {
     COPY,
-    HIDE
+    HIDE,
   }
 
   enum class ItemType(val type: String, val label: String) {

app/src/main/java/app/passwordstore/data/password/PasswordItem.kt

@@ -16,7 +16,7 @@ data class PasswordItem(
   val parent: PasswordItem? = null,
   val type: Char,
   val file: File,
-  val rootDir: File
+  val rootDir: File,
 ) : Comparable<PasswordItem> {
 
   val fullPathToParent = file.absolutePath.replace(rootDir.absolutePath, "").replace(file.name, "")

app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt

@@ -167,7 +167,7 @@ object PasswordRepository {
   fun getPasswords(
     path: File,
     rootDir: File,
-    sortOrder: PasswordSortOrder
+    sortOrder: PasswordSortOrder,
   ): ArrayList<PasswordItem> {
     // We need to recover the passwords then parse the files
     val passList = getFilesList(path).also { it.sortBy { f -> f.name } }

app/src/main/java/app/passwordstore/injection/crypto/KeyManagerModule.kt

@@ -23,10 +23,7 @@ object KeyManagerModule {
     @PGPKeyDir keyDir: String,
     dispatcherProvider: DispatcherProvider,
   ): PGPKeyManager {
-    return PGPKeyManager(
-      keyDir,
-      dispatcherProvider.io(),
-    )
+    return PGPKeyManager(keyDir, dispatcherProvider.io())
   }
 
   @Provides

app/src/main/java/app/passwordstore/injection/prefs/PreferenceModule.kt

@@ -25,7 +25,7 @@ class PreferenceModule {
       fileName,
       masterKeyAlias,
       EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-      EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+      EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
     )
   }
 

app/src/main/java/app/passwordstore/injection/pwgen/DicewareModule.kt

@@ -32,9 +32,7 @@ object DicewareModule {
   }
 
   @Provides
-  fun provideDie(
-    intGenerator: RandomIntGenerator,
-  ): Die {
+  fun provideDie(intGenerator: RandomIntGenerator): Die {
     return Die(6, intGenerator)
   }
 

app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt

@@ -113,15 +113,15 @@ class AutofillDecryptActivity : BasePGPActivity() {
           val cachedPassphrase =
             passphraseCache.retrieveCachedPassphrase(
               this@AutofillDecryptActivity,
-              gpgIdentifiers.first()
+              gpgIdentifiers.first(),
             )
           if (cachedPassphrase != null) {
             decryptWithPassphrase(
               File(filePath),
               gpgIdentifiers,
               clientState,
               action,
-              cachedPassphrase
+              cachedPassphrase,
             )
           } else {
             askPassphrase(filePath, gpgIdentifiers, clientState, action)
@@ -169,12 +169,12 @@ class AutofillDecryptActivity : BasePGPActivity() {
           this@AutofillDecryptActivity,
           credentials,
           clientState,
-          action
+          action,
         )
       withContext(dispatcherProvider.main()) {
         setResult(
           RESULT_OK,
-          Intent().apply { putExtra(AutofillManager.EXTRA_AUTHENTICATION_RESULT, fillInDataset) }
+          Intent().apply { putExtra(AutofillManager.EXTRA_AUTHENTICATION_RESULT, fillInDataset) },
         )
       }
     }
@@ -195,12 +195,7 @@ class AutofillDecryptActivity : BasePGPActivity() {
         runCatching {
             withContext(dispatcherProvider.io()) {
               val outputStream = ByteArrayOutputStream()
-              repository.decrypt(
-                password,
-                identifiers,
-                encryptedInput,
-                outputStream,
-              )
+              repository.decrypt(password, identifiers, encryptedInput, outputStream)
               outputStream
             }
           }

app/src/main/java/app/passwordstore/ui/autofill/AutofillFilterView.kt

@@ -61,7 +61,7 @@ class AutofillFilterView : AppCompatActivity() {
 
     fun makeMatchAndDecryptFileIntentSender(
       context: Context,
-      formOrigin: FormOrigin
+      formOrigin: FormOrigin,
     ): IntentSender {
       val intent =
         Intent(context, AutofillFilterView::class.java).apply {
@@ -193,7 +193,7 @@ class AutofillFilterView : AppCompatActivity() {
       shouldMatch.text =
         getString(
           R.string.oreo_autofill_match_with,
-          formOrigin.getPrettyIdentifier(applicationContext)
+          formOrigin.getPrettyIdentifier(applicationContext),
         )
       lifecycleScope.launch { handleSearchResults() }
     }
@@ -222,7 +222,7 @@ class AutofillFilterView : AppCompatActivity() {
       filterMode =
         if (binding.strictDomainSearch.isChecked) FilterMode.StrictDomain else FilterMode.Fuzzy,
       searchMode = SearchMode.RecursivelyInSubdirectories,
-      listMode = ListMode.FilesOnly
+      listMode = ListMode.FilesOnly,
     )
   }