From 0d369bef4ff7a72037176d30cc88e4f32d2feae6 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 8 Oct 2022 20:59:40 +0200 Subject: [PATCH] Reduced logging --- app/src/main/java/eu/faircode/email/DB.java | 4 ++-- app/src/main/java/eu/faircode/email/EntityMessage.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java index abc15ea129..4d938a47b2 100644 --- a/app/src/main/java/eu/faircode/email/DB.java +++ b/app/src/main/java/eu/faircode/email/DB.java @@ -2481,13 +2481,13 @@ public abstract class DB extends RoomDatabase { @Override public void migrate(@NonNull SupportSQLiteDatabase db) { logMigration(startVersion, endVersion); - EntityMessage.convert(context); + EntityMessage.convert(context, true); } }).addMigrations(new Migration(246, 247) { @Override public void migrate(@NonNull SupportSQLiteDatabase db) { logMigration(startVersion, endVersion); - EntityMessage.convert(context); + EntityMessage.convert(context, false); } }).addMigrations(new Migration(998, 999) { @Override diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java index 8098e697fb..2abcfe5635 100644 --- a/app/src/main/java/eu/faircode/email/EntityMessage.java +++ b/app/src/main/java/eu/faircode/email/EntityMessage.java @@ -582,7 +582,7 @@ public class EntityMessage implements Serializable { return new File(dir, id.toString()); } - static void convert(Context context) { + static void convert(Context context, boolean silent) { File root = new File(context.getFilesDir(), "messages"); File[] files = root.listFiles(); if (files == null) @@ -595,7 +595,10 @@ public class EntityMessage implements Serializable { Helper.copy(file, target); file.delete(); } catch (Throwable ex) { - Log.e(ex); + if (silent) + Log.i(ex); + else + Log.e(ex); } }