Host: demo.config ist wieder drin.

Android/BewoMitarbeiterApp/app/app.iml

@@ -82,6 +82,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MainActivityMitarbeiter.java

@@ -15,6 +15,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.Toast;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataOutputStream;
@@ -65,6 +66,8 @@ public class MainActivityMitarbeiter extends Activity {
 
         loggedInUserPersonOid = SoapConnectionManager.User.getPersonOid() <= Integer.MAX_VALUE ? SoapConnectionManager.User.getPersonOid().intValue() : 0;
 
+        onlinePersonOids = new ArrayList<>();
+
         StartServerConnection();
     }
 
@@ -106,6 +109,12 @@ public class MainActivityMitarbeiter extends Activity {
         chatbutton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
 
+                if(socket == null || !socket.isConnected()) {
+                    Toast.makeText(getApplicationContext(), "Der Chatserver ist zurzeit nicht erreichbar. \nBitte versuchen Sie es später erneut.", Toast.LENGTH_LONG).show();
+
+                    return;
+                }
+
                 Bundle bundle = new Bundle();
 
                 bundle.putIntegerArrayList("OnlineContacts", onlinePersonOids);
@@ -122,7 +131,7 @@ public class MainActivityMitarbeiter extends Activity {
         logoutbutton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
 
-                if(socket.isConnected()) {
+                if(socket != null && socket.isConnected()) {
                     try {
                         Packet p = new Packet();
 
@@ -160,6 +169,7 @@ public class MainActivityMitarbeiter extends Activity {
 
             } catch (Exception e) {
                 Log.e("Connection: ","Konnte nicht aufgebaut werden. Es wird erneut versucht. Nachricht: " + e.getMessage());
+
                 socket = null;
                 try {
                     new Timer().schedule(new TimerTask() {

Host/Multitenancy/demo.config

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<configuration>
+
+    <configSections>
+        <section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
+    </configSections>
+
+    <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
+        <session-factory>
+            <property name="connection.provider">
+                NHibernate.Connection.DriverConnectionProvider
+            </property>
+            <property name="connection.driver_class">
+                NHibernate.Driver.MySqlDataDriver
+            </property>
+
+            <property name="connection.connection_string">
+                Server=localhost;Password=root;User ID=root;Initial Catalog=bewodemo
+            </property>
+
+            <!--<property name="connection.connection_string">
+				      Server=localhost;Password=root;User ID=root;Initial Catalog=1234567890
+			      </property>-->
+
+            <property name="dialect">
+                NHibernate.Dialect.MySQLDialect
+            </property>
+            <property name="proxyfactory.factory_class">
+                NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle
+            </property>
+            <property name="hbm2ddl.keywords">none</property>
+            <property name="show_sql">true</property>
+            <property name="format_sql">true</property>
+
+            <mapping assembly="BeWo.Data" />
+        </session-factory>
+    </hibernate-configuration>
+
+</configuration>

packages/repositories.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
   <repository path="..\BeWo\packages.config" />
+  <repository path="..\BeWoChatServer\packages.config" />
   <repository path="..\BeWoPlanerAndroid\packages.config" />
   <repository path="..\BeWoPlanerMobil\packages.config" />
   <repository path="..\Host\packages.config" />