mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added log types

This commit is contained in:
M66B 2021-08-17 14:21:19 +02:00
parent 545d4664ae
commit 3e7043f021
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@ -1038,7 +1038,8 @@ public class EmailProvider implements Parcelable {
do { do {
response = lis.readLine(); response = lis.readLine();
if (response != null) if (response != null)
EntityLog.log(context, socket.getRemoteSocketAddress() + " <" + response); EntityLog.log(context, EntityLog.Type.Protocol,
socket.getRemoteSocketAddress() + " <" + response);
} while (response != null && !response.startsWith("220 ")); } while (response != null && !response.startsWith("220 "));
command = "EHLO " + EmailService.getDefaultEhlo() + "\n"; command = "EHLO " + EmailService.getDefaultEhlo() + "\n";
@ -1048,7 +1049,8 @@ public class EmailProvider implements Parcelable {
do { do {
response = lis.readLine(); response = lis.readLine();
if (response != null) { if (response != null) {
EntityLog.log(context, socket.getRemoteSocketAddress() + " <" + response); EntityLog.log(context, EntityLog.Type.Protocol,
socket.getRemoteSocketAddress() + " <" + response);
if (response.contains("STARTTLS")) if (response.contains("STARTTLS"))
has = true; has = true;
} }
@ -1057,14 +1059,16 @@ public class EmailProvider implements Parcelable {
if (has) { if (has) {
command = "STARTTLS\n"; command = "STARTTLS\n";
EntityLog.log(context, socket.getRemoteSocketAddress() + " >" + command); EntityLog.log(context, EntityLog.Type.Protocol,
socket.getRemoteSocketAddress() + " >" + command);
socket.getOutputStream().write(command.getBytes()); socket.getOutputStream().write(command.getBytes());
} }
} else if (port == 143) { } else if (port == 143) {
do { do {
response = lis.readLine(); response = lis.readLine();
if (response != null) { if (response != null) {
EntityLog.log(context, socket.getRemoteSocketAddress() + " <" + response); EntityLog.log(context, EntityLog.Type.Protocol,
socket.getRemoteSocketAddress() + " <" + response);
if (response.contains("STARTTLS")) if (response.contains("STARTTLS"))
has = true; has = true;
} }
@ -1073,7 +1077,8 @@ public class EmailProvider implements Parcelable {
if (has) { if (has) {
command = "A001 STARTTLS\n"; command = "A001 STARTTLS\n";
EntityLog.log(context, socket.getRemoteSocketAddress() + " >" + command); EntityLog.log(context, EntityLog.Type.Protocol,
socket.getRemoteSocketAddress() + " >" + command);
socket.getOutputStream().write(command.getBytes()); socket.getOutputStream().write(command.getBytes());
} }
} }
@ -1082,7 +1087,8 @@ public class EmailProvider implements Parcelable {
do { do {
response = lis.readLine(); response = lis.readLine();
if (response != null) if (response != null)
EntityLog.log(context, socket.getRemoteSocketAddress() + " <" + response); EntityLog.log(context, EntityLog.Type.Protocol,
socket.getRemoteSocketAddress() + " <" + response);
} while (response != null && } while (response != null &&
!(response.startsWith("A001 OK") || response.startsWith("220 "))); !(response.startsWith("A001 OK") || response.startsWith("220 ")));

3
app/src/main/java/eu/faircode/email/ServiceUI.java
View File

@ -190,7 +190,8 @@ public class ServiceUI extends IntentService {
cleared = db.message().ignoreAll(null, -group); cleared = db.message().ignoreAll(null, -group);
else else
cleared = db.message().ignoreAll(group == 0 ? null : group, null); cleared = db.message().ignoreAll(group == 0 ? null : group, null);
EntityLog.log(this, "Notify clear group=" + group + " cleared=" + cleared); EntityLog.log(this, EntityLog.Type.Notification,
"Notify clear group=" + group + " cleared=" + cleared);
} }
private void cancel(long group, long id) { private void cancel(long group, long id) {