This commit is contained in:
Lyndon
2019-04-02 13:43:30 +02:00
parent ec7e92a460
commit ee981e48c2
16 changed files with 369 additions and 455 deletions

View File

@@ -251,14 +251,12 @@ namespace ChatController.HauptKlassen
else
if (DokumentExtension.Contains(Path.GetExtension(ChatMessage.File).ToUpperInvariant()))
{
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn,
timeformated, true,ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn, timeformated, ChatMessage.Smaller_Image, true, ChatMessage.File));
}
else
{
//MP4 und gifs und so unbehandelten dreck
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn,
timeformated, true,ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn, timeformated, ChatMessage.Smaller_Image, true,ChatMessage.File));
}
}
else
@@ -296,22 +294,18 @@ namespace ChatController.HauptKlassen
if (DokumentExtension.Contains(Path.GetExtension(ChatMessage.File).ToUpperInvariant()))
{
//Dokument
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn,
timeformated, false, ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn, timeformated, ChatMessage.Smaller_Image, false, ChatMessage.File));
}
else
{
//ALLERLEI UNBEHANDELTER KRAM
Messages.Add(new ChatMessage(ChatMessage.User_Name,
textn,
timeformated, false, ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn, timeformated, ChatMessage.Smaller_Image, false, ChatMessage.File));
}
}
else
{
//Message
Messages.Add(new ChatMessage(ChatMessage.User_Name, ChatMessage.Text,
timeformated, false));
Messages.Add(new ChatMessage(ChatMessage.User_Name, ChatMessage.Text, timeformated, false));
}
}
}
@@ -465,14 +459,12 @@ namespace ChatController.HauptKlassen
else
if (DokumentExtension.Contains(Path.GetExtension(ChatMessage.File).ToUpperInvariant()))
{
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn,
timeformated, true, ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn, timeformated, ChatMessage.Smaller_Image, true, ChatMessage.File));
}
else
{
// Der Ganze Unbehndelte Kram
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn,
timeformated, true, ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn, timeformated, ChatMessage.Smaller_Image, true, ChatMessage.File));
}
}
else
@@ -510,14 +502,12 @@ namespace ChatController.HauptKlassen
if (DokumentExtension.Contains(Path.GetExtension(ChatMessage.File).ToUpperInvariant()))
{
//Dokument
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn,
timeformated, false, ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name, textn, timeformated, ChatMessage.Smaller_Image, false, ChatMessage.File));
}
else
{
//Der Ganze Unbehandelte Kram MP4 und So
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn,
timeformated, false, ChatMessage.File));
Messages.Add(new ChatMessage(ChatMessage.User_Name,textn, timeformated, ChatMessage.Smaller_Image, false, ChatMessage.File));
}
}
else
@@ -1017,14 +1007,12 @@ namespace ChatController.HauptKlassen
}
else if (DokumentExtension.Contains(Path.GetExtension(file).ToUpperInvariant()))
{
Messages.Add(new ChatMessage(ChatMessage.User_Name, Path.GetFileName(file),
timeformated, true,file));
Messages.Add(new ChatMessage(ChatMessage.User_Name, Path.GetFileName(file), timeformated, ChatMessage.Smaller_Image, true,file));
}
else
{
//MP4 und gifs und so unbehandelten dreck
Messages.Add(new ChatMessage(ChatMessage.User_Name, Path.GetFileName(file),
timeformated, true, file));
Messages.Add(new ChatMessage(ChatMessage.User_Name, Path.GetFileName(file), timeformated, ChatMessage.Smaller_Image, true, file));
}
}
@@ -1056,8 +1044,7 @@ namespace ChatController.HauptKlassen
}
else
{
Messages.Add(new ChatMessage(ChatMessage.User_Name, Path.GetFileName(filename),
timeformated, true, filename));
Messages.Add(new ChatMessage(ChatMessage.User_Name, Path.GetFileName(filename), timeformated, ChatMessage.Smaller_Image, true, filename));
}
}

View File

@@ -126,7 +126,7 @@ namespace ChatController.HauptKlassen
// Display the status.
var statusResponse = ((HttpWebResponse) response).StatusDescription;
string responseFromServer = ReadStream(response);
string responseFromServer = Utilities.Utils.ReadStream(response);
try
{
@@ -334,7 +334,7 @@ namespace ChatController.HauptKlassen
// Display the status.
var statusResponse = ((HttpWebResponse) response).StatusDescription;
string responseFromServer = ReadStream(response);
string responseFromServer = Utilities.Utils.ReadStream(response);
if (!responseFromServer.Equals(""))
{
@@ -357,32 +357,6 @@ namespace ChatController.HauptKlassen
}
private string ReadStream(WebResponse response)
{
try
{
Stream dataStream = response.GetResponseStream();
StreamReader reader = new StreamReader(dataStream);
string responseFromServer = reader.ReadToEnd();
dataStream.Dispose();
reader.Dispose();
dataStream.Close();
reader.Close();
return responseFromServer;
}
catch (Exception e)
{
// MessageBox.Show(e.Message);
return null;
}
}
#region Maximal erlaubte File Größe
public long GetMaiximumAllowedFileUploadSize(string token, string customerid)
@@ -405,7 +379,7 @@ namespace ChatController.HauptKlassen
// Display the status.
var statusResponse = ((HttpWebResponse) response).StatusDescription;
string responseFromServer = ReadStream(response);
string responseFromServer = Utilities.Utils.ReadStream(response);
var definiti = new {file_upload_max_size = ""};