From bf42f364b4f77ce1657f473566e52cb9bf780413 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Tue, 12 Dec 2017 17:09:28 -0400 Subject: [PATCH 1/2] 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 From 62dc7850234d1916da95d9a5ff273b2c1ebb92a0 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Thu, 14 Dec 2017 18:31:48 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Problem=20mit=20ChatMessage=20gehabt=20und?= =?UTF-8?q?=20behoben.=20Hab's=20einmal=20umbenannt=20und=20dann=20zur?= =?UTF-8?q?=C3=BCckbenannt=20in=20ChatMessage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChatController/ChatKlassen/ChatMessage.cs | 4 ---- ChatController/HauptKlassen/Chat.cs | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ChatController/ChatKlassen/ChatMessage.cs b/ChatController/ChatKlassen/ChatMessage.cs index 42e39b0..0f46bc3 100644 --- a/ChatController/ChatKlassen/ChatMessage.cs +++ b/ChatController/ChatKlassen/ChatMessage.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Windows; using System.Windows.Media; diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs index 2c56153..68f630d 100644 --- a/ChatController/HauptKlassen/Chat.cs +++ b/ChatController/HauptKlassen/Chat.cs @@ -216,7 +216,7 @@ namespace ChatController.HauptKlassen { if (ChatMessage.UserId == ChatDaten.Userid.Value) { - //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date); + //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date); var time = DateTime.Parse(ChatMessage.Timestamp.Date); var clientZone = TimeZoneInfo.Local; @@ -237,11 +237,11 @@ namespace ChatController.HauptKlassen { //string textn = ""; - //if (ChatMessage.Text != null) - // textn = ChatMessage.Text; + //if (ChatMessage2.Text != null) + // textn = ChatMessage2.Text; //if (textn.Equals("")) - // textn = ChatMessage.Original_Filename; + // textn = ChatMessage2.Original_Filename; Messages.Add(new ChatMessage(ChatMessage.User_Name, textn, timeformated, true, LadeBildNach(ChatMessage.Smaller_Image), @@ -268,7 +268,7 @@ namespace ChatController.HauptKlassen } else { - //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date); + //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date); var time = DateTime.Parse(ChatMessage.Timestamp.Date); var clientZone = TimeZoneInfo.Local; @@ -440,7 +440,7 @@ namespace ChatController.HauptKlassen { if (ChatMessage.UserId == ChatDaten.Userid.Value) { - //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date); + //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date); var time = DateTime.Parse(ChatMessage.Timestamp.Date); var clientZone = TimeZoneInfo.Local; @@ -485,7 +485,7 @@ namespace ChatController.HauptKlassen } else { - //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date); + //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date); var time = DateTime.Parse(ChatMessage.Timestamp.Date); var clientZone = TimeZoneInfo.Local;