diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 45b2362297..55f9bc1ade 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59df1..c0f68eddd7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,30 @@ + + + + diff --git a/app/build.gradle b/app/build.gradle index ced2006090..8e6dd8de35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 41 + versionCode 43 versionName "0.85.5." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/tangem/data/network/task/loaded_wallet/RateInfoTask.java b/app/src/main/java/com/tangem/data/network/task/loaded_wallet/RateInfoTask.java index 3383eca442..57b516d4a3 100644 --- a/app/src/main/java/com/tangem/data/network/task/loaded_wallet/RateInfoTask.java +++ b/app/src/main/java/com/tangem/data/network/task/loaded_wallet/RateInfoTask.java @@ -20,47 +20,55 @@ public class RateInfoTask extends ExchangeTask { protected void onPostExecute(List requests) { super.onPostExecute(requests); - LoadedWallet loadedWallet = reference.get(); - for (ExchangeRequest request : requests) { - if (request.error == null) { - try { + try { + LoadedWallet loadedWallet = reference.get(); - JSONArray arr = request.getAnswerList(); - for (int i = 0; i < arr.length(); ++i) { - JSONObject obj = arr.getJSONObject(i); - String currency = obj.getString("id"); + for (ExchangeRequest request : requests) { + if (request.error == null) { + try { - boolean stop = false; - boolean stopAlter = false; - if (currency.equals(request.currency)) { - String usd = obj.getString("price_usd"); + JSONArray arr = request.getAnswerList(); + for (int i = 0; i < arr.length(); ++i) { + JSONObject obj = arr.getJSONObject(i); + String currency = obj.getString("id"); + + boolean stop = false; + boolean stopAlter = false; + if (currency.equals(request.currency)) { + String usd = obj.getString("price_usd"); + + Float rate = Float.valueOf(usd); + loadedWallet.mCard.setRate(rate); + loadedWallet.updateViews(); + stop = true; + } + + if (currency.equals(request.currencyAlter)) { + String usd = obj.getString("price_usd"); + + Float rate = Float.valueOf(usd); + loadedWallet.mCard.setRateAlter(rate); + loadedWallet.updateViews(); + stopAlter = true; + } + + if (stop && stopAlter) { + break; + } - Float rate = Float.valueOf(usd); - loadedWallet.mCard.setRate(rate); - loadedWallet.updateViews(); - stop = true; } - - if (currency.equals(request.currencyAlter)) { - String usd = obj.getString("price_usd"); - - Float rate = Float.valueOf(usd); - loadedWallet.mCard.setRateAlter(rate); - loadedWallet.updateViews(); - stopAlter = true; - } - - if (stop && stopAlter) { - break; - } - + } catch (JSONException e) { + e.printStackTrace(); } - } catch (JSONException e) { - e.printStackTrace(); } } + + } catch (NullPointerException e) { + e.printStackTrace(); + } + } } \ No newline at end of file