summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2016-07-05 16:40:19 -0400
committerJoey Grover <joeygrover@gmail.com>2016-07-05 16:40:19 -0400
commitcf868024122d2d6fa04085b448a38f4376b1287e (patch)
tree488dd516eb7c2330e659bed45096736fd188a73b
parent023e618ef802441e5de71c5723c5a17da798e25c (diff)
downloadsdl_android-feature/update_proxy_builder_multi.tar.gz
Added new constructor to handle multiplexing as default transport.feature/update_proxy_builder_multi
Deprecated previous method but ensured it would still work.
-rw-r--r--sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java24
1 files changed, 22 insertions, 2 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java
index 478b59db6..fd06641c6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java
+++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java
@@ -10,7 +10,10 @@ import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
import com.smartdevicelink.proxy.rpc.enums.Language;
import com.smartdevicelink.transport.BTTransportConfig;
import com.smartdevicelink.transport.BaseTransportConfig;
+import com.smartdevicelink.transport.MultiplexTransportConfig;
+
import android.app.Service;
+import android.content.Context;
public class SdlProxyBuilder
{
@@ -42,6 +45,7 @@ public class SdlProxyBuilder
private String appId;
private String appName;
private Boolean isMediaApp;
+ private Context context;
// Optional parameters - initialized to default values
private Service service = null;
@@ -57,16 +61,32 @@ public class SdlProxyBuilder
private boolean callbackToUIThread = false;
private boolean preRegister = false;
private String sAppResumeHash = null;
- private BaseTransportConfig mTransport = new BTTransportConfig();
+ private BaseTransportConfig mTransport; //Initialized in constructor
+
+ /**
+ * @deprecated Use Builder(IProxyListenerALM, String, String, Boolean, Context) instead
+ */
+ @Deprecated
public Builder(IProxyListenerALM listener, String appId, String appName, Boolean isMediaApp)
{
this.listener = listener;
this.appId = appId;
this.appName = appName;
this.isMediaApp = isMediaApp;
+ this.mTransport = new BTTransportConfig();
}
-
+
+ public Builder(IProxyListenerALM listener, String appId, String appName, Boolean isMediaApp, Context context)
+ {
+ this.listener = listener;
+ this.appId = appId;
+ this.appName = appName;
+ this.isMediaApp = isMediaApp;
+ this.context = context;
+ this.mTransport = new MultiplexTransportConfig(context, appId);
+ }
+
public Builder setService(Service val)
{ service = val; return this; }
public Builder setSdlProxyConfigurationResources(SdlProxyConfigurationResources val)