Close cursors

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -1109,7 +1109,7 @@ public class FragmentCompose extends FragmentBase {
 
                     boolean contacts = Helper.hasPermission(getContext(), Manifest.permission.READ_CONTACTS);
                     if (contacts) {
-                        Cursor cursor = resolver.query(
+                        try (Cursor cursor = resolver.query(
                                 ContactsContract.CommonDataKinds.Email.CONTENT_URI,
                                 new String[]{
                                         ContactsContract.Contacts.DISPLAY_NAME,
@@ -1122,7 +1122,7 @@ public class FragmentCompose extends FragmentBase {
                                         " OR LOWER(" + ContactsContract.Contacts.DISPLAY_NAME + ") GLOB ?" +
                                         " OR " + ContactsContract.CommonDataKinds.Email.DATA + " LIKE ?)",
                                 new String[]{wildcard, glob, wildcard},
-                                null);
+                                null)) {
 
                             while (cursor != null && cursor.moveToNext()) {
                                 EntityContact item = new EntityContact();
@@ -1138,6 +1138,7 @@ public class FragmentCompose extends FragmentBase {
                                     map.put(item.email, item);
                             }
                         }
+                    }
 
                     List<EntityContact> items = new ArrayList<>();
                     if (suggest_sent)

app/src/main/java/eu/faircode/email/FtsDbHelper.java

@@ -124,14 +124,15 @@ public class FtsDbHelper extends SQLiteOpenHelper {
     static List<String> getSuggestions(SQLiteDatabase db, String query, int max) {
         List<String> result = new ArrayList<>();
 
-        Cursor cursor = db.query(
+        try (Cursor cursor = db.query(
                 "SELECT term FROM message_terms" +
                         " WHERE term LIKE ?" +
                         " ORDER BY cnt" +
                         " LIMIT " + max,
-                new Object[]{query});
+                new Object[]{query})) {
             while (cursor != null && cursor.moveToNext())
                 result.add(cursor.getString(0));
+        }
 
         return result;
     }

app/src/main/java/eu/faircode/email/WorkerFts.java

@@ -67,7 +67,7 @@ public class WorkerFts extends Worker {
 
             SQLiteDatabase sdb = FtsDbHelper.getInstance(context);
 
-            Cursor cursor = db.message().getMessageFts();
+            try (Cursor cursor = db.message().getMessageFts()) {
                 while (cursor != null && cursor.moveToNext())
                     try {
                         long id = cursor.getLong(0);
@@ -105,6 +105,7 @@ public class WorkerFts extends Worker {
                     } catch (Throwable ex) {
                         Log.e(ex);
                     }
+            }
 
             markIndexed(db, ids);