Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/data/AppStorage.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ import kotlin.reflect.KProperty

const val APP_PREFS = "bitkit_prefs"

// TODO refactor to dataStore (named 'CacheStore'?!)
@Deprecated("Replace with CacheStore")
@Singleton
class AppStorage @Inject constructor(
@ApplicationContext private val appContext: Context,
Expand Down
46 changes: 46 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
package to.bitkit.data

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.core.DataStoreFactory
import androidx.datastore.dataStoreFile
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.Flow
import kotlinx.serialization.Serializable
import to.bitkit.data.serializers.AppCacheSerializer
import to.bitkit.data.serializers.SettingsSerializer
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Suggestion
import to.bitkit.models.TransactionSpeed
import to.bitkit.utils.Logger
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CacheStore @Inject constructor(
@ApplicationContext private val context: Context,
) {
private val store: DataStore<AppCacheData> = DataStoreFactory.create(
serializer = AppCacheSerializer,
produceFile = { context.dataStoreFile("app_cache.json") },
)

val data: Flow<AppCacheData> = store.data

suspend fun update(transform: (AppCacheData) -> AppCacheData) {
store.updateData(transform)
}


suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
}
}

@Serializable
data class AppCacheData(
val cachedRates : List<FxRate> = listOf()
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
package to.bitkit.data.serializers

import androidx.datastore.core.Serializer
import kotlinx.serialization.SerializationException
import to.bitkit.data.AppCacheData
import to.bitkit.data.SettingsData
import to.bitkit.di.json
import to.bitkit.utils.Logger
import java.io.InputStream
import java.io.OutputStream

object AppCacheSerializer : Serializer<AppCacheData> {
override val defaultValue: AppCacheData = AppCacheData()

override suspend fun readFrom(input: InputStream): AppCacheData {
return try {
json.decodeFromString(input.readBytes().decodeToString())
} catch (e: SerializationException) {
Logger.error("Failed to deserialize: $e")
defaultValue
}
}

override suspend fun writeTo(t: AppCacheData, output: OutputStream) {
output.write(json.encodeToString(t).encodeToByteArray())
}
}
188 changes: 188 additions & 0 deletions app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
package to.bitkit.repositories

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.models.BitcoinDisplayUnit
import to.bitkit.models.ConvertedAmount
import to.bitkit.models.FxRate
import to.bitkit.models.PrimaryDisplay
import to.bitkit.models.Toast
import to.bitkit.services.CurrencyService
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class CurrencyRepo @Inject constructor(
@BgDispatcher private val bgDispatcher: CoroutineDispatcher,
private val currencyService: CurrencyService,
private val settingsStore: SettingsStore,
private val cacheStore: CacheStore
) {
private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())

private val _currencyState = MutableStateFlow(CurrencyState())
val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()

private var lastSuccessfulRefresh: Date? = null
private var isRefreshing = false

private val pollingFlow: Flow<Unit>
get() = flow {
while (currentCoroutineContext().isActive) {
emit(Unit)
delay(Env.fxRateRefreshInterval)
}
}.flowOn(bgDispatcher)

init {
startPolling()
observeStaleData()
collectCachedData()
}

private fun startPolling() {
repoScope.launch {
pollingFlow.collect {
refresh()
}
}
}

private fun observeStaleData() {
repoScope.launch {
currencyState.map { it.hasStaleData }.distinctUntilChanged().collect { isStale ->
if (isStale) {
ToastEventBus.send(
type = Toast.ToastType.ERROR,
title = "Rates currently unavailable",
description = "An error has occurred. Please try again later."
)
}
}
}
}

private fun collectCachedData() {
repoScope.launch {
combine(settingsStore.data, cacheStore.data) { settings, cachedData ->
_currencyState.value.copy(
rates = cachedData.cachedRates,
selectedCurrency = settings.selectedCurrency,
displayUnit = settings.displayUnit,
primaryDisplay = settings.primaryDisplay,
currencySymbol = cachedData.cachedRates.firstOrNull { rate ->
rate.quote == settings.selectedCurrency
}?.currencySymbol ?: "$"
)
}.collect { newState ->
_currencyState.update { newState }
}
}
}

suspend fun triggerRefresh() = withContext(bgDispatcher) {
refresh()
}

private suspend fun refresh() {
if (isRefreshing) return
isRefreshing = true
try {
val fetchedRates = currencyService.fetchLatestRates()
cacheStore.update { it.copy(cachedRates = fetchedRates) }
_currencyState.update {
it.copy(
error = null,
hasStaleData = false
)
}
lastSuccessfulRefresh = Date()
Logger.debug("Currency rates refreshed successfully", context = TAG)
} catch (e: Exception) {
_currencyState.update { it.copy(error = e) }
Logger.error("Currency rates refresh failed", e, context = TAG)

lastSuccessfulRefresh?.let { last ->
_currencyState.update {
it.copy(hasStaleData = Date().time - last.time > Env.fxRateStaleThreshold)
}
}
} finally {
isRefreshing = false
}
}

suspend fun togglePrimaryDisplay() = withContext(bgDispatcher) {
currencyState.value.primaryDisplay.let {
val newDisplay = if (it == PrimaryDisplay.BITCOIN) PrimaryDisplay.FIAT else PrimaryDisplay.BITCOIN
settingsStore.update { it.copy(primaryDisplay = newDisplay) }
}
}

suspend fun setPrimaryDisplayUnit(unit: PrimaryDisplay) = withContext(bgDispatcher) {
settingsStore.update { it.copy(primaryDisplay = unit) }
}

suspend fun setBtcDisplayUnit(unit: BitcoinDisplayUnit) = withContext(bgDispatcher) {
settingsStore.update { it.copy(displayUnit = unit) }
}

suspend fun setSelectedCurrency(currency: String) = withContext(bgDispatcher) {
settingsStore.update { it.copy(selectedCurrency = currency) }
refresh()
}

fun getCurrencySymbol(): String {
val currentState = currencyState.value
return currentState.rates.firstOrNull { it.quote == currentState.selectedCurrency }?.currencySymbol ?: ""
}

// Conversion helpers
fun convertSatsToFiat(sats: Long, currency: String? = null): ConvertedAmount? {
val targetCurrency = currency ?: currencyState.value.selectedCurrency
val rate = currencyService.getCurrentRate(targetCurrency, currencyState.value.rates)
return rate?.let { currencyService.convert(sats = sats, rate = it) }
}

fun convertFiatToSats(fiatAmount: Double, currency: String? = null): Long {
val sourceCurrency = currency ?: currencyState.value.selectedCurrency
return currencyService.convertFiatToSats(fiatAmount, sourceCurrency, currencyState.value.rates)
}

companion object {
private const val TAG = "CurrencyRepo"
}
}

