From 84d09a381c0fbcb78a9b507c5ab79dc642ed0970 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 24 Dec 2018 10:51:32 +0000
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/ActivityView.java       | 2 +-
 app/src/main/java/eu/faircode/email/AdapterMessage.java     | 2 +-
 app/src/main/java/eu/faircode/email/DB.java                 | 2 +-
 app/src/main/java/eu/faircode/email/EntityMessage.java      | 2 +-
 app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index f865a7a084..a897ac6641 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -705,7 +705,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                         ContactsContract.Contacts.STARRED + " DESC" +
                                 ", " + ContactsContract.Contacts.TIMES_CONTACTED + " DESC" +
                                 ", " + ContactsContract.Contacts.LAST_TIME_CONTACTED + " DESC");
-                while (cursor.moveToNext())
+                while (cursor != null && cursor.moveToNext())
                     try {
                         long id = cursor.getLong(cursor.getColumnIndex(ContactsContract.RawContacts._ID));
                         String name = cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME));
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 30f790d11b..60705b7bc1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -656,7 +656,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             },
                             ContactsContract.CommonDataKinds.Email.ADDRESS + " = ?",
                             new String[]{email}, null);
-                    if (cursor.moveToNext()) {
+                    if (cursor != null && cursor.moveToNext()) {
                         int colContactId = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Photo.CONTACT_ID);
                         int colLookupKey = cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
 
diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index 223e376e84..ba0a56f7d0 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -102,7 +102,7 @@ public abstract class DB extends RoomDatabase {
         Cursor cursor = null;
         try {
             cursor = db.query(command, new Object[0]);
-            if (cursor.moveToNext())
+            if (cursor != null && cursor.moveToNext())
                 return cursor.getString(0);
             else
                 return null;
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 9dc0f6c8f7..9fe5d26dd2 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -211,7 +211,7 @@ public class EntityMessage implements Serializable {
                                     },
                                     ContactsContract.CommonDataKinds.Email.ADDRESS + " = ?",
                                     new String[]{email}, null);
-                            if (cursor.moveToNext()) {
+                            if (cursor != null && cursor.moveToNext()) {
                                 int colContactId = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Photo.CONTACT_ID);
                                 int colLookupKey = cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
                                 int colDisplayName = cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 42e6d53bed..7f6d55b2a0 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -643,7 +643,7 @@ public class ServiceSynchronize extends LifecycleService {
                                             ContactsContract.Contacts.LOOKUP_KEY
                                     },
                                     null, null, null);
-                            if (cursor.moveToNext()) {
+                            if (cursor != null && cursor.moveToNext()) {
                                 if (true || Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                                     Uri uri = ContactsContract.Contacts.getLookupUri(
                                             cursor.getLong(cursor.getColumnIndex(ContactsContract.Contacts._ID)),