GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2022-03-25 17:17:55 +00:00
commit 2560d00150
7 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/assets/tangem-app-config

@ -1 +1 @@
Subproject commit b3fb1483a37bf1fb7d9da3f9bd9424f693c0ec5b
Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79

14
app/src/main/java/com/tangem/tap/TapApplication.kt
View file

@ -35,6 +35,8 @@ val store = Store(
middleware = AppState.getMiddleware(),
state = AppState()
)
val logConfig = LogConfig()
lateinit var preferencesStorage: PreferencesStorage
lateinit var currenciesRepository: CurrenciesRepository
lateinit var walletConnectRepository: WalletConnectRepository
@ -99,4 +101,14 @@ class TapApplication : Application() {
val analyticsHandler = GlobalAnalyticsHandler.createDefaultAnalyticHandlers(this)
store.dispatch(GlobalAction.SetAnanlyticHandlers(analyticsHandler))
}
}
}
data class LogConfig(
// disables both [internal, http]
val picasso: Boolean = BuildConfig.DEBUG,
val picassoInternal: Boolean = true,
val picassoHttp: Boolean = true,
val storeAction: Boolean = BuildConfig.DEBUG,
)

36
app/src/main/java/com/tangem/tap/common/images/Picasso.kt
View file

@ -3,6 +3,7 @@ package com.tangem.tap.common.images
import android.app.Application
import com.squareup.picasso.OkHttp3Downloader
import com.squareup.picasso.Picasso
import com.tangem.tap.logConfig
import com.tangem.wallet.BuildConfig
import okhttp3.Cache
import okhttp3.CacheControl
@ -18,42 +19,45 @@ class PicassoHelper {
fun initPicassoWithCaching(application: Application) {
val picasso = Picasso.Builder(application)
.downloader(OkHttp3Downloader(getOkHttpForPicasso(application)))
.build()
picasso.isLoggingEnabled = BuildConfig.DEBUG
.downloader(OkHttp3Downloader(getOkHttpForPicasso(application)))
.build()
picasso.isLoggingEnabled = logIsEnabled()
picasso.setIndicatorsEnabled(BuildConfig.DEBUG)
Picasso.setSingletonInstance(picasso)
}
private fun getOkHttpForPicasso(application: Application): OkHttpClient {
val okHttpBuilder = OkHttpClient.Builder()
okHttpBuilder.cache(Cache(File(application.filesDir, "artworks"), Long.MAX_VALUE))
okHttpBuilder.callTimeout(15000, TimeUnit.MILLISECONDS)
return OkHttpClient.Builder().apply {
cache(Cache(File(application.filesDir, "artworks"), Long.MAX_VALUE))
callTimeout(15000, TimeUnit.MILLISECONDS)
okHttpBuilder.addInterceptor { chain ->
val cacheControl = CacheControl.Builder()
if (logIsEnabled()) {
addDebugInterceptors(this)
}
addInterceptor { chain ->
val cacheControl = CacheControl.Builder()
.maxStale(KEEP_CACHE_MAX_DAYS, TimeUnit.DAYS)
.build()
val origRequest = chain.request()
val neverExpireRequest = origRequest.newBuilder()
val origRequest = chain.request()
val neverExpireRequest = origRequest.newBuilder()
.cacheControl(cacheControl)
.build()
chain.proceed(neverExpireRequest)
}
addDebugInterceptors(okHttpBuilder)
chain.proceed(neverExpireRequest)
}
}.build()
return okHttpBuilder.build()
}
private fun addDebugInterceptors(okHttpBuilder: OkHttpClient.Builder) {
if (!BuildConfig.DEBUG) return
val picassoInterceptor = HttpLoggingInterceptor(PicassoOkHttpLogger()).apply {
level = HttpLoggingInterceptor.Level.BODY
}
okHttpBuilder.addInterceptor(picassoInterceptor)
}
private fun logIsEnabled(): Boolean = BuildConfig.DEBUG && logConfig.picasso
}
}

3
app/src/main/java/com/tangem/tap/common/redux/LogMiddleware.kt
View file

@ -1,5 +1,6 @@
package com.tangem.tap.common.redux
import com.tangem.tap.logConfig
import org.rekotlin.Middleware
import timber.log.Timber
@ -9,7 +10,7 @@ import timber.log.Timber
val logMiddleware: Middleware<AppState> = { dispatch, appState ->
{ nextDispatch ->
{ action ->
Timber.d("Dispatch action: $action")
if (logConfig.storeAction) Timber.d("Dispatch action: $action")
nextDispatch(action)
}
}

2
app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyShop.kt
View file

@ -1,10 +1,12 @@
package com.tangem.tap.common.shop.shopify
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class ShopifyShop(
val domain: String,
@Json(name = "storefrontApiKeyAndroid")
val storefrontApiKey: String,
val merchantID: String,
)

6
app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
View file

@ -103,9 +103,11 @@ class TapWalletManager {
val toUpdate = currencies.filter { !fiatRatesThrottler.isStillThrottled(it) }
toUpdate.forEach {
fiatRatesThrottler.updateThrottlingTo(it)
val result = coinMarketCapService.getRate(it.currencySymbol, fiatCurrency)
fiatRatesThrottler.setValue(it, result)
if (result is Result.Success) {
fiatRatesThrottler.updateThrottlingTo(it)
fiatRatesThrottler.setValue(it, result)
}
handleFiatRatesResult(listOf(it to result))
}
}

2
app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
View file

@ -43,7 +43,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
private fun getRegionProvider(): RegionProvider = RegionService(
listOf(
TelephonyManagerRegionProvider(requireContext()),
// TelephonyManagerRegionProvider(requireContext()),
LocaleRegionProvider()
)
)