Merge pull request #358 from synonymdev/feat/fcm-newtoken-register

feat: register for lsp notifications on new token

Author: ovitrif

app/build.gradle.kts

@@ -84,7 +84,7 @@ android {
             keyPassword = "android"
         }
         create("release") {
-            val keystoreFile = keystoreProperties.getProperty("storeFile").takeIf { it.isNotBlank() }
+            val keystoreFile = keystoreProperties.getProperty("storeFile").takeIf { it.isNotEmpty() }
                 ?.let { rootProject.file(it) }
             storeFile = if (keystoreFile?.exists() == true) keystoreFile else null
             // storeFile = rootProject.file(keystoreProperties.getProperty("storeFile"))
@@ -201,7 +201,6 @@ dependencies {
     // Firebase
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)
-    implementation(libs.firebase.analytics)
     // Lifecycle
     implementation(libs.lifecycle.viewmodel.ktx)
     implementation(libs.lifecycle.viewmodel.compose) // ViewModel utils for Compose

app/src/androidTest/java/to/bitkit/services/BlocktankTest.kt

@@ -38,7 +38,7 @@ class BlocktankTest {
         Env.initAppStoragePath(testDbPath)
         initDb(testDbPath)
         runBlocking {
-            updateBlocktankUrl(Env.blocktankClientServer)
+            updateBlocktankUrl(Env.blocktankApiUrl)
         }
     }
 

app/src/main/java/to/bitkit/data/SettingsStore.kt

@@ -6,6 +6,7 @@ import androidx.datastore.dataStore
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Serializable
+import org.lightningdevkit.ldknode.Network
 import to.bitkit.data.serializers.SettingsSerializer
 import to.bitkit.env.Env
 import to.bitkit.models.BitcoinDisplayUnit
@@ -88,7 +89,7 @@ data class SettingsData(
     val isBiometricEnabled: Boolean = false,
     val isPinOnIdleEnabled: Boolean = false,
     val isPinForPaymentsEnabled: Boolean = false,
-    val isDevModeEnabled: Boolean = false,
+    val isDevModeEnabled: Boolean = Env.network != Network.BITCOIN,
     val showWidgets: Boolean = true,
     val showWidgetTitles: Boolean = false,
     val lastUsedTags: List<String> = emptyList(),

app/src/main/java/to/bitkit/env/Env.kt

@@ -63,13 +63,16 @@ internal object Env {
         get() = when (network) {
             Network.REGTEST -> "https://api.stag0.blocktank.to"
             Network.TESTNET -> "https://api.stag0.blocktank.to"
+            Network.BITCOIN -> "https://api1.blocktank.to/"
             else -> TODO("${network.name} network not implemented")
         }
+    val blocktankApiUrl get() = "$blocktankBaseUrl/blocktank/api/v2"
+    val blocktankNotificationApiUrl
+        get() = when (network) {
+            Network.BITCOIN -> "$blocktankBaseUrl/api/notifications"
+            else -> "$blocktankBaseUrl/notifications/api"
+        }
 
-    val blocktankClientServer get() = "$blocktankBaseUrl/blocktank/api/v2"
-    val blocktankPushNotificationServer get() = "$blocktankBaseUrl/notifications/api"
-
-    // const val btcRatesServer = "https://blocktank.synonym.to/fx/rates/btc/"
     const val btcRatesServer = "https://api1.blocktank.to/api/fx/rates/btc"
     const val geoCheckUrl = "https://api1.blocktank.to/api/geocheck"
     const val chatwootUrl = "https://synonym.to/api/chatwoot"
@@ -158,7 +161,7 @@ internal object Env {
             host = "electrum.blockstream.info",
             tcp = 60001, // or 50001
             ssl = 60002, // or 50002
-            protocol = ElectrumProtocol.TCP,
+            protocol = ElectrumProtocol.SSL,
         )
         val REGTEST = ElectrumServer(
             host = "34.65.252.32",

app/src/main/java/to/bitkit/fcm/FcmService.kt

@@ -17,6 +17,7 @@ import to.bitkit.env.Env.DERIVATION_NAME
 import to.bitkit.ext.fromBase64
 import to.bitkit.ext.fromHex
 import to.bitkit.models.BlocktankNotificationType
+import to.bitkit.repositories.LightningRepo
 import to.bitkit.ui.pushNotification
 import to.bitkit.utils.Crypto
 import to.bitkit.utils.Logger
@@ -25,6 +26,10 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class FcmService : FirebaseMessagingService() {
+    companion object {
+        private const val TAG = "FcmService"
+    }
+
     private var notificationType: BlocktankNotificationType? = null
     private var notificationPayload: JsonObject? = null
 
@@ -34,6 +39,9 @@ class FcmService : FirebaseMessagingService() {
     @Inject
     lateinit var keychain: Keychain
 
+    @Inject
+    lateinit var lightningRepo: LightningRepo
+
     /**
      * Act on received messages. [Debug](https://goo.gl/39bRNJ)
      */
@@ -137,14 +145,14 @@ class FcmService : FirebaseMessagingService() {
             val decoded = json.decodeFromString<T>(encoded)
             block(decoded)
             true
-        } catch (e: SerializationException) {
+        } catch (_: SerializationException) {
             false
         }
     }
 
     override fun onNewToken(token: String) {
-        // this.token = token
-        // TODO call blocktankService.registerDevice(token)
+        Logger.debug("Got new FCM token via FirebaseMessagingService.onNewToken: '$token'", context = TAG)
+        lightningRepo.registerForNotificationsAsync(token)
     }
 }
 

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -9,12 +9,15 @@ import com.synonym.bitkitcore.createWithdrawCallbackUrl
 import com.synonym.bitkitcore.decode
 import com.synonym.bitkitcore.lnurlAuth
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
@@ -42,13 +45,13 @@ import to.bitkit.models.NodeLifecycleState
 import to.bitkit.models.TransactionSpeed
 import to.bitkit.models.toCoinSelectAlgorithm
 import to.bitkit.models.toCoreNetwork
-import to.bitkit.services.BlocktankNotificationsService
 import to.bitkit.services.CoreService
 import to.bitkit.services.LdkNodeEventBus
 import to.bitkit.services.LightningService
 import to.bitkit.services.LnurlChannelResponse
 import to.bitkit.services.LnurlService
 import to.bitkit.services.LnurlWithdrawResponse
+import to.bitkit.services.LspNotificationsService
 import to.bitkit.services.NodeEventHandler
 import to.bitkit.utils.Logger
 import to.bitkit.utils.ServiceError
@@ -67,7 +70,7 @@ class LightningRepo @Inject constructor(
     private val ldkNodeEventBus: LdkNodeEventBus,
     private val settingsStore: SettingsStore,
     private val coreService: CoreService,
-    private val blocktankNotificationsService: BlocktankNotificationsService,
+    private val lspNotificationsService: LspNotificationsService,
     private val firebaseMessaging: FirebaseMessaging,
     private val keychain: Keychain,
     private val lnurlService: LnurlService,
@@ -76,6 +79,8 @@ class LightningRepo @Inject constructor(
     private val _lightningState = MutableStateFlow(LightningState())
     val lightningState = _lightningState.asStateFlow()
 
+    private val scope = CoroutineScope(bgDispatcher + SupervisorJob())
+
     private var cachedEventHandler: NodeEventHandler? = null
 
     /**
@@ -698,25 +703,26 @@ class LightningRepo @Inject constructor(
     fun hasChannels(): Boolean =
         _lightningState.value.nodeLifecycleState.isRunning() && lightningService.channels?.isNotEmpty() == true
 
-    // Notification handling
-    suspend fun registerForNotifications(): Result<Unit> = executeWhenNodeRunning("Register for notifications") {
+    suspend fun registerForNotifications(token: String? = null) = executeWhenNodeRunning("registerForNotifications") {
         return@executeWhenNodeRunning try {
-            val token = firebaseMessaging.token.await()
+            val token = token ?: firebaseMessaging.token.await()
             val cachedToken = keychain.loadString(Keychain.Key.PUSH_NOTIFICATION_TOKEN.name)
 
             if (cachedToken == token) {
                 Logger.debug("Skipped registering for notifications, current device token already registered")
                 return@executeWhenNodeRunning Result.success(Unit)
             }
 
-            blocktankNotificationsService.registerDevice(token)
+            lspNotificationsService.registerDevice(token)
             Result.success(Unit)
         } catch (e: Throwable) {
             Logger.error("Register for notifications error", e)
             Result.failure(e)
         }
     }
 
+    fun registerForNotificationsAsync(token: String) = scope.launch { registerForNotifications(token) }
+
     suspend fun bumpFeeByRbf(
         originalTxId: Txid,
         satsPerVByte: UInt,

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -103,7 +103,7 @@ class CoreService @Inject constructor(
             }
 
             try {
-                val blocktankUrl = Env.blocktankClientServer
+                val blocktankUrl = Env.blocktankApiUrl
                 updateBlocktankUrl(newUrl = blocktankUrl)
                 Logger.info("Blocktank URL updated to: $blocktankUrl")
             } catch (e: Exception) {

…ervices/BlocktankNotificationsService.kt …tkit/services/LspNotificationsService.ktapp/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt renamed to app/src/main/java/to/bitkit/services/LspNotificationsService.kt app/src/main/java/to/bitkit/services/BlocktankNotificationsService.kt renamed to app/src/main/java/to/bitkit/services/LspNotificationsService.kt

@@ -17,7 +17,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class BlocktankNotificationsService @Inject constructor(
+class LspNotificationsService @Inject constructor(
     @BgDispatcher private val bgDispatcher: CoroutineDispatcher,
     private val lightningService: LightningService,
     private val keychain: Keychain,
@@ -51,7 +51,7 @@ class BlocktankNotificationsService @Inject constructor(
                 nodeId = nodeId,
                 isoTimestamp = "$timestamp",
                 signature = signature,
-                customUrl = Env.blocktankPushNotificationServer,
+                customUrl = Env.blocktankNotificationApiUrl,
                 isProduction = null,
             )
         }

app/src/main/java/to/bitkit/ui/components/InfoTextField.kt

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -29,12 +28,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import kotlinx.coroutines.launch
 import to.bitkit.R
-import to.bitkit.env.Env
 import to.bitkit.models.Toast
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.ButtonSize
+import to.bitkit.ui.components.Caption
 import to.bitkit.ui.components.Caption13Up
-import to.bitkit.ui.components.InfoTextField
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.navigateToHome
@@ -68,7 +66,6 @@ fun BlocktankRegtestScreen(
                 .verticalScroll(rememberScrollState())
                 .imePadding()
         ) {
-            // State variables for form inputs
             var depositAddress by remember { mutableStateOf(uiState.onchainAddress) }
             var depositAmount by remember { mutableStateOf("123000") }
             var mineBlockCount by remember { mutableStateOf("1") }
@@ -78,15 +75,11 @@ fun BlocktankRegtestScreen(
             var vout by remember { mutableStateOf("0") }
             var forceCloseAfter by remember { mutableStateOf("86400") }
 
-            // Flags for loading states
             var isDepositing by remember { mutableStateOf(false) }
             var isMining by remember { mutableStateOf(false) }
 
-            InfoTextField(value = Env.blocktankBaseUrl, label = "Service")
-            Text(
-                text = "These actions are executed on the staging Blocktank server node.",
-                style = MaterialTheme.typography.bodySmall,
-            )
+            VerticalSpacer(16.dp)
+            Caption(text = "These actions are executed on the staging Blocktank server node.")
 
             // Deposit Section
             Caption13Up("DEPOSIT", color = Colors.White64, modifier = Modifier.padding(top = 20.dp))