do not enable encryption for bug reports

1 files changed, 8 insertions, 34 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
index b1799d490..ff2614840 100644
--- a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
@@ -1,8 +1,6 @@
 package de.pixart.messenger.utils;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -28,7 +26,6 @@ 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";
@@ -93,36 +90,13 @@ public class ExceptionHelper {
             AlertDialog.Builder builder = new AlertDialog.Builder(activity);
             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),
-                    new OnClickListener() {
-
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-
-                            Log.d(Config.LOGTAG, "using account="
-                                    + finalAccount.getJid().asBareJid()
-                                    + " to send in stack trace");
-
-                            Conversation conversation = null;
-                            try {
-                                conversation = service.findOrCreateConversation(finalAccount,
-                                        Jid.of(Config.BUG_REPORTS), false, true);
-                            } catch (final IllegalArgumentException ignored) {
-                            }
-                            Message message = new Message(conversation, report
-                                    .toString(), Message.ENCRYPTION_NONE);
-                            service.sendMessage(message);
-                        }
-                    });
-            builder.setNegativeButton(activity.getText(R.string.send_never),
-                    new OnClickListener() {
-
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            preferences.edit().putBoolean("crash_report", false)
-                                    .apply();
-                        }
-                    });
+            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);
+                Message message = new Message(conversation, report.toString(), Message.ENCRYPTION_NONE);
+                service.sendMessage(message);
+            });
+            builder.setNegativeButton(activity.getText(R.string.send_never), (dialog, which) -> preferences.edit().putBoolean("never_send", true).apply());
             builder.create().show();
             return true;
         } catch (final IOException ignored) {
@@ -130,7 +104,7 @@ public class ExceptionHelper {
         }
     }
 
-    public static void writeToStacktraceFile(Context context, String msg) {
+    static void writeToStacktraceFile(Context context, String msg) {
         try {
             OutputStream os = context.openFileOutput(FILENAME, Context.MODE_PRIVATE);
             os.write(msg.getBytes());