From bb4eb51d175ccaed8ada3135e9b8e6639a32d713 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 23 Sep 2019 10:04:46 +0200 Subject: [PATCH] Simplified debug info identity --- app/src/main/java/eu/faircode/email/Log.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index 817a3974d6..50d35b4beb 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -451,24 +451,17 @@ public class Log { try { db.beginTransaction(); - EntityFolder drafts = db.folder().getPrimaryDrafts(); - if (drafts == null) - throw new IllegalArgumentException(context.getString(R.string.title_no_primary_drafts)); + List identities = db.identity().getComposableIdentities(null); + if (identities == null || identities.size() == 0) + throw new IllegalArgumentException(context.getString(R.string.title_no_identities)); - List identities = db.identity().getIdentities(drafts.account); - EntityIdentity primary = null; - for (EntityIdentity identity : identities) { - if (identity.primary) { - primary = identity; - break; - } else if (primary == null) - primary = identity; - } + EntityIdentity identity = identities.get(0); + EntityFolder drafts = db.folder().getFolderByType(identity.account, EntityFolder.DRAFTS); draft = new EntityMessage(); draft.account = drafts.account; draft.folder = drafts.id; - draft.identity = (primary == null ? null : primary.id); + draft.identity = identity.id; draft.msgid = EntityMessage.generateMessageId(); draft.thread = draft.msgid; draft.to = new Address[]{myAddress()};