From 947fcdf2980bde42092d1471c10220d5b4fa10c9 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Aug 2026 08:04:46 +0200 Subject: [PATCH] Added fail-safe --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/FragmentRule.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 2675860a37..ccb54fe8f7 100644 --- 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) { diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java index 4c8caf85a1..197e267434 100644 --- 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);