Fixed orphan messages (2)

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

@@ -68,7 +68,7 @@ import javax.mail.internet.InternetAddress;
 // https://developer.android.com/topic/libraries/architecture/room.html
 
 @Database(
-        version = 247,
+        version = 248,
         entities = {
                 EntityIdentity.class,
                 EntityAccount.class,
@@ -2481,13 +2481,17 @@ public abstract class DB extends RoomDatabase {
                     @Override
                     public void migrate(@NonNull SupportSQLiteDatabase db) {
                         logMigration(startVersion, endVersion);
-                        EntityMessage.convert(context, true);
                     }
                 }).addMigrations(new Migration(246, 247) {
                     @Override
                     public void migrate(@NonNull SupportSQLiteDatabase db) {
                         logMigration(startVersion, endVersion);
-                        EntityMessage.convert(context, false);
+                    }
+                }).addMigrations(new Migration(247, 248) {
+                    @Override
+                    public void migrate(@NonNull SupportSQLiteDatabase db) {
+                        logMigration(startVersion, endVersion);
+                        EntityMessage.convert(context);
                     }
                 }).addMigrations(new Migration(998, 999) {
                     @Override

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

@@ -578,26 +578,21 @@ public class EntityMessage implements Serializable {
 
     static File getFile(Context context, Long id) {
         File root = new File(context.getFilesDir(), "messages");
-        File dir = Helper.ensureExists(new File(root, Long.toString(id / 1000)));
+        File dir = Helper.ensureExists(new File(root, "D" + (id / 1000)));
         return new File(dir, id.toString());
     }
 
-    static void convert(Context context, boolean silent) {
+    static void convert(Context context) {
         File root = new File(context.getFilesDir(), "messages");
-        File[] files = root.listFiles();
+        List<File> files = Helper.listFiles(root);
-        if (files == null)
-            return;
         for (File file : files)
             if (file.isFile())
                 try {
                     long id = Long.parseLong(file.getName());
                     File target = getFile(context, id);
-                    Helper.copy(file, target);
+                    if (!file.renameTo(target))
-                    file.delete();
+                        throw new IllegalArgumentException("Failed moving " + file);
                 } catch (Throwable ex) {
-                    if (silent)
-                        Log.i(ex);
-                    else
                     Log.e(ex);
                 }
     }