From 73239c13280114f84cca9ba25a831ea06cae9f33 Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Thu, 9 Jul 2020 14:38:43 +0200
Subject: [PATCH] Try to Fix NullPointerException but not sure of the real
 cause need more investigation

---
 .../exodusprivacy/adapters/ApplicationListAdapter.java   | 9 ++++++++-
 .../exodusprivacy/fragments/ReportFragment.java          | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java
index 026b21d..5148655 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java
@@ -53,7 +53,14 @@ public class ApplicationListAdapter extends RecyclerView.Adapter {
     private Comparator<ApplicationViewModel> alphaPackageComparator = new Comparator<ApplicationViewModel>() {
         @Override
         public int compare(ApplicationViewModel app1, ApplicationViewModel app2) {
-            return app1.label.toString().compareToIgnoreCase(app2.label.toString());
+            if(app1.label != null && app2.label != null)
+                return app1.label.toString().compareToIgnoreCase(app2.label.toString());
+            else if(app2.label != null)
+                return -1;
+            else if(app1.label != null)
+                return 1;
+            else
+                return 0;
         }
     };
 
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
index 13f6f61..501fb1b 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
@@ -89,7 +89,8 @@ public class ReportFragment  extends Fragment implements Updatable {
 
     @Override
     public void onUpdateComplete() {
-        onUpdateComplete(model);
+        if(model != null)
+            onUpdateComplete(model);
     }
 
     public void onUpdateComplete(ApplicationViewModel model) {