From a79b496bb66af2364ccf600acd42757ca26e70c2 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 17 Jul 2018 17:37:47 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .idea/caches/build_file_checksums.ser         | Bin 536 -> 536 bytes
 .idea/misc.xml                                |  25 ++++++
 app/build.gradle                              |   2 +-
 .../task/loaded_wallet/RateInfoTask.java      |  72 ++++++++++--------
 4 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 45b236229704b3be52ceba7c96e6e7462f91effc..55f9bc1ade783d01e1aa54b74d3691499fe121de 100644
GIT binary patch
delta 32
ocmbQiGJ|EpOy<?`M>o#NW)v(aJj-(Bs7xng5y#QolPgjy0Npta=>Px#

delta 32
qcmV+*0N?+Z1egSnnFEVSx3QdS0TG(6z{n|4T+9kw*yDRJdFFWH@ea=b

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="5">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
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<ExchangeRequest> 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