chore: review

Author: ovitrif

app/src/main/java/to/bitkit/androidServices/LightningNodeService.kt

@@ -76,15 +76,13 @@ class LightningNodeService : Service() {
     }
 
     private suspend fun handleBackgroundEvent(event: Event) {
-        if (App.currentActivity?.value != null) return
-
         val command = NotifyPaymentReceived.Command.from(event, includeNotification = true) ?: return
 
         notifyPaymentReceivedHandler(command).onSuccess { result ->
-            if (result is NotifyPaymentReceived.Result.ShowNotification) {
-                if (App.currentActivity?.value != null) return@onSuccess
-                showPaymentNotification(result.details, result.notification)
-            }
+            if (result !is NotifyPaymentReceived.Result.ShowNotification) return@onSuccess
+            if (App.currentActivity?.value != null) return@onSuccess
+
+            showPaymentNotification(result.details, result.notification)
         }
     }
 

app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

@@ -19,6 +19,7 @@ import to.bitkit.models.PrimaryDisplay
 import to.bitkit.models.formatToModernDisplay
 import to.bitkit.repositories.ActivityRepo
 import to.bitkit.repositories.CurrencyRepo
+import to.bitkit.utils.Logger
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -34,7 +35,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
         command: NotifyPaymentReceived.Command,
     ): Result<NotifyPaymentReceived.Result> = withContext(ioDispatcher) {
         runCatching {
-            delay(DELAY_MS)
+            delay(DELAY_FOR_ACTIVITY_SYNC_MS)
 
             val shouldShow = when (command) {
                 is NotifyPaymentReceived.Command.Lightning -> true
@@ -62,6 +63,8 @@ class NotifyPaymentReceivedHandler @Inject constructor(
             } else {
                 NotifyPaymentReceived.Result.ShowSheet(details)
             }
+        }.onFailure { e ->
+            Logger.error("Failed to process payment notification", e, context = TAG)
         }
     }
 
@@ -93,6 +96,6 @@ class NotifyPaymentReceivedHandler @Inject constructor(
 
     companion object {
         const val TAG = "NotifyPaymentReceivedHandler"
-        private const val DELAY_MS = 500L
+        private const val DELAY_FOR_ACTIVITY_SYNC_MS = 500L
     }
 }

app/src/test/java/to/bitkit/androidServices/LightningNodeServiceTest.kt

@@ -11,7 +11,6 @@ import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.HiltTestApplication
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.runBlocking
 import org.junit.After
@@ -27,7 +26,6 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
-import org.mockito.kotlin.wheneverBlocking
 import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows
@@ -46,7 +44,6 @@ import to.bitkit.repositories.WalletRepo
 import to.bitkit.services.LdkNodeEventBus
 import to.bitkit.test.BaseUnitTest
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @HiltAndroidTest
 @Config(application = HiltTestApplication::class)
 @RunWith(RobolectricTestRunner::class)
@@ -98,10 +95,9 @@ class LightningNodeServiceTest : BaseUnitTest() {
                 title = context.getString(R.string.notification_received_title),
                 body = "Received ₿ 100 ($0.10)",
             )
-            wheneverBlocking { notifyPaymentReceivedHandler.invoke(any()) }
-                .thenReturn(
-                    Result.success(NotifyPaymentReceived.Result.ShowNotification(defaultDetails, defaultNotification))
-                )
+            whenever(notifyPaymentReceivedHandler.invoke(any())).thenReturn(
+                Result.success(NotifyPaymentReceived.Result.ShowNotification(defaultDetails, defaultNotification))
+            )
 
             // Grant permissions for notifications
             val app = context as Application