From 7ea6ba176252ae8350f68d80806b88071bed8eb3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 9 Aug 2018 07:00:20 +0000
Subject: [PATCH] Fixed debug/crash info

---
 .../java/eu/faircode/email/ApplicationEx.java   |  2 +-
 .../java/eu/faircode/email/EntityFolder.java    | 17 +++++++++++++++++
 .../java/eu/faircode/email/FragmentAbout.java   |  2 +-
 .../java/eu/faircode/email/FragmentCompose.java | 12 +-----------
 .../java/eu/faircode/email/FragmentMessage.java |  6 +-----
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index fe897440eb..d31e19f9ff 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -44,7 +44,7 @@ public class ApplicationEx extends Application {
                 DB db = null;
                 try {
                     db = DB.getBlockingInstance(ApplicationEx.this);
-                    EntityFolder drafts = db.folder().getLocalDrafts();
+                    EntityFolder drafts = EntityFolder.getDrafts(ApplicationEx.this, db, -1);
                     if (drafts != null) {
                         Address to = new InternetAddress("marcel+email@faircode.eu", "FairCode");
 
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index d9f2995ac7..d499b03335 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -19,6 +19,8 @@ package eu.faircode.email;
     Copyright 2018 by Marcel Bokhorst (M66B)
 */
 
+import android.content.Context;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -103,6 +105,21 @@ public class EntityFolder {
     @NonNull
     public Integer after; // days
 
+    static EntityFolder getDrafts(Context context, DB db, long account) {
+        EntityFolder drafts = db.folder().getFolderByType(account, EntityFolder.TYPE_DRAFTS);
+        if (drafts == null)
+            drafts = db.folder().getLocalDrafts();
+        if (drafts == null) {
+            drafts = new EntityFolder();
+            drafts.name = context.getString(R.string.title_folder_local_drafts);
+            drafts.type = EntityFolder.TYPE_DRAFTS;
+            drafts.synchronize = false;
+            drafts.after = 0;
+            drafts.id = db.folder().insertFolder(drafts);
+        }
+        return drafts;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof EntityFolder) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index a1809d92d2..2d2e74963d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -61,7 +61,7 @@ public class FragmentAbout extends FragmentEx {
                     public void run() {
                         try {
                             DB db = DB.getInstance(getContext());
-                            EntityFolder drafts = db.folder().getLocalDrafts();
+                            EntityFolder drafts = EntityFolder.getDrafts(getContext(), db, -1);
                             if (drafts != null) {
                                 StringBuilder info = Helper.getDebugInfo();
                                 info.insert(0, getString(R.string.title_debug_info_remark) + "\n\n\n\n");
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d16a654266..b4096e2754 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -517,17 +517,7 @@ public class FragmentCompose extends FragmentEx {
                 if (ident == null)
                     throw new IllegalArgumentException(getContext().getString(R.string.title_from_missing));
 
-                EntityFolder drafts = db.folder().getFolderByType(ident.account, EntityFolder.TYPE_DRAFTS);
-                if (drafts == null)
-                    drafts = db.folder().getLocalDrafts();
-                if (drafts == null) {
-                    drafts = new EntityFolder();
-                    drafts.name = getContext().getString(R.string.title_folder_local_drafts);
-                    drafts.type = EntityFolder.TYPE_DRAFTS;
-                    drafts.synchronize = false;
-                    drafts.after = 0;
-                    db.folder().insertFolder(drafts);
-                }
+                EntityFolder drafts = EntityFolder.getDrafts(getContext(), db, ident.account);
 
                 long rid = args.getLong("rid", -1);
                 String thread = args.getString("thread");
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 5a0de68ba8..4768a22bfd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -408,11 +408,7 @@ public class FragmentMessage extends FragmentEx {
                 try {
                     DB db = DB.getInstance(getContext());
                     EntityMessage draft = db.message().getMessage(id);
-                    EntityFolder drafts = db.folder().getFolderByType(draft.account, EntityFolder.TYPE_DRAFTS);
-                    if (drafts == null)
-                        drafts = db.folder().getLocalDrafts();
-                    if (drafts == null)
-                        return;
+                    EntityFolder drafts = EntityFolder.getDrafts(getContext(), db, draft.account);
                     draft.id = null;
                     draft.folder = drafts.id;
                     draft.id = db.message().insertMessage(draft);