diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/BitcoinBaseAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/BitcoinBaseAdapter.kt index da5a53bae2..57beb31356 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/BitcoinBaseAdapter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/BitcoinBaseAdapter.kt @@ -43,7 +43,6 @@ import io.reactivex.Single import io.reactivex.subjects.PublishSubject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import java.math.BigDecimal @@ -59,7 +58,7 @@ abstract class BitcoinBaseAdapter( protected val decimal: Int = 8 ) : IAdapter, ITransactionsAdapter, IBalanceAdapter, IReceiveAdapter { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) abstract val satoshisInBitcoin: BigDecimal diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/BalanceHiddenManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/BalanceHiddenManager.kt index 95a36233a3..05d419b932 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/BalanceHiddenManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/BalanceHiddenManager.kt @@ -5,7 +5,6 @@ import io.horizontalsystems.core.BackgroundManager import io.horizontalsystems.core.BackgroundManagerState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update @@ -25,7 +24,7 @@ class BalanceHiddenManager( private val _balanceHiddenFlow = MutableStateFlow(localStorage.balanceHidden) val balanceHiddenFlow = _balanceHiddenFlow.asStateFlow() - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) init { scope.launch { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/ConnectivityManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/ConnectivityManager.kt index caf0f0b392..c46205e307 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/ConnectivityManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/ConnectivityManager.kt @@ -11,7 +11,6 @@ import io.horizontalsystems.core.BackgroundManagerState import io.reactivex.subjects.PublishSubject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.asSharedFlow @@ -23,7 +22,7 @@ class ConnectivityManager(backgroundManager: BackgroundManager) { private val connectivityManager: ConnectivityManager by lazy { App.instance.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager } - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) private val _networkAvailabilityFlow = MutableSharedFlow(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/CurrencyManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/CurrencyManager.kt index 9f40fcd48d..09cd88a9e8 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/CurrencyManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/CurrencyManager.kt @@ -6,7 +6,6 @@ import io.horizontalsystems.bankwallet.entities.Currency import io.reactivex.subjects.PublishSubject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow @@ -14,7 +13,7 @@ import kotlinx.coroutines.launch class CurrencyManager(private val localStorage: ILocalStorage, private val appConfigProvider: AppConfigProvider) { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) private val _baseCurrencyUpdatedFlow: MutableSharedFlow = MutableSharedFlow() val baseCurrencyUpdatedFlow: SharedFlow = _baseCurrencyUpdatedFlow.asSharedFlow() diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TronKitManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TronKitManager.kt index 2be5af2144..b10178194f 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TronKitManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TronKitManager.kt @@ -16,7 +16,6 @@ import io.horizontalsystems.tronkit.transaction.Signer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update @@ -26,7 +25,7 @@ class TronKitManager( private val appConfigProvider: AppConfigProvider, private val backgroundManager: BackgroundManager ) { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) private var job: Job? = null private val network = Network.Mainnet private val _kitStartedFlow = MutableStateFlow(false) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/stats/StatsManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/stats/StatsManager.kt index 38e065d8c6..86ad74054f 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/stats/StatsManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/stats/StatsManager.kt @@ -37,7 +37,6 @@ import io.horizontalsystems.hdwalletkit.HDExtendedKey import io.horizontalsystems.marketkit.models.HsTimePeriod import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update @@ -57,7 +56,7 @@ class StatsManager( private val backgroundManager: BackgroundManager, ) { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.IO) init { scope.launch { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/chart/ChartIndicatorManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/chart/ChartIndicatorManager.kt index a6749d0a20..325cdd40bb 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/chart/ChartIndicatorManager.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/chart/ChartIndicatorManager.kt @@ -4,7 +4,6 @@ import io.horizontalsystems.bankwallet.core.ILocalStorage import io.horizontalsystems.chartview.models.ChartIndicator import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.launch @@ -14,7 +13,7 @@ class ChartIndicatorManager( private val chartIndicatorSettingsDao: ChartIndicatorSettingsDao, private val localStorage: ILocalStorage ) { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) val isEnabled: Boolean get() = localStorage.chartIndicatorsEnabled private val _isEnabledFlow : MutableSharedFlow = MutableSharedFlow() diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/coinmarkets/CoinMarketsService.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/coinmarkets/CoinMarketsService.kt index 585dabb7aa..0ffca46038 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/coinmarkets/CoinMarketsService.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/coinmarkets/CoinMarketsService.kt @@ -9,7 +9,6 @@ import io.horizontalsystems.marketkit.models.MarketTicker import io.reactivex.subjects.BehaviorSubject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import kotlinx.coroutines.rx2.await @@ -19,7 +18,7 @@ class CoinMarketsService( private val currencyManager: CurrencyManager, private val marketKit: MarketKitWrapper, ) { - private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val coroutineScope = CoroutineScope(Dispatchers.IO) private var marketTickers = listOf() private var verifiedType: VerifiedType = VerifiedType.All diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinComponent.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinComponent.kt index 5bef457592..abbc22ed41 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinComponent.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/pin/PinComponent.kt @@ -13,7 +13,6 @@ import io.reactivex.BackpressureStrategy import io.reactivex.Flowable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch class PinComponent( @@ -23,7 +22,7 @@ class PinComponent( private val backgroundManager: BackgroundManager ) : IPinComponent { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) init { scope.launch { diff --git a/core/src/main/java/io/horizontalsystems/core/BackgroundManager.kt b/core/src/main/java/io/horizontalsystems/core/BackgroundManager.kt index 83eec365bb..ff360275f1 100644 --- a/core/src/main/java/io/horizontalsystems/core/BackgroundManager.kt +++ b/core/src/main/java/io/horizontalsystems/core/BackgroundManager.kt @@ -5,14 +5,13 @@ import android.app.Application import android.os.Bundle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.launch class BackgroundManager(application: Application) : Application.ActivityLifecycleCallbacks { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private val scope = CoroutineScope(Dispatchers.Default) private val _stateFlow: MutableSharedFlow = MutableSharedFlow() val stateFlow: SharedFlow get() = _stateFlow