Log fail-safe

4 years ago · b4ad4d72d3
parent 9b5b7bba1c
commit b4ad4d72d3
1 changed files with 15 additions and 11 deletions
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@ -528,18 +528,22 @@ public class EmailService implements AutoCloseable {

                @Override
                public void write(int b) {
+                    try {
                        if (((char) b) == '\n') {
                            String line = bos.toString();
                            if (!line.endsWith("ignoring socket timeout"))
-                            if (debug)
-                                android.util.Log.i("javamail", user + " " + line);
-                            else
+                                if (log)
                                    EntityLog.log(context, user + " " + line);
+                                else
+                                    android.util.Log.i("javamail", user + " " + line);
                            bos.reset();
                        } else
                            bos.write(b);
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                    }
                }
-            }));
+            }, true));

        //System.setProperty("mail.socket.debug", Boolean.toString(debug));
        isession.addProvider(new GmailSSLProvider());