MERGE

7 files changed, 27 insertions, 48 deletions

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index 3aa149370..0ca125d7f 100644
--- a/Software/Android_Studio/ColorCapture/app/build.gradle
+++ b/Software/Android_Studio/ColorCapture/app/build.gradle
@@ -31,7 +31,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
-            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://twinetcc.azurewebsites.net/api/\""
+            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://tcc.twine-srv.com/api/\""
             buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\""
         }
 
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingActivityVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingActivityVM.java
index 5f2a0e8ac..f2bbd6413 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingActivityVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingActivityVM.java
@@ -60,7 +60,7 @@ public class LoadingActivityVM extends ViewModelBase<ILoadingActivity>
             new Task.TaskBuilder().setAction(() ->
             {
                 tccService.getDefinition();
-                ThreadingUtils.sleep(3000);
+                ThreadingUtils.sleep(1000);
             }).setContinueWith(() ->
             {
                 initialized = true;
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java
index e328a4b77..ffeda3f84 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/register/RegisterFragmentVM.java
@@ -56,7 +56,7 @@ public class RegisterFragmentVM extends ViewModelBase<IResultFragment>
 
             try
             {
-                ThreadingUtils.sleep(5000);
+                ThreadingUtils.sleep(2000);
 
                 MachineRegistrationResponse response = tccService.register(serialNumber.get());
 
@@ -68,8 +68,6 @@ public class RegisterFragmentVM extends ViewModelBase<IResultFragment>
 
                     notificationProvider.showSuccess("Registering your system", "Your device has been successfully\nregistered.", (e) ->
                     {
-                        tccService.setRegistered(true);
-                        tccService.setOrganizationMachines(response.getOrganizationMachines());
                         navigationProvider.navigateBack();
                     });
                 }
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/result/ResultFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/result/ResultFragmentVM.java
index a4b1bd2e7..490c9e2b9 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/result/ResultFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/result/ResultFragmentVM.java
@@ -132,7 +132,6 @@ public class ResultFragmentVM extends ViewModelBase<IResultFragment> implements
         try
         {
             isMachineRegistred.set(tccService.getDefinition().isRegistered());
-            boolean a = isMachineRegistred.get();
         }
         catch (Exception e)
         {
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java
index a51d0eb71..9c6d7003e 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java
@@ -53,23 +53,37 @@ public class SendToMachineFragmentVM extends ViewModelBase<ISendToMachineFragmen
 
     private void onMachineDisconnected(Object o, ExternalBridgeMachine machine)
     {
-        if (stream(tccService.getOrganizationMachines()).any(x -> x.equals(machine.getSerialNumber())))
+        try
         {
-            invokeUI(() ->
+            if (stream(tccService.getDefinition().getOrganizationMachines()).any(x -> x.equals(machine.getSerialNumber())))
             {
-                machines.remove(machine);
-            });
+                invokeUI(() ->
+                {
+                    machines.remove(machine);
+                });
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
         }
     }
 
     private void onMachineDiscovered(Object o, ExternalBridgeMachine machine)
     {
-        if (stream(tccService.getOrganizationMachines()).any(x -> x.equals(machine.getSerialNumber())))
+        try
         {
-            invokeUI(() ->
+            if (stream(tccService.getDefinition().getOrganizationMachines()).any(x -> x.equals(machine.getSerialNumber())))
             {
-                machines.add(0, machine);
-            });
+                invokeUI(() ->
+                {
+                    machines.add(0, machine);
+                });
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
         }
     }
 
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/ITCCService.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/ITCCService.java
index 8e39fff8e..9cca30b73 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/ITCCService.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/ITCCService.java
@@ -21,12 +21,4 @@ public interface ITCCService
     MachineRegistrationResponse register(String serialNumber) throws Exception;
 
     ResultByEmailResponse sendResultByEmail(ResultByEmailRequest request) throws  Exception;
-
-    boolean isRegistered();
-
-    List<String> getOrganizationMachines();
-
-    void setRegistered(boolean registered);
-
-    void setOrganizationMachines(List<String> organizationMachines);
 }
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/TCCService.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/TCCService.java
index b56eead39..59fa6f3b5 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/TCCService.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/web/TCCService.java
@@ -38,8 +38,6 @@ public class TCCService implements ITCCService
     private IWebServiceAPI webAPI;
     private LoginResponse loginResponse;
     private static final String DEVICE_ID_PREF_NAME = "DeviceIdFile";
-    private boolean isRegistered;
-    private List<String> organizationMachines;
 
     @Inject
     public TCCService(IWebServiceAPI webServiceAPI)
@@ -61,8 +59,6 @@ public class TCCService implements ITCCService
             if (response.isSuccessful())
             {
                 definition = response.body();
-                isRegistered = definition.isRegistered();
-                organizationMachines = definition.getOrganizationMachines();
 
                 LogManager.log("Definition retrieved.", definition);
             }
@@ -122,8 +118,8 @@ public class TCCService implements ITCCService
 
             LogManager.log("Machine registration successful.", r);
 
-            isRegistered = true;
-            organizationMachines = r.getOrganizationMachines();
+            definition.setRegistered(true);
+            definition.setOrganizationMachines(r.getOrganizationMachines());
             return r;
         }
         else
@@ -209,24 +205,4 @@ public class TCCService implements ITCCService
             throw LogManager.log(new Exception(response.message()), "LogIn request failed.");
         }
     }
-
-    public boolean isRegistered()
-    {
-        return isRegistered;
-    }
-
-    public List<String> getOrganizationMachines()
-    {
-        return organizationMachines;
-    }
-
-    public void setRegistered(boolean registered)
-    {
-        isRegistered = registered;
-    }
-
-    public void setOrganizationMachines(List<String> organizationMachines)
-    {
-        this.organizationMachines = organizationMachines;
-    }
 }