diff options
| author | Markos Rapitis <mrapitis@ford.com> | 2016-03-04 11:39:31 -0500 |
|---|---|---|
| committer | Markos Rapitis <mrapitis@ford.com> | 2016-03-04 11:39:31 -0500 |
| commit | 15fe8eb34f823c5bbec4b1a1d923a09e2e576d2e (patch) | |
| tree | bda43954c0dbdebd8a14fdcb5e3658289290f254 | |
| parent | cfe5e4393a2a8a2117fb5c3b986b0252e4b61d4c (diff) | |
| download | sdl_android-15fe8eb34f823c5bbec4b1a1d923a09e2e576d2e.tar.gz | |
Updated builder pattern to include SdlSecurity.
3 files changed, 22 insertions, 2 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java b/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java index af9e59dfa..39f22d8ec 100644 --- a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java +++ b/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java @@ -299,7 +299,11 @@ public class SdlSession implements ISdlConnectionListener, IHeartbeatMonitorList public void sendStreamPacket(ProtocolMessage pm) {
sendMessage(pm);
}
-
+
+ public void setSdlSecurity(SdlSecurityBase sec) {
+ sdlSecurity = sec;
+ }
+
public SdlSecurityBase getSdlSecurity() {
return sdlSecurity;
}
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java index a4f4b7d4b..15b61c1e4 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java @@ -5292,6 +5292,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> return sdlSession.getCurrentTransportType();
}
+ public void setSdlSecurity(SdlSecurityBase sec) {
+ if (sdlSession != null)
+ {
+ sdlSession.setSdlSecurity(sec);
+ }
+ }
+
+
public boolean isServiceTypeProtected(SessionType sType)
{
if (sdlSession == null)
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java index 478b59db6..93affb20b 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java @@ -8,6 +8,7 @@ import com.smartdevicelink.proxy.rpc.SdlMsgVersion; import com.smartdevicelink.proxy.rpc.TTSChunk; import com.smartdevicelink.proxy.rpc.enums.AppHMIType; import com.smartdevicelink.proxy.rpc.enums.Language; +import com.smartdevicelink.security.SdlSecurityBase; import com.smartdevicelink.transport.BTTransportConfig; import com.smartdevicelink.transport.BaseTransportConfig; import android.app.Service; @@ -34,6 +35,7 @@ public class SdlProxyBuilder private boolean preRegister; private String sAppResumeHash; private BaseTransportConfig mTransport; + private SdlSecurityBase sdlSecurity; public static class Builder { @@ -58,6 +60,7 @@ public class SdlProxyBuilder private boolean preRegister = false; private String sAppResumeHash = null; private BaseTransportConfig mTransport = new BTTransportConfig(); + private SdlSecurityBase sdlSecurity = null; public Builder(IProxyListenerALM listener, String appId, String appName, Boolean isMediaApp) { @@ -95,11 +98,15 @@ public class SdlProxyBuilder { sAppResumeHash = val; return this; } public Builder setTransportType(BaseTransportConfig val) { mTransport = val; return this; } + public Builder setSdlSecurity(SdlSecurityBase val) + { sdlSecurity = val; return this; } public SdlProxyALM build() throws SdlException { SdlProxyBuilder obj = new SdlProxyBuilder(this); - return new SdlProxyALM(obj.service,obj.listener,obj.sdlProxyConfigurationResources,obj.appName,obj.ttsChunks,obj.sShortAppName,obj.vrSynonyms,obj.isMediaApp,obj.sdlMessageVersion,obj.lang,obj.hmiLang,obj.vrAppHMITypes,obj.appId,obj.autoActivateID,obj.callbackToUIThread,obj.preRegister,obj.sAppResumeHash,obj.mTransport); + SdlProxyALM proxy = new SdlProxyALM(obj.service,obj.listener,obj.sdlProxyConfigurationResources,obj.appName,obj.ttsChunks,obj.sShortAppName,obj.vrSynonyms,obj.isMediaApp,obj.sdlMessageVersion,obj.lang,obj.hmiLang,obj.vrAppHMITypes,obj.appId,obj.autoActivateID,obj.callbackToUIThread,obj.preRegister,obj.sAppResumeHash,obj.mTransport); + proxy.setSdlSecurity(obj.sdlSecurity); + return proxy; } } @@ -124,6 +131,7 @@ public class SdlProxyBuilder preRegister = builder.preRegister; sAppResumeHash = builder.sAppResumeHash; mTransport = builder.mTransport; + sdlSecurity= builder.sdlSecurity; } } |