Merge pull request #143 from soygul/contacts

Move sub projects to their own repos
nbusy · Oct 3, 2016 · 98a1b85 · 98a1b85
2 parents 1432360 + 808c15d
commit 98a1b85
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 386 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/nbusy/app/Config.java b/app/src/main/java/com/nbusy/app/Config.java
@@ -58,7 +58,7 @@ private Config(Optional<Env> env, Optional<String> serverUrl) {
                         this.serverUrl = "ws://127.0.0.1:3001"; // local test server
                         break;
                     default:
-                        this.serverUrl = null; // determined by NBusy SDK
+                        this.serverUrl = "wss://nbusy.herokuapp.com";
                         break;
                 }
             }

diff --git a/app/src/main/java/com/nbusy/app/InstanceManager.java b/app/src/main/java/com/nbusy/app/InstanceManager.java
@@ -12,8 +12,9 @@
 import com.nbusy.app.worker.Worker;
 import com.nbusy.app.worker.eventbus.EventBus;
 import com.nbusy.app.worker.eventbus.UIThreadExecutor;
-import com.nbusy.sdk.Client;
-import com.nbusy.sdk.ClientImpl;
+
+import titan.client.Client;
+import titan.client.ClientImpl;
 
 /**
  * Creator and keeper of all the instances.
@@ -85,12 +86,8 @@ public static synchronized Client getClient() {
     }
 
     private static synchronized Client getNewClientInstance() {
-        if (getConfig().serverUrl != null) {
-            // todo: we always have to use async client otherwise we'll get android.os.NetworkOnMainThreadException, which only happens on TLS mode for reasons unknown to me!
-            return new ClientImpl(getConfig().serverUrl, true);
-        } else {
-            return new ClientImpl(true);
-        }
+        // todo: we always have to use async client otherwise we'll get android.os.NetworkOnMainThreadException, which only happens on TLS mode for reasons unknown to me!
+        return new ClientImpl(getConfig().serverUrl, true);
     }
 
     public static synchronized EventBus getEventBus() {

diff --git a/app/src/main/java/com/nbusy/app/worker/ConnManager.java b/app/src/main/java/com/nbusy/app/worker/ConnManager.java
@@ -16,11 +16,11 @@
 import com.nbusy.app.services.ConnManagerService;
 import com.nbusy.app.worker.eventbus.ChatsUpdatedEvent;
 import com.nbusy.app.worker.eventbus.EventBus;
-import com.nbusy.sdk.Client;
 
 import java.util.List;
 import java.util.Set;
 
+import titan.client.Client;
 import titan.client.callbacks.ConnCallbacks;
 import titan.client.callbacks.JWTAuthCallback;
 import titan.client.messages.MsgMessage;

diff --git a/app/src/main/java/com/nbusy/app/worker/GoogleAuthManager.java b/app/src/main/java/com/nbusy/app/worker/GoogleAuthManager.java
@@ -5,10 +5,10 @@
 import android.util.Log;
 
 import com.nbusy.app.data.UserProfile;
-import com.nbusy.sdk.Client;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import titan.client.Client;
 import titan.client.callbacks.ConnCallbacks;
 import titan.client.callbacks.GoogleAuthCallback;
 import titan.client.messages.MsgMessage;

diff --git a/app/src/main/java/com/nbusy/app/worker/Worker.java b/app/src/main/java/com/nbusy/app/worker/Worker.java
@@ -12,12 +12,12 @@
 import com.nbusy.app.data.composite.ChatsAndMessages;
 import com.nbusy.app.worker.eventbus.ChatsUpdatedEvent;
 import com.nbusy.app.worker.eventbus.EventBus;
-import com.nbusy.sdk.Client;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import titan.client.Client;
 import titan.client.callbacks.SendMsgsCallback;
 import titan.client.messages.MsgMessage;
 

diff --git a/app/src/main/java/com/nbusy/capacitor/Container.java b/app/src/main/java/com/nbusy/capacitor/Container.java
diff --git a/app/src/main/java/com/nbusy/capacitor/README.md b/app/src/main/java/com/nbusy/capacitor/README.md
diff --git a/app/src/main/java/com/nbusy/capacitor/Subscriber.java b/app/src/main/java/com/nbusy/capacitor/Subscriber.java
diff --git a/app/src/main/java/com/nbusy/organizer/data/ApiClient.java b/app/src/main/java/com/nbusy/organizer/data/ApiClient.java
diff --git a/app/src/main/java/com/nbusy/organizer/data/DataService.java b/app/src/main/java/com/nbusy/organizer/data/DataService.java
diff --git a/app/src/main/java/com/nbusy/organizer/data/JsonClient.java b/app/src/main/java/com/nbusy/organizer/data/JsonClient.java
diff --git a/app/src/main/java/com/nbusy/organizer/enums/TaskState.java b/app/src/main/java/com/nbusy/organizer/enums/TaskState.java
diff --git a/app/src/main/java/com/nbusy/organizer/enums/TaskType.java b/app/src/main/java/com/nbusy/organizer/enums/TaskType.java
diff --git a/app/src/main/java/com/nbusy/organizer/enums/ThreadMode.java b/app/src/main/java/com/nbusy/organizer/enums/ThreadMode.java
diff --git a/app/src/main/java/com/nbusy/organizer/event/Event.java b/app/src/main/java/com/nbusy/organizer/event/Event.java
diff --git a/app/src/main/java/com/nbusy/organizer/event/EventBus.java b/app/src/main/java/com/nbusy/organizer/event/EventBus.java