Not a subject for review

	Reason: Trivial changes

4 files changed, 29 insertions, 52 deletions

diff --git a/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/SyncProxyBase.java b/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/SyncProxyBase.java
index bf8baeca25..1a16fb9876 100644
--- a/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/SyncProxyBase.java
+++ b/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/SyncProxyBase.java
@@ -1085,6 +1085,7 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
     private void cleanProxy() throws SyncException {
         try {
             // ALM Specific Cleanup
+            Logger.d("Start clean SYNC Proxy, isALM:" + mAdvancedLifecycleManagementEnabled);
             if (mAdvancedLifecycleManagementEnabled) {
                 mSyncConnectionState = SyncConnectionState.SYNC_DISCONNECTED;
 
@@ -1120,7 +1121,7 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
 
         mIsProxyDisposed = true;
 
-        Logger.i("SyncProxy start Dispose");
+        Logger.i("SYNC Proxy start Dispose");
 
         try {
             // Clean the proxy
diff --git a/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/rpc/RegisterAppInterface.java b/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/rpc/RegisterAppInterface.java
index 544d911edb..2d97c41abd 100644
--- a/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/rpc/RegisterAppInterface.java
+++ b/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/rpc/RegisterAppInterface.java
@@ -24,15 +24,10 @@ public class RegisterAppInterface extends RPCRequest {
 
     public SyncMsgVersion getSyncMsgVersion() {
         Object obj = parameters.get(Names.syncMsgVersion);
-        Logger.d("TRACE RAI:" + obj);
         if (obj instanceof SyncMsgVersion) {
-            Logger.d("TRACE RAI SyncMsgVersion:" + obj);
             return (SyncMsgVersion) obj;
         } else if (obj instanceof Hashtable) {
-            Logger.d("TRACE RAI Hashtable:" + obj);
             return new SyncMsgVersion((Hashtable) obj);
-        } else if (obj instanceof Vector<?>) {
-            Logger.d("TRACE RAI Vector:" + obj);
         }
         return null;
     }
diff --git a/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/SyncProxyTester.java b/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/SyncProxyTester.java
index 8634ddf38b..d6447616cb 100644
--- a/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/SyncProxyTester.java
+++ b/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/SyncProxyTester.java
@@ -165,9 +165,6 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
     // make it public to access from Fragments
     public ProxyService mBoundProxyService;
 
-    // Probably this is obsolete approch as there is Services Pool inside SDK
-    private ExecutorService mStreamCommandsExecutorService;
-
     public static SyncProxyTester getInstance() {
         return sActivityInstance;
     }
@@ -273,7 +270,6 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
         });
 
         addListeners();
-        mStreamCommandsExecutorService = Executors.newFixedThreadPool(3);
     }
 
     /**
@@ -1401,14 +1397,11 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
     }
 
     public void startMobileNaviService(final String appId) {
-
-        mStreamCommandsExecutorService.submit(new Runnable() {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        executorService.submit(new Runnable() {
             @Override
             public void run() {
-                if (!isProxyReadyForWork(appId)) {
-                    return;
-                }
-                PlaceholderFragment fragment = getFragmentByAppId(appId);
+                final PlaceholderFragment fragment = getFragmentByAppId(appId);
                 if (fragment == null) {
                     Logger.w("Start Mobile Navi service, Fragment NULL");
                     return;
@@ -1450,13 +1443,10 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
     }
 
     public void stopMobileNavService(final String appId) {
-
-        mStreamCommandsExecutorService.submit(new Runnable() {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        executorService.submit(new Runnable() {
             @Override
             public void run() {
-                if (!isProxyReadyForWork(appId)) {
-                    return;
-                }
                 final PlaceholderFragment fragment = getFragmentByAppId(appId);
                 if (fragment == null) {
                     Logger.w("Stop Audio Service, Fragment NULL");
@@ -1467,39 +1457,17 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
                 if (mBoundProxyService == null) {
                     return;
                 }
-                mBoundProxyService.syncProxyStopMobileNaviService(appId);
                 closeMobileNaviOutputStream();
+                mBoundProxyService.syncProxyStopMobileNaviService(appId);
             }
         });
     }
 
-    public boolean isProxyReadyForWork(String appId) {
-        if (mBoundProxyService == null) {
-            return false;
-        }
-        if (!mBoundProxyService.isSyncProxyNotNull()) {
-            onSyncServiceError(appId, "Error. Proxy is null");
-            return false;
-        }
-        if (!mBoundProxyService.isSyncProxyConnected()) {
-            onSyncServiceError(appId, "Error. Proxy is not connected");
-            return false;
-        }
-        if (!mBoundProxyService.isSyncProxyConnectionNotNull()) {
-            onSyncServiceError(appId, "Error. Sync Connection is null");
-            return false;
-        }
-        return true;
-    }
-
     public void startAudioService(final String appId) {
-
-        mStreamCommandsExecutorService.submit(new Runnable() {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        executorService.submit(new Runnable() {
             @Override
             public void run() {
-                if (!isProxyReadyForWork(appId)) {
-                    return;
-                }
                 PlaceholderFragment fragment = getFragmentByAppId(appId);
                 if (fragment == null) {
                     Logger.w("Start Audio Service, Fragment NULL");
@@ -1516,13 +1484,10 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
     }
 
     public void stopAudioService(final String appId) {
-
-        mStreamCommandsExecutorService.submit(new Runnable() {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        executorService.submit(new Runnable() {
             @Override
             public void run() {
-                if (!isProxyReadyForWork(appId)) {
-                    return;
-                }
                 final PlaceholderFragment fragment = getFragmentByAppId(appId);
                 if (fragment == null) {
                     Logger.w("Stop Audio Service, Fragment NULL");
@@ -1533,8 +1498,8 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
                 if (mBoundProxyService == null) {
                     return;
                 }
-                mBoundProxyService.syncProxyStopAudioService(appId);
                 closeAudioOutputStream();
+                mBoundProxyService.syncProxyStopAudioService(appId);
             }
         });
     }
@@ -1673,6 +1638,12 @@ public class SyncProxyTester extends ActionBarActivity implements ActionBar.TabL
 
                 mStopProxyServiceTimeOutHandler.postDelayed(mExitPostDelayedCallback, EXIT_TIMEOUT);
 
+                String[] appIds = mBoundProxyService.getAllAppIds();
+                for (String appId: appIds) {
+                    stopMobileNavService(appId);
+                    stopAudioService(appId);
+                }
+
                 mBoundProxyService.destroyService();
             }
         });
diff --git a/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/service/ProxyService.java b/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/service/ProxyService.java
index c46c99b106..bdd1da4fa7 100644
--- a/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/service/ProxyService.java
+++ b/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/service/ProxyService.java
@@ -362,6 +362,16 @@ public class ProxyService extends Service implements IProxyListenerALMTesting, I
         return mSessionsCounter.contains(appId);
     }
 
+    public String[] getAllAppIds() {
+        String[] result = new String[mSessionsCounter.size()];
+        int counter = 0;
+        for (String appId: mSessionsCounter) {
+            // return a copy of the AppId
+            result[counter] = new String(appId);
+        }
+        return result;
+    }
+
     /**
      * Prepare all necessary parameters to be passed to Sync proxy
      */