From 293cccd8976a92a03da29ff7fdcbfdfe1b0ff31c Mon Sep 17 00:00:00 2001
From: Henrique Guedes <henrique-gb@users.noreply.github.com>
Date: Wed, 31 Oct 2018 05:25:49 -0400
Subject: [PATCH] Null checks to avoid NPEs (#1917) (#1918)

---
 .../nrw/commons/category/CategoryImagesListFragment.java  | 3 +++
 .../nrw/commons/explore/images/SearchImageFragment.java   | 4 +++-
 .../main/java/fr/free/nrw/commons/utils/FileUtils.java    | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java
index 126895166..f24cc0b95 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java
@@ -263,6 +263,9 @@ public class CategoryImagesListFragment extends DaggerFragment {
      * @return  GridView Adapter
      */
     public ListAdapter getAdapter() {
+        if(gridView == null) {
+            return null;
+        }
         return gridView.getAdapter();
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java
index 1b93abb7b..7c7f1cdd9 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java
@@ -125,7 +125,9 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment {
      */
     public void updateImageList(String query) {
         this.query = query;
-        imagesNotFoundView.setVisibility(GONE);
+        if(imagesNotFoundView != null) {
+            imagesNotFoundView.setVisibility(GONE);
+        }
         if(!NetworkUtils.isInternetConnectionEstablished(getContext())) {
             handleNoInternet();
             return;
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java
index 1d1c6c914..d8e569564 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/FileUtils.java
@@ -45,8 +45,12 @@ public class FileUtils {
             e.printStackTrace();
         } finally {
             try {
-                out.close();
-                in.close();
+                if(out != null) {
+                    out.close();
+                }
+                if(in != null) {
+                    in.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }