diff --git a/Android/BewoMitarbeiterApp/app/app.iml b/Android/BewoMitarbeiterApp/app/app.iml index 842f7dc08..c0810e81b 100644 --- a/Android/BewoMitarbeiterApp/app/app.iml +++ b/Android/BewoMitarbeiterApp/app/app.iml @@ -66,14 +66,6 @@ - - - - - - - - @@ -82,6 +74,14 @@ + + + + + + + + @@ -100,8 +100,6 @@ - - diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java index 70340b044..580db7074 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java @@ -43,6 +43,7 @@ import entities.ChatEntity; import entities.ChatMessage; import entities.ChatPerson; import entities.ImageEntity; +import soapConnection.ApplicationUser; import soapConnection.JsonSoapPrimitiveRequest; import soapConnection.OnRequestSuccessCallback; import soapConnection.Packet; @@ -772,6 +773,16 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi if(callback != null) { callback.doCallback(); } + + // JsonSoapPrimitiveImageRequestListener + ArrayList propertyInfos = new ArrayList<>(); + + propertyInfos.add(SoapConnectionManager.BuildProperty("pPersonOid", SoapConnectionManager.getUser().getPersonOid(), Long.class)); + + JsonSoapPrimitiveRequest request = new JsonSoapPrimitiveRequest(SoapCalls.LOGIN_CALL, propertyInfos); + + BeWoLog.writeToLogFile("Lade Kontakte erneut herunter. (JsonSoapPrimitiveImageRequestListener->onRequestSuccess)"); + spiceManager.execute(request, new KontaktChatActivity.JsonSoapPrimitiveImageRequestListener()); } } @@ -902,6 +913,8 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi if(!result.isEmpty()) { Log.i("IMAGES", "" + result.get(0).Image.length); + } else { + Log.i("IMAGES", "Es wurden keine Bilder geladen."); } // List lc = databaseHandler.getAllContacts(); diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs index e7ff7be9f..19f9610cd 100644 --- a/BeWo/View/ChatView.xaml.cs +++ b/BeWo/View/ChatView.xaml.cs @@ -1973,6 +1973,7 @@ namespace BeWo.View } serverStream.Write(outStream, 0, outStream.Length); + serverStream.Flush(); diff --git a/BeWoChatServer/Server.cs b/BeWoChatServer/Server.cs index 8c9ca529c..7b0694b3f 100644 --- a/BeWoChatServer/Server.cs +++ b/BeWoChatServer/Server.cs @@ -94,7 +94,7 @@ namespace BeWoChatServer } var packet = new Packet(socket, clientName, oid, recipientPersonOid, isEmployee); - + socket.BeginReceive(packet.DataBuffer, 0, packet.DataBuffer.Length, SocketFlags.None, asyncCallback, packet); } catch (Exception e) diff --git a/Shared/Packet.cs b/Shared/Packet.cs index 1a29fa3ac..64ef35ada 100644 --- a/Shared/Packet.cs +++ b/Shared/Packet.cs @@ -26,7 +26,7 @@ namespace BS.Shared public string MessageId { get; set; } public int MediaTyp { get; set; } - public byte[] DataBuffer = new byte[1024]; + public byte[] DataBuffer = new byte[31457280]; // Aufbau Message: // die ersten fünf ";" ignorieren