From bf42f364b4f77ce1657f473566e52cb9bf780413 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Tue, 12 Dec 2017 17:09:28 -0400 Subject: [PATCH] The shrinked images' sizes are now compared with the limit and not the untouched originals. --- .../bewoplaner-chat-android/app/build.gradle | 4 ++-- .../ownchat/page/chat/ChatPresenter.java | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle index 15290c6..4c261c1 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle @@ -34,8 +34,8 @@ android { applicationId "de.beyondsoft.ownchat" minSdkVersion 19 targetSdkVersion 26 - versionCode 11 - versionName "1.11" + versionCode 12 + versionName "1.12" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java index 336e56b..22bcc39 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java @@ -421,17 +421,17 @@ public class ChatPresenter extends MVPAbstractPresenter implements Cha return; } - if(mUploadMaxSizePreference.get() > 0 && file.length() > mUploadMaxSizePreference.get()) { - getView().showError(R.string.error_file_is_too_large); - return; - } - if(mimeType != null && (mimeType.equals(Constants.MIME_TYPE_JPEG) || mimeType.equals(Constants.MIME_TYPE_PNG)) && (file.length() > (1000L * 1024L))) { FileUtils.clearTmpFilesDir(mContext); file = FileUtils.scaleImageDown(file, mContext); } + if(mUploadMaxSizePreference.get() > 0 && file.length() > mUploadMaxSizePreference.get()) { + getView().showError(R.string.error_file_is_too_large); + return; + } + final File fileToSend = file; String[] split = fileToSend.getAbsolutePath().split("/"); @@ -615,17 +615,17 @@ public class ChatPresenter extends MVPAbstractPresenter implements Cha return; } - if(mUploadMaxSizePreference.get() > 0 && file.length() > mUploadMaxSizePreference.get()) { - getView().showError(R.string.error_file_is_too_large); - return; - } - if(mimeType != null && (mimeType.equals(Constants.MIME_TYPE_JPEG) || mimeType.equals(Constants.MIME_TYPE_PNG)) && (file.length() > (1000L * 1024L))) { FileUtils.clearTmpFilesDir(mContext); file = FileUtils.scaleImageDown(file, mContext); } + if(mUploadMaxSizePreference.get() > 0 && file.length() > mUploadMaxSizePreference.get()) { + getView().showError(R.string.error_file_is_too_large); + return; + } + final File fileToSend = file; // create RequestBody instance from file