From bbfeec1a79f7a294dc097410b26c9d95c6cf5e94 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 3 Jul 2020 10:23:34 +0200 Subject: [PATCH] Allow larger user message size --- .../main/java/eu/faircode/email/FragmentIdentity.java | 10 +--------- app/src/main/java/eu/faircode/email/ServiceSend.java | 8 +++++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 49578d79dd..9ae0137211 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -900,15 +900,7 @@ public class FragmentIdentity extends FragmentBase { identity.sign_key_alias = null; identity.error = null; identity.last_connected = last_connected; - - if (user_max_size == null) - identity.max_size = server_max_size; - else { - if (server_max_size == null) - identity.max_size = user_max_size; - else - identity.max_size = Math.min(user_max_size, server_max_size); - } + identity.max_size = (user_max_size == null ? server_max_size : user_max_size); if (identity.primary) db.identity().resetPrimary(account); diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index e349501aa3..069e8333c1 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -556,9 +556,11 @@ public class ServiceSend extends ServiceBase { throw new IOException("Test"); db.identity().setIdentityState(ident.id, "connected"); - Long max_size = iservice.getMaxSize(); - if (max_size != null) - db.identity().setIdentityMaxSize(ident.id, max_size); + if (ident.max_size == null) { + Long max_size = iservice.getMaxSize(); + if (max_size != null) + db.identity().setIdentityMaxSize(ident.id, max_size); + } Address[] to = imessage.getAllRecipients(); String via = "via " + ident.host + "/" + ident.user +