data class CurrencyState(
val rates: List<FxRate> = emptyList(),
val error: Throwable? = null,
val hasStaleData: Boolean = false,
val selectedCurrency: String = "USD",
val currencySymbol: String = "$",
val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
)
3 changes: 3 additions & 0 deletions app/src/main/java/to/bitkit/repositories/WalletRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import org.lightningdevkit.ldknode.Event
import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.AppDb
import to.bitkit.data.AppStorage
import to.bitkit.data.CacheStore
import to.bitkit.data.SettingsStore
import to.bitkit.data.entities.InvoiceTagEntity
import to.bitkit.data.keychain.Keychain
Expand DownExpand Up@@ -47,6 +48,7 @@ class WalletRepo @Inject constructor(
private val settingsStore: SettingsStore,
private val addressChecker: AddressChecker,
private val lightningRepo: LightningRepo,
private val cacheStore: CacheStore
) {

private val _walletState = MutableStateFlow(
Expand DownExpand Up@@ -201,6 +203,7 @@ class WalletRepo @Inject constructor(
keychain.wipe()
appStorage.clear()
settingsStore.reset()
cacheStore.reset()
coreService.activity.removeAll()
deleteAllInvoices()
_walletState.update { WalletState() }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/services/CurrencyService.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ import kotlin.math.pow
import kotlin.math.roundToLong

@Singleton
class CurrencyService @Inject constructor(
class CurrencyService @Inject constructor( //TODO REPLACE DIRECT ACCESS WITH CurrencyRepo
private val blocktankHttpClient: BlocktankHttpClient,
) {
private var cachedRates: List<FxRate>? = null
Comment thread
jvsena42 marked this conversation as resolved.
Expand Down
Loading