From 8ddcadfb005192609cd12d9a4d1b8a39b87d2853 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 26 May 2020 15:27:33 +0200 Subject: [PATCH] updates to currency API, does not work though --- app/build.gradle | 8 ++++---- .../android/api/CurrencyConverterApi.kt | 4 ++-- .../ui/fragment/data/BankrollDataFragment.kt | 13 ++++++++++--- .../java/net/pokeranalytics/android/util/URL.kt | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 284725a3..58e9e710 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { minSdkVersion 23 targetSdkVersion 28 versionCode 85 - versionName "3.0" + versionName "3.0(b1)" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -98,7 +98,7 @@ dependencies { // Android implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.core:core-ktx:1.3.0-alpha02' + implementation 'androidx.core:core-ktx:1.4.0-alpha01' implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' @@ -107,7 +107,7 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:converter-gson:2.5.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.6' // Places implementation 'com.google.android.libraries.places:places:1.1.0' @@ -118,7 +118,7 @@ dependencies { implementation 'com.android.billingclient:billing:1.2.2' // Firebase - implementation 'com.google.firebase:firebase-core:17.2.3' + implementation 'com.google.firebase:firebase-core:17.4.1' // Crashlytics implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' diff --git a/app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt b/app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt index 888a4a63..c7ed6aa8 100644 --- a/app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt +++ b/app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt @@ -28,7 +28,7 @@ interface CurrencyConverterApi { if (currencyConverterApi == null) { - var serviceEndpoint = URL.API_CURRENCY_CONVERTER + val serviceEndpoint = URL.API_CURRENCY_CONVERTER val httpClient = OkHttpClient.Builder() @@ -75,6 +75,6 @@ interface CurrencyConverterApi { } @GET("convert") - fun convert(@Query("q") currencies: String, @Query("compact") compact: String = "y"): Call> + fun convert(@Query("q") currencies: String, @Query("compact") compact: String = "ultra"): Call> } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt index 7ffe8b63..c0991b3d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt @@ -26,6 +26,7 @@ import net.pokeranalytics.android.util.extensions.toCurrency import net.pokeranalytics.android.util.extensions.toRate import retrofit2.Call import retrofit2.Response +import timber.log.Timber import java.util.* @@ -215,7 +216,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS if (System.currentTimeMillis() - lastRefreshRateCall < 10 * 1000 || isRefreshingRate) { return } - lastRefreshRateCall = System.currentTimeMillis() + this.lastRefreshRateCall = System.currentTimeMillis() val currenciesConverterValue = "${bankroll.currency?.code}_${defaultCurrency.currencyCode}" val call = CurrencyConverterApi.getApi(requireContext())?.convert(currenciesConverterValue) @@ -224,8 +225,13 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS override fun onResponse(call: Call>, response: Response>) { response.body()?.let { it[currenciesConverterValue]?.value?.let { rate -> + Timber.d("rate found = $rate") onRowValueChanged(rate, BankrollRow.RATE) + } ?: run { + Timber.d("no rate for $currenciesConverterValue") } + } ?: run { + Timber.d("onResponse> no body in ${response}") } isRefreshingRate = false @@ -233,13 +239,14 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS } override fun onFailure(call: Call>, t: Throwable) { + Timber.d("api call failed: ${t.message}") isRefreshingRate = false rowRepresentableAdapter.refreshRow(BankrollRow.REFRESH_RATE) } }) - isRefreshingRate = true - rowRepresentableAdapter.refreshRow(BankrollRow.REFRESH_RATE) + this.isRefreshingRate = true + this.rowRepresentableAdapter.refreshRow(BankrollRow.REFRESH_RATE) } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/util/URL.kt b/app/src/main/java/net/pokeranalytics/android/util/URL.kt index ec9913b0..7c2b9e52 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/URL.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/URL.kt @@ -19,7 +19,7 @@ enum class URL(var value: String) { SUPPORT_EMAIL("support@pokeranalytics.net"), // CurrencyCode Converter API - API_CURRENCY_CONVERTER("https://free.currencyconverterapi.com/api/v5/"), + API_CURRENCY_CONVERTER("https://free.currconv.com/api/v7/"), // Poker Rumble POKER_RUMBLE("https://www.pokerrumble.net"),