From 36f9fa1e36043f95365f27895c7268f7c8fed8f4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 12 Apr 2021 09:37:45 +0200 Subject: [PATCH] Fix su null in ColliDataRecover --- .../core/data_recover/ColliDataRecover.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java index fadeef43..3c5a7ba2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java @@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatActivity; import com.annimon.stream.Optional; import com.annimon.stream.Stream; -import com.google.android.gms.common.util.IOUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -122,7 +121,7 @@ public class ColliDataRecover { } public static boolean thereIsAnExistantSession() { - return mtbColtsSessions.size() > 0; + return mtbColtsSessions != null && mtbColtsSessions.size() > 0; } public static List getAllSessionIDs() { @@ -193,13 +192,16 @@ public class ColliDataRecover { try { inputStream = mContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE); - byte[] bytes = IOUtils.readInputStreamFully(inputStream); + byte[] bytes = new byte[inputStream.available()]; + inputStream.read(bytes); + inputStream.close(); + String jsonString = new String(bytes); Type listType = new TypeToken>(){}.getType(); mtbColtsSessions = gson.fromJson(jsonString, listType); - inputStream.close(); + if(mtbColtsSessions == null) mtbColtsSessions = new ArrayList<>(); } catch (Exception e) { e.printStackTrace(); UtilityExceptions.defaultException(mContext, e);