diff --git a/app/src/main/java/com/artem/lendingwidget/LendingWidgetConfigureActivity.kt b/app/src/main/java/com/artem/lendingwidget/LendingWidgetConfigureActivity.kt index d089cf7..665bd16 100644 --- a/app/src/main/java/com/artem/lendingwidget/LendingWidgetConfigureActivity.kt +++ b/app/src/main/java/com/artem/lendingwidget/LendingWidgetConfigureActivity.kt @@ -118,7 +118,7 @@ class LendingWidgetConfigureActivity : AppCompatActivity() { if (url.isBlank()) { return } - if (url.startsWith("http://")) { + if (url.toLowerCase().startsWith("http://")) { url = url.substring(7) } this.storeUrl("${url}", mAppWidgetId) diff --git a/app/src/main/java/com/artem/lendingwidget/data/Botlog.kt b/app/src/main/java/com/artem/lendingwidget/data/Botlog.kt index b8ae17e..3ededc8 100644 --- a/app/src/main/java/com/artem/lendingwidget/data/Botlog.kt +++ b/app/src/main/java/com/artem/lendingwidget/data/Botlog.kt @@ -7,19 +7,13 @@ data class Botlog(val last_status: String, val last_update: Date, val log : Array, val outputCurrency: CurrencyEntry, - val raw_data: Map) { + val raw_data: Map) { - data class CurrencyEntry(val currency: CryptoCurrency, + data class CurrencyEntry(val currency: String, val highestBid: Float) data class Data(val averageLendingRate: Float, val lentSum: Float, val maxToLend: Float) -} - -enum class CryptoCurrency { - // TODO add more currencies - BTC, - ETH } \ No newline at end of file diff --git a/app/src/main/java/com/artem/lendingwidget/extensions/BotlogStoreExtensions.kt b/app/src/main/java/com/artem/lendingwidget/extensions/BotlogStoreExtensions.kt index 87dcab9..1846af6 100644 --- a/app/src/main/java/com/artem/lendingwidget/extensions/BotlogStoreExtensions.kt +++ b/app/src/main/java/com/artem/lendingwidget/extensions/BotlogStoreExtensions.kt @@ -3,7 +3,6 @@ package com.artem.lendingwidget.extensions import android.content.Context import com.artem.lendingwidget.data.Botlog import com.artem.lendingwidget.data.CoinDeskRate -import com.artem.lendingwidget.data.CryptoCurrency import com.artem.lendingwidget.data.Currency import com.github.salomonbrys.kotson.fromJson import com.google.gson.Gson @@ -66,8 +65,8 @@ fun Context.getBotlog(widgetId: Int): Botlog? { } } -fun Context.getCryptoCurrency(widgetId: Int): CryptoCurrency { - return CryptoCurrency.valueOf(this.getSharedPreferences(PREFS_NAME, 0).getString(PREF_CRYPTO_CURRENCY + widgetId, "BTC")) +fun Context.getCryptoCurrency(widgetId: Int): String { + return this.getSharedPreferences(PREFS_NAME, 0).getString(PREF_CRYPTO_CURRENCY + widgetId, "BTC") } fun Context.getCurrency(widgetId: Int): Currency {