From 5b8d7040e36f739cda3521b559f86e94a423bcd8 Mon Sep 17 00:00:00 2001 From: Rafael da Veiga Cabral Date: Mon, 1 Jun 2020 18:05:30 -0300 Subject: [PATCH] NY-10529: [AN]: Add null guards over files that might not exist --- .../data/NynjaStorageManager.java | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/NynjaStorageManager.java b/app/src/main/java/com/nynja/mobile/communicator/data/NynjaStorageManager.java index 48f671190f..428407eba3 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/data/NynjaStorageManager.java +++ b/app/src/main/java/com/nynja/mobile/communicator/data/NynjaStorageManager.java @@ -170,17 +170,33 @@ public class NynjaStorageManager { File dirImages = new File(dirStorage, DIR_IMAGES + DIVIDER); File dirVideos = new File(dirStorage, DIR_VIDEOS + DIVIDER); long cacheSize = 0; - for (File fileFile : dirFiles.listFiles()) { - if (fileFile.isFile()) cacheSize += fileFile.length(); + File filesList[] = dirFiles.listFiles(); + if (filesList != null) { + for (File fileFile : filesList) { + if (fileFile.isFile()) + cacheSize += fileFile.length(); + } } - for (File audioFile : dirAudio.listFiles()) { - if (audioFile.isFile()) cacheSize += audioFile.length(); + File audiosList[] = dirAudio.listFiles(); + if (audiosList != null) { + for (File audioFile : audiosList) { + if (audioFile.isFile()) + cacheSize += audioFile.length(); + } } - for (File imageFile : dirImages.listFiles()) { - if (imageFile.isFile()) cacheSize += imageFile.length(); + File imagesList[] = dirImages.listFiles(); + if (imagesList != null) { + for (File imageFile : imagesList) { + if (imageFile.isFile()) + cacheSize += imageFile.length(); + } } - for (File videoFile : dirVideos.listFiles()) { - if (videoFile.isFile()) cacheSize += videoFile.length(); + File videosList[] = dirVideos.listFiles(); + if (videosList != null) { + for (File videoFile : videosList) { + if (videoFile.isFile()) + cacheSize += videoFile.length(); + } } return FileUtils.getSizeString(cacheSize); } -- GitLab