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

Revert "Debug correlation ID" 

This reverts commit e78602db93.
This commit is contained in:
M66B 2021-12-26 10:08:21 +01:00
parent d79b578222
commit 2aa333ee17
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -2908,13 +2908,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void bindExtras(TupleMessageEx message) {
int resid = 0;
if (infra && message.infrastructure != null) {
if ("fairemail".equals(message.infrastructure))
resid = R.mipmap.ic_launcher_round;
else {
String resname = "infra_" + message.infrastructure;
resid = context.getResources()
.getIdentifier(resname, "drawable", context.getPackageName());
}
String resname = "infra_" + message.infrastructure;
resid = context.getResources()
.getIdentifier(resname, "drawable", context.getPackageName());
}
if (resid != 0)
ibInfrastructure.setImageResource(resid);
@ -4974,14 +4970,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
private void onActionShowInfra(TupleMessageEx message) {
int resid;
if ("fairemail".equals(message.infrastructure))
resid = R.string.app_name;
else {
String resname = "infra_" + message.infrastructure;
resid = context.getResources()
.getIdentifier(resname, "string", context.getPackageName());
}
String resname = "infra_" + message.infrastructure;
int resid = context.getResources()
.getIdentifier(resname, "string", context.getPackageName());
String infra = (resid < 0 ? message.infrastructure : context.getString(resid));
ToastEx.makeText(context, infra, Toast.LENGTH_LONG).show();
}

6
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -2024,12 +2024,6 @@ public class MessageHelper {
return "flowmailer";
}
if (BuildConfig.DEBUG) {
String fairemail = imessage.getHeader(HEADER_CORRELATION_ID, null);
if (!TextUtils.isEmpty(fairemail))
return "fairemail";
}
return null;
}

1
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@ -626,7 +626,6 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
message.ui_hide = true;
message.ui_busy = Long.MAX_VALUE; // Needed to keep messages in user folders
message.error = null;
message.infrastructure = "fairemail";
message.id = db.message().insertMessage(message);
File file = EntityMessage.getFile(this, message.id);