From 1c864c9e945e87e5e92d083af16255abb2e7ad6e Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 2 Jul 2020 08:36:12 +0200 Subject: [PATCH] Long size --- app/src/main/java/eu/faircode/email/DaoIdentity.java | 2 +- app/src/main/java/eu/faircode/email/EmailService.java | 8 +++----- app/src/main/java/eu/faircode/email/EntityIdentity.java | 2 +- app/src/main/java/eu/faircode/email/FragmentIdentity.java | 2 +- app/src/main/java/eu/faircode/email/ServiceSend.java | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java index 906904f664..767bcc03b7 100644 --- a/app/src/main/java/eu/faircode/email/DaoIdentity.java +++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java @@ -113,7 +113,7 @@ public interface DaoIdentity { int setIdentitySignKeyAlias(long id, String alias); @Query("UPDATE identity SET max_size = :max_size WHERE id = :id") - int setIdentityMaxSize(long id, Integer max_size); + int setIdentityMaxSize(long id, Long max_size); @Query("UPDATE identity SET error = :error WHERE id = :id") int setIdentityError(long id, String error); diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index cb5ed4df82..5774a5eef5 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -634,12 +634,10 @@ public class EmailService implements AutoCloseable { return (SMTPTransport) iservice; } - Integer getMaxSize() { - SMTPTransport transport = getTransport(); - - String size = transport.getExtensionParameter("SIZE"); + Long getMaxSize() { + String size = getTransport().getExtensionParameter("SIZE"); if (!TextUtils.isEmpty(size) && TextUtils.isDigitsOnly(size)) - return Integer.parseInt(size); + return Long.parseLong(size); return null; diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java index d8be40d0e3..704695a21f 100644 --- a/app/src/main/java/eu/faircode/email/EntityIdentity.java +++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java @@ -116,7 +116,7 @@ public class EntityIdentity { public String state; public String error; public Long last_connected; - public Integer max_size; + public Long max_size; String getProtocol() { return (starttls ? "smtp" : "smtps"); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 96716446b7..7ca916aa64 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -826,7 +826,7 @@ public class FragmentIdentity extends FragmentBase { last_connected = identity.last_connected; // Check SMTP server - Integer max_size = null; + Long max_size = null; if (check) { // Create transport String protocol = (starttls ? "smtp" : "smtps"); diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index 7704cfe63f..0099996e37 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -555,7 +555,7 @@ public class ServiceSend extends ServiceBase { throw new IOException("Test"); db.identity().setIdentityState(ident.id, "connected"); - Integer max_size = iservice.getMaxSize(); + Long max_size = iservice.getMaxSize(); if (max_size != null) db.identity().setIdentityMaxSize(ident.id, max_size);