Merge pull request #519 from smartdevicelink/bugfix/issue_466

Bugfix/issue 466

2 files changed, 449 insertions, 1 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
new file mode 100644
index 000000000..8ed8a6fe7
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
@@ -0,0 +1,448 @@
+package com.smartdevicelink.test.proxy;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import com.smartdevicelink.exception.SdlException;
+import com.smartdevicelink.exception.SdlExceptionCause;
+import com.smartdevicelink.proxy.SdlProxyALM;
+import com.smartdevicelink.proxy.SdlProxyBuilder;
+import com.smartdevicelink.proxy.SdlProxyConfigurationResources;
+import com.smartdevicelink.proxy.callbacks.OnServiceEnded;
+import com.smartdevicelink.proxy.callbacks.OnServiceNACKed;
+import com.smartdevicelink.proxy.interfaces.IProxyListenerALM;
+import com.smartdevicelink.proxy.rpc.AddCommandResponse;
+import com.smartdevicelink.proxy.rpc.AddSubMenuResponse;
+import com.smartdevicelink.proxy.rpc.AlertManeuverResponse;
+import com.smartdevicelink.proxy.rpc.AlertResponse;
+import com.smartdevicelink.proxy.rpc.ChangeRegistrationResponse;
+import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSetResponse;
+import com.smartdevicelink.proxy.rpc.DeleteCommandResponse;
+import com.smartdevicelink.proxy.rpc.DeleteFileResponse;
+import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSetResponse;
+import com.smartdevicelink.proxy.rpc.DeleteSubMenuResponse;
+import com.smartdevicelink.proxy.rpc.DiagnosticMessageResponse;
+import com.smartdevicelink.proxy.rpc.DialNumberResponse;
+import com.smartdevicelink.proxy.rpc.EndAudioPassThruResponse;
+import com.smartdevicelink.proxy.rpc.GenericResponse;
+import com.smartdevicelink.proxy.rpc.GetDTCsResponse;
+import com.smartdevicelink.proxy.rpc.GetVehicleDataResponse;
+import com.smartdevicelink.proxy.rpc.GetWayPointsResponse;
+import com.smartdevicelink.proxy.rpc.ListFilesResponse;
+import com.smartdevicelink.proxy.rpc.OnAudioPassThru;
+import com.smartdevicelink.proxy.rpc.OnButtonEvent;
+import com.smartdevicelink.proxy.rpc.OnButtonPress;
+import com.smartdevicelink.proxy.rpc.OnCommand;
+import com.smartdevicelink.proxy.rpc.OnDriverDistraction;
+import com.smartdevicelink.proxy.rpc.OnHMIStatus;
+import com.smartdevicelink.proxy.rpc.OnHashChange;
+import com.smartdevicelink.proxy.rpc.OnKeyboardInput;
+import com.smartdevicelink.proxy.rpc.OnLanguageChange;
+import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;
+import com.smartdevicelink.proxy.rpc.OnPermissionsChange;
+import com.smartdevicelink.proxy.rpc.OnStreamRPC;
+import com.smartdevicelink.proxy.rpc.OnSystemRequest;
+import com.smartdevicelink.proxy.rpc.OnTBTClientState;
+import com.smartdevicelink.proxy.rpc.OnTouchEvent;
+import com.smartdevicelink.proxy.rpc.OnVehicleData;
+import com.smartdevicelink.proxy.rpc.OnWayPointChange;
+import com.smartdevicelink.proxy.rpc.PerformAudioPassThruResponse;
+import com.smartdevicelink.proxy.rpc.PerformInteractionResponse;
+import com.smartdevicelink.proxy.rpc.PutFileResponse;
+import com.smartdevicelink.proxy.rpc.ReadDIDResponse;
+import com.smartdevicelink.proxy.rpc.ResetGlobalPropertiesResponse;
+import com.smartdevicelink.proxy.rpc.ScrollableMessageResponse;
+import com.smartdevicelink.proxy.rpc.SendLocationResponse;
+import com.smartdevicelink.proxy.rpc.SetAppIconResponse;
+import com.smartdevicelink.proxy.rpc.SetDisplayLayoutResponse;
+import com.smartdevicelink.proxy.rpc.SetGlobalPropertiesResponse;
+import com.smartdevicelink.proxy.rpc.SetMediaClockTimerResponse;
+import com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse;
+import com.smartdevicelink.proxy.rpc.ShowResponse;
+import com.smartdevicelink.proxy.rpc.SliderResponse;
+import com.smartdevicelink.proxy.rpc.SpeakResponse;
+import com.smartdevicelink.proxy.rpc.StreamRPCResponse;
+import com.smartdevicelink.proxy.rpc.SubscribeButtonResponse;
+import com.smartdevicelink.proxy.rpc.SubscribeVehicleDataResponse;
+import com.smartdevicelink.proxy.rpc.SubscribeWayPointsResponse;
+import com.smartdevicelink.proxy.rpc.SystemRequestResponse;
+import com.smartdevicelink.proxy.rpc.UnsubscribeButtonResponse;
+import com.smartdevicelink.proxy.rpc.UnsubscribeVehicleDataResponse;
+import com.smartdevicelink.proxy.rpc.UnsubscribeWayPointsResponse;
+import com.smartdevicelink.proxy.rpc.UpdateTurnListResponse;
+import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
+
+import junit.framework.Assert;
+
+
+public class SdlProxyBaseTests extends AndroidTestCase{
+    public static final String TAG = "SdlProxyBaseTests";
+
+    @Override
+    protected void setUp() throws Exception{
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        //Nothing here for now
+    }
+
+    /**
+     * Test SdlProxyBase for handling null SdlProxyConfigurationResources
+     */
+    public void testNullSdlProxyConfigurationResources() {
+        SdlProxyALM proxy = null;
+        SdlProxyBuilder.Builder builder = new SdlProxyBuilder.Builder(new ProxyListenerTest(), "appId", "appName", true, getContext());
+        SdlProxyConfigurationResources config = new SdlProxyConfigurationResources("path", (TelephonyManager)getContext().getSystemService(Context.TELEPHONY_SERVICE));
+        //Construct with a non-null SdlProxyConfigurationResources
+        builder.setSdlProxyConfigurationResources(config);
+        try {
+            proxy = builder.build();
+        } catch (Exception e) {
+            Log.v(TAG, "Exception in testNullSdlProxyConfigurationResources, testing non null SdlProxyConfigurationResources");
+            if (!(e instanceof SdlException) || !((SdlException) e).getSdlExceptionCause().equals(SdlExceptionCause.BLUETOOTH_ADAPTER_NULL)) {
+                Assert.fail("Exception in testNullSdlProxyConfigurationResources");
+            }
+        }
+
+        //Construct with a null SdlProxyConfigurationResources
+        builder.setSdlProxyConfigurationResources(null);
+        try {
+            proxy = builder.build();
+        } catch (Exception e) {
+            Log.v(TAG, "Exception in testNullSdlProxyConfigurationResources, testing null SdlProxyConfigurationResources");
+            if (!(e instanceof SdlException) || !((SdlException) e).getSdlExceptionCause().equals(SdlExceptionCause.BLUETOOTH_ADAPTER_NULL)) {
+                Assert.fail("Exception in testNullSdlProxyConfigurationResources, testing null SdlProxyConfigurationResources");
+            }
+        }
+
+        //Construct with a non-null SdlProxyConfigurationResources and a null TelephonyManager
+        config.setTelephonyManager(null);
+        builder.setSdlProxyConfigurationResources(config);
+        try {
+            proxy = builder.build();
+        } catch (Exception e) {
+            Log.v(TAG, "Exception in testNullSdlProxyConfigurationResources, testing null TelephonyManager");
+            if (!(e instanceof SdlException) || !((SdlException) e).getSdlExceptionCause().equals(SdlExceptionCause.BLUETOOTH_ADAPTER_NULL)) {
+                Assert.fail("Exception in testNullSdlProxyConfigurationResources, testing null TelephonyManager");
+            }
+        }
+    }
+
+    public class ProxyListenerTest implements IProxyListenerALM {
+
+        @Override
+        public void onProxyClosed(String s, Exception e, SdlDisconnectedReason reason) {
+
+        }
+
+        @Override
+        public void onOnHMIStatus(OnHMIStatus status) {
+
+        }
+
+        @Override
+        public void onListFilesResponse(ListFilesResponse response) {
+        }
+
+        @Override
+        public void onPutFileResponse(PutFileResponse response) {
+        }
+
+        @Override
+        public void onOnLockScreenNotification(OnLockScreenStatus notification) {
+        }
+
+        @Override
+        public void onOnCommand(OnCommand notification){
+        }
+
+        /**
+         *  Callback method that runs when the add command response is received from SDL.
+         */
+        @Override
+        public void onAddCommandResponse(AddCommandResponse response) {
+        }
+
+        @Override
+        public void onOnPermissionsChange(OnPermissionsChange notification) {
+
+        }
+
+        @Override
+        public void onSubscribeVehicleDataResponse(SubscribeVehicleDataResponse response) {
+        }
+
+        @Override
+        public void onOnVehicleData(OnVehicleData notification) {
+        }
+
+        /**
+         * Rest of the SDL callbacks from the head unit
+         */
+
+        @Override
+        public void onAddSubMenuResponse(AddSubMenuResponse response) {
+        }
+
+        @Override
+        public void onCreateInteractionChoiceSetResponse(CreateInteractionChoiceSetResponse response) {
+        }
+
+        @Override
+        public void onAlertResponse(AlertResponse response) {
+        }
+
+        @Override
+        public void onDeleteCommandResponse(DeleteCommandResponse response) {
+        }
+
+        @Override
+        public void onDeleteInteractionChoiceSetResponse(DeleteInteractionChoiceSetResponse response) {
+        }
+
+        @Override
+        public void onDeleteSubMenuResponse(DeleteSubMenuResponse response) {
+        }
+
+        @Override
+        public void onPerformInteractionResponse(PerformInteractionResponse response) {
+        }
+
+        @Override
+        public void onResetGlobalPropertiesResponse(
+                ResetGlobalPropertiesResponse response) {
+        }
+
+        @Override
+        public void onSetGlobalPropertiesResponse(SetGlobalPropertiesResponse response) {
+        }
+
+        @Override
+        public void onSetMediaClockTimerResponse(SetMediaClockTimerResponse response) {
+        }
+
+        @Override
+        public void onShowResponse(ShowResponse response) {
+        }
+
+        @Override
+        public void onSpeakResponse(SpeakResponse response) {
+            Log.i(TAG, "SpeakCommand response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+        }
+
+        @Override
+        public void onOnButtonEvent(OnButtonEvent notification) {
+        }
+
+        @Override
+        public void onOnButtonPress(OnButtonPress notification) {
+        }
+
+        @Override
+        public void onSubscribeButtonResponse(SubscribeButtonResponse response) {
+        }
+
+        @Override
+        public void onUnsubscribeButtonResponse(UnsubscribeButtonResponse response) {
+        }
+
+
+        @Override
+        public void onOnTBTClientState(OnTBTClientState notification) {
+        }
+
+        @Override
+        public void onUnsubscribeVehicleDataResponse(
+                UnsubscribeVehicleDataResponse response) {
+
+        }
+
+        @Override
+        public void onGetVehicleDataResponse(GetVehicleDataResponse response) {
+
+        }
+
+        @Override
+        public void onReadDIDResponse(ReadDIDResponse response) {
+
+        }
+
+        @Override
+        public void onGetDTCsResponse(GetDTCsResponse response) {
+
+        }
+
+
+        @Override
+        public void onPerformAudioPassThruResponse(PerformAudioPassThruResponse response) {
+
+        }
+
+        @Override
+        public void onEndAudioPassThruResponse(EndAudioPassThruResponse response) {
+
+        }
+
+        @Override
+        public void onOnAudioPassThru(OnAudioPassThru notification) {
+
+        }
+
+        @Override
+        public void onDeleteFileResponse(DeleteFileResponse response) {
+
+        }
+
+        @Override
+        public void onSetAppIconResponse(SetAppIconResponse response) {
+
+        }
+
+        @Override
+        public void onScrollableMessageResponse(ScrollableMessageResponse response) {
+
+        }
+
+        @Override
+        public void onChangeRegistrationResponse(ChangeRegistrationResponse response) {
+
+        }
+
+        @Override
+        public void onSetDisplayLayoutResponse(SetDisplayLayoutResponse response) {
+
+        }
+
+        @Override
+        public void onOnLanguageChange(OnLanguageChange notification) {
+
+        }
+
+        @Override
+        public void onSliderResponse(SliderResponse response) {
+
+        }
+
+
+        @Override
+        public void onOnHashChange(OnHashChange notification) {
+
+        }
+
+        @Override
+        public void onOnSystemRequest(OnSystemRequest notification) {
+        }
+
+        @Override
+        public void onSystemRequestResponse(SystemRequestResponse response) {
+
+        }
+
+        @Override
+        public void onOnKeyboardInput(OnKeyboardInput notification) {
+
+        }
+
+        @Override
+        public void onOnTouchEvent(OnTouchEvent notification) {
+
+        }
+
+        @Override
+        public void onDiagnosticMessageResponse(DiagnosticMessageResponse response) {
+
+        }
+
+        @Override
+        public void onOnStreamRPC(OnStreamRPC notification) {
+
+        }
+
+        @Override
+        public void onStreamRPCResponse(StreamRPCResponse response) {
+
+        }
+
+        @Override
+        public void onDialNumberResponse(DialNumberResponse response) {
+
+        }
+
+        @Override
+        public void onSendLocationResponse(SendLocationResponse response) {
+            Log.i(TAG, "SendLocation response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+
+        }
+
+        @Override
+        public void onServiceEnded(OnServiceEnded serviceEnded) {
+
+        }
+
+        @Override
+        public void onServiceNACKed(OnServiceNACKed serviceNACKed) {
+
+        }
+
+        @Override
+        public void onShowConstantTbtResponse(ShowConstantTbtResponse response) {
+            Log.i(TAG, "ShowConstantTbt response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+
+        }
+
+        @Override
+        public void onAlertManeuverResponse(AlertManeuverResponse response) {
+            Log.i(TAG, "AlertManeuver response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+
+        }
+
+        @Override
+        public void onUpdateTurnListResponse(UpdateTurnListResponse response) {
+            Log.i(TAG, "UpdateTurnList response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+
+        }
+
+        @Override
+        public void onServiceDataACK(int dataSize) {
+        }
+
+        @Override
+        public void onGetWayPointsResponse(GetWayPointsResponse response) {
+            Log.i(TAG, "GetWayPoints response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+        }
+
+        @Override
+        public void onSubscribeWayPointsResponse(SubscribeWayPointsResponse response) {
+            Log.i(TAG, "SubscribeWayPoints response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+        }
+
+        @Override
+        public void onUnsubscribeWayPointsResponse(UnsubscribeWayPointsResponse response) {
+            Log.i(TAG, "UnsubscribeWayPoints response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+        }
+
+        @Override
+        public void onOnWayPointChange(OnWayPointChange notification) {
+            Log.i(TAG, "OnWayPointChange notification from SDL: " + notification);
+        }
+
+        @Override
+        public void onOnDriverDistraction(OnDriverDistraction notification) {
+            // Some RPCs (depending on region) cannot be sent when driver distraction is active.
+        }
+
+        @Override
+        public void onError(String info, Exception e) {
+        }
+
+        @Override
+        public void onGenericResponse(GenericResponse response) {
+            Log.i(TAG, "Generic response from SDL: " + response.getResultCode().name() + " Info: " + response.getInfo());
+        }
+    }
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 7678eaaa6..59a44a27b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -565,7 +565,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 			// so we need to fix this, but vulnerability (i.e. two instances of listener) is

 			// likely harmless.

 			if (_traceDeviceInterrogator == null) {

-				_traceDeviceInterrogator = new TraceDeviceInfo(sdlProxyConfigurationResources.getTelephonyManager());

+				_traceDeviceInterrogator = new TraceDeviceInfo(telephonyManager);

 			} // end-if

 			

 		} // end-if