Refactored android project to use the new logging library.

Implemented continuous request timeout on android.

2 files changed, 13 insertions, 17 deletions

diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
index 189c21d3f..aea082d05 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
+++ b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java
@@ -6,9 +6,9 @@ import android.net.wifi.WifiManager;
 import android.os.StrictMode;
 import android.os.SystemClock;
 
-import com.elvishew.xlog.XLog;
 import com.google.protobuf.GeneratedMessageV3;
 import com.twine.tango.core.ContextHelper;
+import com.twine.tango.core.ExtendedObject;
 import com.twine.tango.core.IEventHandler;
 import com.twine.tango.integration.operators.IMachineOperator;
 import com.twine.tango.integration.providers.IMachineIdentityProvider;
@@ -100,7 +100,7 @@ public class ExternalBridgeService extends BasicTransporter implements IExternal
             }
             catch (IOException e)
             {
-                XLog.e(e);
+                logManager.log(e);
             }
             
             SystemClock.sleep(5000);
@@ -180,7 +180,7 @@ public class ExternalBridgeService extends BasicTransporter implements IExternal
             }
             catch (IOException e)
             {
-                XLog.e(e);
+                logManager.log(e);
             }
             
             SystemClock.sleep(100);
@@ -268,13 +268,13 @@ public class ExternalBridgeService extends BasicTransporter implements IExternal
             }
             else
             {
-                XLog.w("Message received from an unauthorized adapter!");
+                logManager.log("Message received from an unauthorized adapter!");
             }
             
         }
         catch (Exception e)
         {
-            XLog.e(e);
+            logManager.log(e);
         }
     }
     
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java
index 53b4c8194..d8423cf22 100644
--- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java
+++ b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/SynchronizationService.java
@@ -2,10 +2,10 @@ package com.twine.tango.integration.services;
 
 import android.os.AsyncTask;
 
-import com.elvishew.xlog.XLog;
 import com.google.protobuf.ByteString;
 import com.snatik.storage.Storage;
 import com.twine.tango.core.ContextHelper;
+import com.twine.tango.core.ExtendedObject;
 import com.twine.tango.dal.TangoDB;
 import com.twine.tango.integration.providers.IMachineIdentityProvider;
 import com.twine.tango.integration.services.IExternalBridgeService.MessageReceivedArgs;
@@ -16,14 +16,10 @@ import com.twine.tango.pmr.integration.DirectSynchronizationRequestOuterClass.Di
 import com.twine.tango.pmr.integration.DirectSynchronizationResponseOuterClass.DirectSynchronizationResponse;
 import com.twine.tango.pmr.integration.OverrideDataBaseRequestOuterClass.OverrideDataBaseRequest;
 import com.twine.tango.pmr.integration.OverrideDataBaseResponseOuterClass.OverrideDataBaseResponse;
-import com.twine.tango.pmr.stubs.CalculateRequestOuterClass.CalculateRequest;
-import com.twine.tango.pmr.stubs.CalculateResponseOuterClass.CalculateResponse;
 import com.twine.tango.pmr.synchronization.SynchronizeDBRequestOuterClass.SynchronizeDBRequest;
 import com.twine.tango.web.WebApiFactory;
 import com.twine.tango.web.ISynchronizationAPI;
 
-import java.io.IOException;
-
 import javax.inject.Inject;
 
 import io.reactivex.Completable;
@@ -32,7 +28,7 @@ import io.reactivex.Completable;
 /**
  * Represents the Tango application local to remote synchronization engine.
  */
-public class SynchronizationService implements ISynchronizationService
+public class SynchronizationService extends ExtendedObject implements ISynchronizationService
 {
     private IMachineIdentityProvider machineIdentityProvider;
     private IExternalBridgeService bridgeService;
@@ -78,12 +74,12 @@ public class SynchronizationService implements ISynchronizationService
                 
                 },(ex) ->
                 {
-                    XLog.e(ex);
+                    logManager.log(ex);
                 });
             
             } catch (Exception e)
             {
-                XLog.e(e);
+                logManager.log(e);
                 //Create response.
                 OverrideDataBaseResponse response = OverrideDataBaseResponse.newBuilder()
                         .setSuccessful(false)
@@ -98,7 +94,7 @@ public class SynchronizationService implements ISynchronizationService
         
                 },(ex) ->
                 {
-                    XLog.e(ex);
+                    logManager.log(ex);
                 });
             }
         });
@@ -129,12 +125,12 @@ public class SynchronizationService implements ISynchronizationService
                 
                 },(ex) ->
                 {
-                    XLog.e(ex);
+                    logManager.log(ex);
                 });
                 
             } catch (Exception e)
             {
-                XLog.e(e);
+                logManager.log(e);
             }
         });
     }
@@ -170,7 +166,7 @@ public class SynchronizationService implements ISynchronizationService
                 
             }, (ex) ->
             {
-                XLog.e(ex);
+                logManager.log(ex);
                 emitter.onError(ex);
             });