Merge pull request #239 from synonymdev/feat/dev-settings

Dev settings

Author: ovitrif

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

@@ -49,7 +49,7 @@ class BlocktankRepo @Inject constructor(
     private val cacheStore: CacheStore,
     @Named("enablePolling") private val enablePolling: Boolean,
 ) {
-    private val repoScope = CoroutineScope(SupervisorJob() + bgDispatcher)
+    private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())
 
     private val _blocktankState = MutableStateFlow(BlocktankState())
     val blocktankState: StateFlow<BlocktankState> = _blocktankState.asStateFlow()
@@ -344,6 +344,10 @@ class BlocktankRepo @Inject constructor(
         return@withContext min(lspBalance, maxLspBalance)
     }
 
+    suspend fun resetState() = withContext(bgDispatcher) {
+        _blocktankState.update { BlocktankState() }
+    }
+
     companion object {
         private const val TAG = "BlocktankRepo"
         private const val DEFAULT_CHANNEL_EXPIRY_WEEKS = 6u

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

@@ -2,7 +2,6 @@ package to.bitkit.repositories
 
 import android.net.Uri
 import com.google.firebase.messaging.FirebaseMessaging
-import com.synonym.bitkitcore.IBtInfo
 import com.synonym.bitkitcore.createWithdrawCallbackUrl
 import com.synonym.bitkitcore.getLnurlInvoice
 import kotlinx.coroutines.CoroutineDispatcher
@@ -11,7 +10,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
@@ -410,6 +408,7 @@ class LightningRepo @Inject constructor(
         val invoice = getLnurlInvoice(address, amountSatoshis)
         Result.success(invoice)
     }
+
     suspend fun handleLnUrlWithdraw(
         k1: String,
         callback: String,
@@ -426,7 +425,7 @@ class LightningRepo @Inject constructor(
      * Extension function to remove duplicate query parameters from a URL string
      * Keeps the first occurrence of each parameter
      */
-    private fun String.removeDuplicateQueryParams(): String { //TODO REMOVE AFTER CORE FIX
+    private fun String.removeDuplicateQueryParams(): String { // TODO REMOVE AFTER CORE FIX
         return try {
             val uri = Uri.parse(this)
             val builder = uri.buildUpon().clearQuery()
@@ -470,6 +469,7 @@ class LightningRepo @Inject constructor(
      * @return A `Result` with the `Txid` of sent transaction, or an error if the transaction fails
      * or the fee rate cannot be retrieved.
      */
+
     suspend fun sendOnChain(
         address: Address,
         sats: ULong,
@@ -478,8 +478,7 @@ class LightningRepo @Inject constructor(
     ): Result<Txid> =
         executeWhenNodeRunning("Send on-chain") {
             val transactionSpeed = speed ?: settingsStore.data.first().defaultTransactionSpeed
-            val fees = coreService.blocktank.getFees().getOrThrow()
-            val satsPerVByte = fees.getSatsPerVByteFor(transactionSpeed)
+            val satsPerVByte = getFeeRateForSpeed(transactionSpeed).getOrThrow().toUInt()
 
             // if utxos are manually specified, use them, otherwise run auto coin select if enabled
             val finalUtxosToSpend = utxosToSpend ?: determineUtxosToSpend(
@@ -647,16 +646,6 @@ class LightningRepo @Inject constructor(
         _lightningState.value.nodeLifecycleState.isRunning() && lightningService.channels?.isNotEmpty() == true
 
     // Notification handling
-    suspend fun getFcmToken(): Result<String> = withContext(bgDispatcher) {
-        try {
-            val token = firebaseMessaging.token.await()
-            Result.success(token)
-        } catch (e: Throwable) {
-            Logger.error("Get FCM token error", e)
-            Result.failure(e)
-        }
-    }
-
     suspend fun registerForNotifications(): Result<Unit> = executeWhenNodeRunning("Register for notifications") {
         return@executeWhenNodeRunning try {
             val token = firebaseMessaging.token.await()
@@ -675,28 +664,6 @@ class LightningRepo @Inject constructor(
         }
     }
 
-    suspend fun testNotification(): Result<Unit> = executeWhenNodeRunning("Test notification") {
-        try {
-            val token = firebaseMessaging.token.await()
-            blocktankNotificationsService.testNotification(token)
-            Result.success(Unit)
-        } catch (e: Throwable) {
-            Logger.error("Test notification error", e)
-            Result.failure(e)
-        }
-    }
-
-    suspend fun getBlocktankInfo(): Result<IBtInfo> = withContext(bgDispatcher) {
-        try {
-            val info = coreService.blocktank.info(refresh = true)
-                ?: return@withContext Result.failure(Exception("Couldn't get info"))
-            Result.success(info)
-        } catch (e: Throwable) {
-            Logger.error("Blocktank info error", e)
-            Result.failure(e)
-        }
-    }
-
     suspend fun bumpFeeByRbf(
         originalTxId: Txid,
         satsPerVByte: UInt,

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

@@ -1,28 +1,36 @@
 package to.bitkit.repositories
 
+import android.content.Context
+import android.net.Uri
+import androidx.core.content.FileProvider
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import to.bitkit.data.ChatwootHttpClient
 import to.bitkit.di.BgDispatcher
+import to.bitkit.di.IoDispatcher
 import to.bitkit.env.Env
+import to.bitkit.ext.fromBase64
 import to.bitkit.ext.getEnumValueOf
+import to.bitkit.ext.toBase64
 import to.bitkit.models.ChatwootMessage
 import to.bitkit.utils.Logger
 import java.io.BufferedReader
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileReader
-import java.util.Base64
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LogsRepo @Inject constructor(
+    @ApplicationContext private val context: Context,
     @BgDispatcher private val bgDispatcher: CoroutineDispatcher,
-    private val chatwootHttpClient: ChatwootHttpClient
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val chatwootHttpClient: ChatwootHttpClient,
 ) {
     suspend fun postQuestion(email: String, message: String): Result<Unit> = withContext(bgDispatcher) {
         return@withContext try {
@@ -46,7 +54,7 @@ class LogsRepo @Inject constructor(
         }
     }
 
-    /** * Lists log files sorted by newest first */
+    /** Lists log files sorted by newest first */
     suspend fun getLogs(): Result<List<LogFile>> = withContext(bgDispatcher) {
         try {
             val logDir = File(Env.logDir)
@@ -102,20 +110,46 @@ class LogsRepo @Inject constructor(
         }
     }
 
-    /** Zips up the most recent logs and returns base64 of zip file */
+    /** Zips and saves the most recent logs returning the content uri */
+    suspend fun zipLogsForSharing(
+        limit: Int = 20,
+        source: LogSource? = null,
+    ): Result<Uri> = withContext(bgDispatcher) {
+        zipLogs(limit, source).mapCatching { base64String ->
+            val file = withContext(ioDispatcher) {
+                val tempDir = context.cacheDir.resolve("logs").apply { mkdirs() }
+
+                val zipFileName = "bitkit_logs_${System.currentTimeMillis()}.zip"
+                val tempFile = File(tempDir, zipFileName)
+
+                // Convert base64 back to bytes and write to file
+                val zipBytes = base64String.fromBase64()
+                tempFile.writeBytes(zipBytes)
+                return@withContext tempFile
+            }
+            val contentUri = FileProvider.getUriForFile(context, Env.FILE_PROVIDER_AUTHORITY, file)
+            if (contentUri == null) error("Failed to create content uri")
+
+            return@mapCatching contentUri
+        }.onFailure {
+            Logger.error("Error preparing logs for sharing", it)
+        }
+    }
+
+
+    /** Zips the most recent logs and returns base64 of zip file */
     suspend fun zipLogs(
         limit: Int = 20,
-        includeAllSources: Boolean = false
+        source: LogSource? = null,
     ): Result<String> = withContext(bgDispatcher) {
         return@withContext try {
-            val logsResult = getLogs()
-            if (logsResult.isFailure) {
-                return@withContext Result.failure(logsResult.exceptionOrNull() ?: Exception("Failed to get logs"))
+            val logsResult = getLogs().onFailure {
+                return@withContext Result.failure(it)
             }
 
-            val allLogs = logsResult.getOrNull()?.filter { it.source != LogSource.Unknown } ?: emptyList()
-            val logsToZip = if (includeAllSources) {
-                allLogs.take(limit)
+            val allLogs = logsResult.getOrDefault(emptyList()).filter { it.source != LogSource.Unknown }
+            val logsToZip = if (source != null) {
+                allLogs.filter { it.source == source }.take(limit)
             } else {
                 // Group by source and take most recent from each
                 allLogs.groupBy { it.source }
@@ -157,7 +191,7 @@ class LogsRepo @Inject constructor(
             byteArrayOut.toByteArray()
         }
 
-        return Base64.getEncoder().encodeToString(zipBytes)
+        return zipBytes.toBase64()
     }
 
     private companion object {

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

@@ -23,7 +23,6 @@ class BlocktankNotificationsService @Inject constructor(
     private val keychain: Keychain,
     private val crypto: Crypto,
 ) {
-
     suspend fun registerDevice(deviceToken: String) = withContext(bgDispatcher) {
         val nodeId = lightningService.nodeId ?: throw ServiceError.NodeNotStarted
 
@@ -65,17 +64,4 @@ class BlocktankNotificationsService @Inject constructor(
 
         Logger.info("Device registered for notifications")
     }
-
-    suspend fun testNotification(deviceToken: String) = withContext(bgDispatcher) {
-        Logger.debug("Sending test notification to self…")
-
-        ServiceQueue.CORE.background {
-            com.synonym.bitkitcore.testNotification(
-                deviceToken = deviceToken,
-                secretMessage = "hello",
-                notificationType = "incomingHtlc",
-                customUrl = Env.blocktankPushNotificationServer,
-            )
-        }
-    }
 }

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

@@ -20,6 +20,7 @@ import org.lightningdevkit.ldknode.BuildException
 import org.lightningdevkit.ldknode.Builder
 import org.lightningdevkit.ldknode.ChannelDetails
 import org.lightningdevkit.ldknode.CoinSelectionAlgorithm
+import org.lightningdevkit.ldknode.Config
 import org.lightningdevkit.ldknode.ElectrumSyncConfig
 import org.lightningdevkit.ldknode.Event
 import org.lightningdevkit.ldknode.FeeRate
@@ -652,6 +653,7 @@ class LightningService @Inject constructor(
     val nodeId: String? get() = node?.nodeId()
     val balances: BalanceDetails? get() = node?.listBalances()
     val status: NodeStatus? get() = node?.status()
+    val config: Config? get() = node?.config()
     val peers: List<LnPeer>? get() = node?.listPeers()?.map { it.toLnPeer() }
     val channels: List<ChannelDetails>? get() = node?.listChannels()
     val payments: List<PaymentDetails>? get() = node?.listPayments()

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

@@ -39,7 +39,8 @@ import to.bitkit.ui.components.SheetHost
 import to.bitkit.ui.onboarding.InitializingWalletView
 import to.bitkit.ui.onboarding.WalletInitResult
 import to.bitkit.ui.onboarding.WalletInitResultView
-import to.bitkit.ui.screens.DevSettingsScreen
+import to.bitkit.ui.screens.settings.DevSettingsScreen
+import to.bitkit.ui.screens.settings.FeeSettingsScreen
 import to.bitkit.ui.screens.profile.CreateProfileScreen
 import to.bitkit.ui.screens.profile.ProfileIntroScreen
 import to.bitkit.ui.screens.scanner.QrScanningScreen
@@ -424,8 +425,6 @@ private fun RootNavHost(
         orderDetailSettings(navController)
         cjitDetailSettings(navController)
         lightningConnections(navController)
-        devSettings(walletViewModel, navController)
-        regtestSettings(navController)
         activityItem(activityListViewModel, navController)
         qrScanner(appViewModel, navController)
         authCheck(navController)
@@ -673,6 +672,15 @@ private fun NavGraphBuilder.settings(
             onClose = { navController.navigateToHome() },
         )
     }
+    composableWithDefaultTransitions<Routes.DevSettings> {
+        DevSettingsScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.FeeSettings> {
+        FeeSettingsScreen(navController)
+    }
+    composableWithDefaultTransitions<Routes.RegtestSettings> {
+        BlocktankRegtestScreen(navController)
+    }
 }
 
 private fun NavGraphBuilder.profile(
@@ -911,24 +919,6 @@ private fun NavGraphBuilder.lightningConnections(
     }
 }
 
-private fun NavGraphBuilder.devSettings(
-    viewModel: WalletViewModel,
-    navController: NavHostController,
-) {
-    composableWithDefaultTransitions<Routes.DevSettings> {
-        DevSettingsScreen(viewModel, navController)
-    }
-}
-
-private fun NavGraphBuilder.regtestSettings(
-    navController: NavHostController,
-) {
-    composableWithDefaultTransitions<Routes.RegtestSettings> {
-        val viewModel = hiltViewModel<BlocktankRegtestViewModel>()
-        BlocktankRegtestScreen(viewModel, navController)
-    }
-}
-
 private fun NavGraphBuilder.activityItem(
     activityListViewModel: ActivityListViewModel,
     navController: NavHostController,
@@ -1489,6 +1479,9 @@ sealed interface Routes {
     @Serializable
     data object DevSettings : Routes
 
+    @Serializable
+    data object FeeSettings : Routes
+
     @Serializable
     data object RegtestSettings : Routes
 

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

@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -21,14 +19,14 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
+import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.CloseNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
 import to.bitkit.ui.utils.withAccentBoldBright
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun InfoScreenContent(
     navTitle: String,
@@ -41,8 +39,9 @@ fun InfoScreenContent(
     onCloseClick: () -> Unit,
 ) {
     ScreenColumn {
-        CenterAlignedTopAppBar(
-            title = { Title(text = navTitle) },
+        AppTopBar(
+            titleText = navTitle,
+            onBackClick = null,
             actions = {
                 if (showCloseButton) {
                     CloseNavIcon(onCloseClick)
@@ -86,7 +85,7 @@ fun InfoScreenContent(
     }
 }
 
-@Preview(showSystemUi = true, showBackground = true)
+@Preview(showSystemUi = true)
 @Composable
 private fun Preview() {
     AppThemeSurface {