ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat

Browse Source
This commit is contained in:
Christian
2017-12-18 18:22:21 +01:00
parent 85b1ee34f3 62dc785023
commit 6f2db7e002
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
View File

@@ -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
}

20
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java
View File

@@ -421,17 +421,17 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView> 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<ChatView> 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

4
ChatController/ChatKlassen/ChatMessage.cs
View File

@@ -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;

14
ChatController/HauptKlassen/Chat.cs
View File

@@ -217,7 +217,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;
@@ -238,11 +238,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),
@@ -269,7 +269,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;
@@ -438,7 +438,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;
@@ -483,7 +483,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;