Added fail-safe

4 weeks ago · 947fcdf298
parent 8639a83c4d
commit 947fcdf298
2 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@ -3588,7 +3588,7 @@ public class FragmentCompose extends FragmentBase {
                    if (cursor != null && cursor.getCount() == 0)
                        throw new SecurityException("Could not retrieve selected contact");

-                    if (cursor != null && cursor.moveToFirst()) {
+                    if (cursor != null && cursor.moveToFirst() && cursor.getColumnCount() > 0) {
                        int colEmail = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.ADDRESS);
                        int colName = cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
                        if (colEmail >= 0 && colName >= 0) {
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@ -1180,7 +1180,7 @@ public class FragmentRule extends FragmentBase {
                        ContactsContract.CommonDataKinds.Email.ADDRESS
                },
                null, null, null)) {
-            if (cursor != null && cursor.moveToFirst())
+            if (cursor != null && cursor.moveToFirst() && cursor.getColumnCount() > 0)
                et.setText(cursor.getString(0));
        } catch (Throwable ex) {
            Log.e(ex);