chore: self review 2

Author: ovitrif

app/src/main/java/to/bitkit/ui/Notifications.kt

@@ -49,7 +49,6 @@ internal fun Context.notificationBuilder(
     }
     val flags = FLAG_IMMUTABLE or FLAG_ONE_SHOT
 
-    @Suppress("ForbiddenComment") // TODO: review if needed:
     val pendingIntent = PendingIntent.getActivity(this, 0, intent, flags)
 
     return NotificationCompat.Builder(this, channelId)

app/src/main/java/to/bitkit/ui/shared/util/ShareSheet.kt

@@ -45,7 +45,7 @@ fun shareQrCode(context: Context, bitmap: Bitmap, text: String) {
             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         }
 
-        val chooser = Intent.createChooser(intent, "Share Qr code via")
+        val chooser = Intent.createChooser(intent, context.getString(R.string.other__share_qr))
         context.startActivity(chooser)
     } catch (e: IOException) {
         Logger.error("Failed to share QR code", e, context = "ShareSheet")

app/src/main/java/to/bitkit/viewmodels/LogsViewModel.kt

@@ -25,6 +25,10 @@ class LogsViewModel @Inject constructor(
     private val application: Application,
     private val logsRepo: LogsRepo,
 ) : AndroidViewModel(application) {
+    companion object {
+        private const val TAG = "LogsViewModel"
+    }
+
     private val _logs = MutableStateFlow<List<LogFile>>(emptyList())
     val logs: StateFlow<List<LogFile>> = _logs.asStateFlow()
 
@@ -46,12 +50,11 @@ class LogsViewModel @Inject constructor(
                 }
                 .onFailure { e ->
                     _selectedLogContent.update { listOf("Log file not found") }
-                    Logger.error("Failed to load log content", e)
+                    Logger.error("Failed to load log content", e, context = TAG)
                 }
         }
     }
 
-    @Suppress("TooGenericExceptionCaught")
     fun prepareLogForSharing(logFile: LogFile, onReady: (Uri) -> Unit) {
         viewModelScope.launch {
             runCatching {
@@ -73,7 +76,7 @@ class LogsViewModel @Inject constructor(
                     }
                 }
             }.onFailure {
-                Logger.error("Error preparing file for sharing", it)
+                Logger.error("Error preparing file for sharing", it, context = TAG)
             }
         }
     }

app/src/main/res/values/strings.xml

@@ -480,6 +480,7 @@
     <string name="other__scan_err_decoding">Decoding Error</string>
     <string name="other__scan_err_interpret_title">Unable To Interpret Provided Data</string>
     <string name="other__scan_err_not_payable_msg">This QR code does not appear to contain payment data.</string>
+    <string name="other__share_qr">Share QR Code Via</string>
     <string name="other__shop__discover__esims__description">Go borderless</string>
     <string name="other__shop__discover__esims__title">ESims</string>
     <string name="other__shop__discover__gift_cards__description">Shop with Bitcoin</string>

app/src/test/java/to/bitkit/utils/CryptoTest.kt

@@ -11,7 +11,6 @@ import to.bitkit.fcm.EncryptedNotification
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 
-@Suppress("SpacingBetweenDeclarationsWithAnnotations", "Wrapping")
 class CryptoTest {
     private lateinit var sut: Crypto
 
@@ -86,14 +85,12 @@ class CryptoTest {
         val derivationName = "bitkit-notifications"
 
         @Suppress("MaxLineLength")
-        val ciphertext = ("l2fInfyw64gO12odo8iipISloQJ45Rc4WjFmpe95brdaAMDq+T/L9ZChcmMCXnR0J6BXd8sSI" +
-            "Je/0bmby8uSZZJuVCzwF76XHfY5oq0Y1/hKzyZTn8nG3dqfiLHnAPy1tZFQfm5ALgjwWnViYJLXoGFpXs7kLMA=")
-            .fromBase64()
+        val ciphertext = ("l2fInfyw64gO12odo8iipISloQJ45Rc4WjFmpe95brdaAMDq+T/L9ZChcmMCXnR0J6BXd8sSIJe/0bmby8uSZZJuVCzwF76XHfY5oq0Y1/hKzyZTn8nG3dqfiLHnAPy1tZFQfm5ALgjwWnViYJLXoGFpXs7kLMA=").fromBase64()
         val iv = "2b8ed77fd2198e3ed88cfaa794a246e8"
         val tag = "caddd13746d6a6aed16176734964d3a3"
+
         @Suppress("MaxLineLength")
-        val decryptedPayload = """{"source":"blocktank","type":"incomingHtlc","payload":""" +
-            """{"secretMessage":"hello"},"createdAt":"2024-09-18T13:33:52.555Z"}"""
+        val decryptedPayload = """{"source":"blocktank","type":"incomingHtlc","payload":{"secretMessage":"hello"},"createdAt":"2024-09-18T13:33:52.555Z"}"""
 
         // Without derivationName
         val sharedSecret = sut.generateSharedSecret(clientPrivateKey.fromHex(), serverPublicKey)