1 files changed, 4 insertions, 11 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
index ff2614840..a95278723 100644
--- a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
@@ -26,6 +26,7 @@ import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.ui.XmppActivity;
+import rocks.xmpp.addr.Jid;
 
 public class ExceptionHelper {
     private static final String FILENAME = "stacktrace.txt";
@@ -49,18 +50,10 @@ public class ExceptionHelper {
             if (!crashreport || Config.BUG_REPORTS == null) {
                 return false;
             }
-            List<Account> accounts = service.getAccounts();
-            Account account = null;
-            for (int i = 0; i < accounts.size(); ++i) {
-                if (accounts.get(i).isEnabled()) {
-                    account = accounts.get(i);
-                    break;
-                }
-            }
+            final Account account = AccountUtils.getFirstEnabled(service);
             if (account == null) {
                 return false;
             }
-            final Account finalAccount = account;
             FileInputStream file = activity.openFileInput(FILENAME);
             InputStreamReader inputStreamReader = new InputStreamReader(file);
             BufferedReader stacktrace = new BufferedReader(inputStreamReader);
@@ -91,8 +84,8 @@ public class ExceptionHelper {
             builder.setTitle(activity.getString(R.string.crash_report_title));
             builder.setMessage(activity.getText(R.string.crash_report_message));
             builder.setPositiveButton(activity.getText(R.string.send_now), (dialog, which) -> {
-                Log.d(Config.LOGTAG, "using account=" + finalAccount.getJid().asBareJid() + " to send in stack trace");
-                Conversation conversation = service.findOrCreateConversation(finalAccount, Config.BUG_REPORTS, false, true);
+                Log.d(Config.LOGTAG, "using account=" + account.getJid().asBareJid() + " to send in stack trace");
+                Conversation conversation = service.findOrCreateConversation(account, Config.BUG_REPORTS, false, true);
                 Message message = new Message(conversation, report.toString(), Message.ENCRYPTION_NONE);
                 service.sendMessage(message);
             });