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

.gitignore

@@ -7,3 +7,6 @@
 /publish
 /BeWoPlanerChat/MyTestApplication
 /BeWoPlanerChat/bewoplaner-chat-android/app/*.apk
+/PrototypChat/.vs/PrototypChat/v14
+/PrototypChat/.vs/PrototypChat/v15/sqlite3
+/PrototypChat/.vs/PrototypChat/v15

ChatController/ChatMainControl.xaml.cs

@@ -63,6 +63,8 @@ namespace ChatController
         public delegate void CloseDelegate();
 
         public event CloseDelegate OnClose;
+
+        private bool _isDesktopVersion = true;
         #endregion
 
         public ChatMainControl()
@@ -133,6 +135,7 @@ namespace ChatController
             EmojiButton.Style = null;
             MediaButton.Style = null;
             ReloadGruppen.Visibility = Visibility.Visible;
+            _isDesktopVersion = false;
         }
 
         public void SynchronisationVeranlassen()
@@ -951,10 +954,33 @@ namespace ChatController
                 Cursor = Cursors.Wait;
 
                 //StartWaiting();
+                if (_isDesktopVersion)
+                {
+                    var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer);
 
-                var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer);
+                    if (doSync)
+                    {
+                        var aktuelleGruppen = _chat.GruppenAktuallisieren();
 
-                if (doSync)
+                        var x = _chat.GroupklassenAktuallisieren(aktuelleGruppen);
+
+                        _kontaktlist = x;
+
+                        Clientlist.Items.Refresh();
+
+                        Cursor = Cursors.Arrow;
+                    }
+                    else
+                    {
+                        Cursor = Cursors.Arrow;
+                        // EndWaiting();
+                        if (OnClose != null)
+                        {
+                            OnClose();
+                        }
+                    }
+                }
+                else
                 {
                     var aktuelleGruppen = _chat.GruppenAktuallisieren();
 
@@ -966,15 +992,6 @@ namespace ChatController
 
                     Cursor = Cursors.Arrow;
                 }
-                else
-                {
-                    Cursor = Cursors.Arrow;
-                    // EndWaiting();
-                    if (OnClose != null)
-                    {
-                        OnClose();
-                    }
-                }
             }
             catch (Exception e)
             {

ChatController/HauptKlassen/Chat.cs

@@ -1129,6 +1129,8 @@ namespace ChatController.HauptKlassen
 
                     form.StartPosition = FormStartPosition.CenterScreen;
                     form.Size = imgbit.Size;
+                    form.MinimumSize = new Size(150,150);
+                    form.MaximumSize = new Size(500,500);
                     form.FormBorderStyle = FormBorderStyle.Sizable;
 
                     PictureBox pb = new PictureBox();
@@ -1137,6 +1139,7 @@ namespace ChatController.HauptKlassen
 
                     pb.SizeMode = PictureBoxSizeMode.StretchImage;
 
+                    pb.MaximumSize = new Size(500,500);
 
                     form.Controls.Add(pb);
                     form.ShowDialog();
@@ -1191,6 +1194,8 @@ namespace ChatController.HauptKlassen
 
                     form.StartPosition = FormStartPosition.CenterScreen;
                     form.Size = imgbit.Size;
+                    form.MinimumSize = new Size(150,150);
+                    form.MaximumSize = new Size(500,500);
                     form.FormBorderStyle = FormBorderStyle.Sizable;
 
                     PictureBox pb = new PictureBox();
@@ -1198,7 +1203,7 @@ namespace ChatController.HauptKlassen
                     pb.Image = imgbit;
 
                     pb.SizeMode = PictureBoxSizeMode.StretchImage;
-
+                    //pb.MaximumSize = new Size(500,500);
 
                     form.Controls.Add(pb);
                     form.ShowDialog();
@@ -1213,7 +1218,7 @@ namespace ChatController.HauptKlassen
         #endregion
 
         //Neu 
-        #region Synchronisation Veranlassen
+        #region Synchronisation Veranlassen für Bewoplaner OwnChat Version 
         //sync für alles und jeden
         //public bool DoSync = true;
 
@@ -1265,7 +1270,7 @@ namespace ChatController.HauptKlassen
 
         #endregion
 
-        #region Neue Gruppen Holen
+        #region Neue Gruppen Holen für OwnChatDesktop
         public ChatGruppenDaten GruppenAktuallisieren()
         {
             try

ChatController/LoginControl.xaml.cs

@@ -45,7 +45,7 @@ namespace ChatController
         private string _chatCode = "";
         private string _kundennummer = "";
         private string _authToken = "";
-
+        private string _version = "1.1";
 
         public LoginControl()
         {
@@ -54,8 +54,8 @@ namespace ChatController
             //encrypt verschlüsselte datei
             LeseDateiFallsVorhanden();
 
-            var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-            lblVersion.Content = String.Format("Version: {0}", version);
+            //var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            lblVersion.Content = String.Format("Version: {0}", _version);
         }
 
         private void AnmeldenButton_OnClick(object sender, RoutedEventArgs e)

PrototypChat/LoginMaske.xaml.cs

@@ -30,7 +30,7 @@ namespace ownChat
         {
             InitializeComponent();
 
-            this.Title = "ownChat Desktop Version " + typeof(LoginMaske).Assembly.GetName().Version;
+            this.Title = "ownChat Desktop";
         }
 
 

PrototypChat/PrototypChat.csproj

@@ -28,8 +28,8 @@
     <InstallUrl>https://app5.bewoplaner.de/chat/</InstallUrl>
     <ProductName>ownChat Desktop</ProductName>
     <PublisherName>beyondSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>1.0.0.2</MinimumRequiredVersion>
-    <ApplicationRevision>3</ApplicationRevision>
+    <MinimumRequiredVersion>1.0.0.3</MinimumRequiredVersion>
+    <ApplicationRevision>4</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -67,6 +67,9 @@
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>ownchat_favicon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\libs\Newtonsoft.Json.dll</HintPath>
@@ -166,5 +169,8 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="ownchat_favicon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

PrototypChat/PrototypChat.csproj.user

@@ -2,5 +2,13 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>
+    <PublishUrlHistory>D:\Projects\beyondSoft\Chat\publish\</PublishUrlHistory>
+    <InstallUrlHistory>https://app5.bewoplaner.de/chat/</InstallUrlHistory>
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>de-DE</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
 </Project>