Not a subject for review

	Reason: Trivial changes

5 files changed, 31 insertions, 41 deletions

diff --git a/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/RPCMessageHandler.java b/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/RPCMessageHandler.java
index d824767cbd..f8e9854b7f 100644
--- a/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/RPCMessageHandler.java
+++ b/mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/RPCMessageHandler.java
@@ -100,8 +100,8 @@ public class RPCMessageHandler implements IRPCMessageHandler {
             final RPCResponse response = new RPCResponse(hash);
             final Integer responseCorrelationID = response.getCorrelationId();
 
-            if (!syncProxyBase.handlePartialRPCResponse(sessionId, response, hash) &&
-                    !syncProxyBase.handleLastInternalResponse(response)) {
+            if (!syncProxyBase.handlePartialRPCResponse(sessionId, response, hash)/* &&
+                    !syncProxyBase.handleLastInternalResponse(response)*/) {
 
                 // Check to ensure response is not from an internal message (reserved correlation ID)
                 if (syncProxyBase.isCorrelationIDProtected(responseCorrelationID)) {
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 a17a52e518..d3b069cad3 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
@@ -474,8 +474,10 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
     /**
      * A set of internal requests' correlation IDs that are currently in
      * progress.
+     *
+     * Comment usage of this technique in order to provide possibility to track all responses
      */
-    private final Set<Integer> internalRequestCorrelationIDs = new HashSet<Integer>();
+    //private final Set<Integer> internalRequestCorrelationIDs = new HashSet<Integer>();
 
     /**
      * Correlation ID that was last used for messages created internally.
@@ -1051,7 +1053,7 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
                 mSyncConnection = new SyncConnection(syncSession, mTransportConfig, _interfaceBroker);
             }
 
-            internalRequestCorrelationIDs.clear();
+            //internalRequestCorrelationIDs.clear();
 
             mSyncConnection.init();
 
@@ -1526,14 +1528,7 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
         boolean success = false;
         final Integer responseCorrelationId = response.getCorrelationId();
         final String appId = syncSession.getAppIdBySessionId(sessionId);
-        boolean doProcessResponse = true;
-
-        Logger.d(LOG_TAG + " > " + response.getFunctionName() + " " + response.getCorrelationId());
-
         if (protocolMessageHolder.hasMessages(responseCorrelationId)) {
-
-            Logger.d(LOG_TAG + " >> " + response.getResultCode() + " " + response.getCorrelationId());
-
             if (Result.SUCCESS == response.getResultCode()) {
                 final ProtocolMessage pm = protocolMessageHolder.peekNextMessage(
                         responseCorrelationId);
@@ -1547,8 +1542,6 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
                     if (response.getFunctionName() != null &&
                             response.getFunctionName().equals(Names.PutFile)) {
 
-                        doProcessResponse = false;
-
                         final PutFileResponse putFile = new PutFileResponse(hash);
                         if (_callbackToUIThread) {
                             // Run in UI thread
@@ -1561,6 +1554,18 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
                         } else {
                             mProxyListener.onPutFileResponse(appId, putFile);
                         }
+                    } else {
+                        if (_callbackToUIThread) {
+                            // Run in UI thread
+                            _mainUIHandler.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    mProxyListener.onRPCResponse(appId, response);
+                                }
+                            });
+                        } else {
+                            mProxyListener.onRPCResponse(appId, response);
+                        }
                     }
 
                     queueOutgoingMessage(pm);
@@ -1570,22 +1575,6 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
                 protocolMessageHolder.clearMessages(responseCorrelationId);
             }
         }
-
-        Logger.d(LOG_TAG + " >>> " + doProcessResponse + " " + response.getCorrelationId());
-        if (doProcessResponse) {
-            if (_callbackToUIThread) {
-                // Run in UI thread
-                _mainUIHandler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mProxyListener.onRPCResponse(appId, response);
-                    }
-                });
-            } else {
-                mProxyListener.onRPCResponse(appId, response);
-            }
-        }
-
         return success;
     }
 
@@ -1599,12 +1588,13 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
      * corresponding request is not internal or in case of an error
      */
     protected boolean handleLastInternalResponse(RPCResponse response) {
-        final Integer correlationID = response.getCorrelationId();
+        /*final Integer correlationID = response.getCorrelationId();
         final boolean contains = internalRequestCorrelationIDs.contains(correlationID);
         if (contains) {
             internalRequestCorrelationIDs.remove(correlationID);
         }
-        return contains;
+        Logger.d(LOG_TAG + " LastInternalResponse:" + contains);*/
+        return /*contains*/false;
     }
 
     protected void handleOnSystemRequest(final String appId, Hashtable hash) {
@@ -3292,7 +3282,7 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
             putFile.setLength(data.length);
         }
         sendRPCRequest(appId, putFile);
-        internalRequestCorrelationIDs.add(correlationID);
+        //internalRequestCorrelationIDs.add(correlationID);
     }
 
     @Override
@@ -3314,7 +3304,7 @@ public abstract class SyncProxyBase<ProxyListenerType extends IProxyListenerBase
             sendRPCRequest(appId, systemRequest);
         }
 
-        internalRequestCorrelationIDs.add(correlationId);
+        //internalRequestCorrelationIDs.add(correlationId);
     }
 
     /**
diff --git a/mobile/android/SyncProxyTester/src/main/AndroidManifest.xml b/mobile/android/SyncProxyTester/src/main/AndroidManifest.xml
index ff62de2b56..630e7bed3d 100644
--- a/mobile/android/SyncProxyTester/src/main/AndroidManifest.xml
+++ b/mobile/android/SyncProxyTester/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ford.syncV4.android"
-    android:versionCode="93"
-    android:versionName="2.0.22 (CW27)" >
+    android:versionCode="94"
+    android:versionName="2.0.23 (CW27)" >
 
     <!-- Version 12 is minimum to support the USB Accessory mode -->
     <uses-sdk android:minSdkVersion="12"/>
diff --git a/mobile/android/SyncProxyTester/src/main/assets/CHANGELOG.txt b/mobile/android/SyncProxyTester/src/main/assets/CHANGELOG.txt
index e811a9f797..ea883041ec 100644
--- a/mobile/android/SyncProxyTester/src/main/assets/CHANGELOG.txt
+++ b/mobile/android/SyncProxyTester/src/main/assets/CHANGELOG.txt
@@ -1,4 +1,5 @@
 [CW27]
+* SyncProxyTester: Log two request of UnsubscribeButton on mobile
 * SyncProxyTester: Some RPC responses are not shown in the list view
 * SyncProxyTester: Incorrect representation of the "key - value" pair in the RPC Request at the XML test
 * SyncProxyTester: Crashes while executing cics_UpperBound_big.xml
diff --git a/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/PlaceholderFragment.java b/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/PlaceholderFragment.java
index 9ef071b17b..188553f485 100644
--- a/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/PlaceholderFragment.java
+++ b/mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/PlaceholderFragment.java
@@ -410,7 +410,7 @@ public class PlaceholderFragment extends Fragment {
         int menuSize = menu.size();
         int tabsCount = ((SyncProxyTester) getActivity()).getFragmentsCount();
         int nextMenuItemOrder = menu.getItem(menuSize - 1).getOrder() + 1;
-        menu.add(0, MenuConstants.MENU_PROXY_START, nextMenuItemOrder++, "Proxy Start");
+        //menu.add(0, MenuConstants.MENU_PROXY_START, nextMenuItemOrder++, "Proxy Start");
         menu.add(0, MenuConstants.MENU_TOGGLE_CONSOLE, nextMenuItemOrder++, "Toggle Console");
         menu.add(0, MenuConstants.MENU_CLEAR, nextMenuItemOrder++, "Clear Messages");
         //if (tabsCount == 1) {
@@ -435,7 +435,7 @@ public class PlaceholderFragment extends Fragment {
     public boolean onOptionsItemSelected(MenuItem item) {
 
         switch (item.getItemId()) {
-            case MenuConstants.MENU_PROXY_START:
+            /*case MenuConstants.MENU_PROXY_START:
                 if (AppPreferencesManager.getTransportType() == TransportType.BLUETOOTH) {
                     BluetoothAdapter mBtAdapter = BluetoothAdapter.getDefaultAdapter();
                     if (!mBtAdapter.isEnabled()) {
@@ -462,7 +462,7 @@ public class PlaceholderFragment extends Fragment {
                 executorService.submit(new Runnable() {
                     @Override
                     public void run() {
-                        /*if (mBoundProxyService != null) {
+                        *//*if (mBoundProxyService != null) {
 
                             // We need to set listener to null and then re-init it, unless there will
                             // be another way to check it at 'reset()' method
@@ -477,10 +477,10 @@ public class PlaceholderFragment extends Fragment {
                             // Re-init listener
 
                             mBoundProxyService.setProxyServiceEvent(SyncProxyTester.this);
-                        }*/
+                        }*//*
                     }
                 });
-                return true;
+                return true;*/
             case MenuConstants.MENU_XML_TEST:
                 openXmlFilePathDialog();
                 break;
@@ -1059,7 +1059,6 @@ public class PlaceholderFragment extends Fragment {
                                         UnsubscribeButton msg = new UnsubscribeButton();
                                         msg.setCorrelationId(corrId);
                                         msg.setButtonName(buttonName);
-                                        mLogAdapter.logMessage(msg, true);
                                         sendRPCRequestToProxy(msg);
                                     }
                                     isButtonSubscribed[which] = !isButtonSubscribed[which];