From ca69051075bf88efff7183f1a5f2fd5797fc38c9 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Wed, 18 Jun 2025 21:19:41 +0000 Subject: [PATCH] detekt cleanup (#2159) --- .../geeksville/mesh/ui/radioconfig/RadioConfigViewModel.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfigViewModel.kt b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfigViewModel.kt index 8571cc0a9..ca0963cad 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfigViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/RadioConfigViewModel.kt @@ -400,6 +400,7 @@ class RadioConfigViewModel @Inject constructor( writeSecurityKeysJsonToUri(uri, securityConfig) } + private val indentSpaces = 4 private suspend fun writeSecurityKeysJsonToUri(uri: Uri, securityConfig: SecurityConfig) = withContext(Dispatchers.IO) { try { @@ -408,7 +409,6 @@ class RadioConfigViewModel @Inject constructor( val privateKeyBytes = securityConfig.privateKey.toByteArray() - // Convert byte arrays to Base64 strings for human readability in JSON val publicKeyBase64 = Base64.encodeToString(publicKeyBytes, Base64.NO_WRAP) val privateKeyBase64 = Base64.encodeToString(privateKeyBytes, Base64.NO_WRAP) @@ -422,7 +422,7 @@ class RadioConfigViewModel @Inject constructor( // Convert JSON object to a string val jsonString = - jsonObject.toString(4) + jsonObject.toString(indentSpaces) app.contentResolver.openFileDescriptor(uri, "wt")?.use { parcelFileDescriptor -> FileOutputStream(parcelFileDescriptor.fileDescriptor).use { outputStream -> @@ -430,15 +430,12 @@ class RadioConfigViewModel @Inject constructor( } } setResponseStateSuccess() - } catch (ex: Exception) { val errorMessage = "Can't write security keys JSON error: ${ex.message}" errormsg(errorMessage) sendError(ex.customMessage) } } - - fun installProfile(protobuf: DeviceProfile) = with(protobuf) { meshService?.beginEditSettings() if (hasLongName() || hasShortName()) {