Skip to content

Commit

Permalink
small simplifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@sprehn
sprehn committed Feb 25, 2017
1 parent e8d60f5 commit f368b63
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 68 deletions.
8 changes: 4 additions & 4 deletions src/com/connectsdk/discovery/DiscoveryManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,10 @@ public void registerDefaultDeviceTypes() {
"com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
//devicesList.put("com.connectsdk.service.NetcastTVService",
// "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.DLNAService",
"com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
devicesList.put("com.connectsdk.service.DIALService",
"com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
//devicesList.put("com.connectsdk.service.DLNAService",
// "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
//devicesList.put("com.connectsdk.service.DIALService",
// "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
// devicesList.put("com.connectsdk.service.RokuService",
// "com.connectsdk.discovery.provider.SSDPDiscoveryProvider");
// devicesList.put("com.connectsdk.service.CastService",
Expand Down
20 changes: 10 additions & 10 deletions src/com/connectsdk/service/DIALService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ public CapabilityPriorityLevel getLauncherCapabilityLevel() {
}

@Override
public void launchApp(String appId, AppLaunchListener listener) {
public void launchApp(String appId, ResponseListener<LaunchSession> listener) {
launchApp(appId, null, listener);
}

private void launchApp(String appId, JSONObject params, AppLaunchListener listener) {
private void launchApp(String appId, JSONObject params, ResponseListener<LaunchSession> listener) {
if (appId == null || appId.length() == 0) {
Util.postError(listener, new ServiceCommandError(0, "Must pass a valid appId", null));
return;
Expand All @@ -133,12 +133,12 @@ private void launchApp(String appId, JSONObject params, AppLaunchListener listen
}

@Override
public void launchAppWithInfo(AppInfo appInfo, AppLaunchListener listener) {
public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
launchAppWithInfo(appInfo, null, listener);
}

@Override
public void launchAppWithInfo(final AppInfo appInfo, Object params, final AppLaunchListener listener) {
public void launchAppWithInfo(final AppInfo appInfo, Object params, final ResponseListener<LaunchSession> listener) {
ServiceCommand<ResponseListener<Object>> command =
new ServiceCommand<ResponseListener<Object>>(getCommandProcessor(),
requestURL(appInfo.getName()), params, new ResponseListener<Object>() {
Expand All @@ -163,7 +163,7 @@ public void onSuccess(Object object) {
}

@Override
public void launchBrowser(String url, AppLaunchListener listener) {
public void launchBrowser(String url, ResponseListener<LaunchSession> listener) {
Util.postError(listener, ServiceCommandError.notSupported());
}

Expand Down Expand Up @@ -199,12 +199,12 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchYouTube(String contentId, AppLaunchListener listener) {
public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
launchYouTube(contentId, (float) 0.0, listener);
}

@Override
public void launchYouTube(String contentId, float startTime, AppLaunchListener listener) {
public void launchYouTube(String contentId, float startTime, ResponseListener<LaunchSession> listener) {
String params = null;
AppInfo appInfo = new AppInfo(APP_YOUTUBE);
appInfo.setName(appInfo.getId());
Expand Down Expand Up @@ -236,12 +236,12 @@ public void launchYouTube(String contentId, float startTime, AppLaunchListener l
}

@Override
public void launchHulu(String contentId, AppLaunchListener listener) {
public void launchHulu(String contentId, ResponseListener<LaunchSession> listener) {
Util.postError(listener, ServiceCommandError.notSupported());
}

@Override
public void launchNetflix(final String contentId, AppLaunchListener listener) {
public void launchNetflix(final String contentId, ResponseListener<LaunchSession> listener) {
JSONObject params = null;

if (contentId != null && contentId.length() > 0) {
Expand All @@ -261,7 +261,7 @@ public void launchNetflix(final String contentId, AppLaunchListener listener) {
}

@Override
public void launchAppStore(String appId, AppLaunchListener listener) {
public void launchAppStore(String appId, ResponseListener<LaunchSession> listener) {
Util.postError(listener, ServiceCommandError.notSupported());
}

Expand Down
24 changes: 12 additions & 12 deletions src/com/connectsdk/service/NetcastTVService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchApp(final String appId, final AppLaunchListener listener) {
public void launchApp(final String appId, final ResponseListener<LaunchSession> listener) {
getAppInfoForId(appId, new AppInfoListener() {

@Override
Expand Down Expand Up @@ -525,7 +525,7 @@ public void onSuccess(List<AppInfo> object) {
});
}

private void launchApplication(final String appName, final String auid, final String contentId, final Launcher.AppLaunchListener listener) {
private void launchApplication(final String appName, final String auid, final String contentId, final ResponseListener<LaunchSession> listener) {
JSONObject jsonObj = new JSONObject();

try {
Expand Down Expand Up @@ -572,12 +572,12 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchAppWithInfo(AppInfo appInfo, Launcher.AppLaunchListener listener) {
public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
launchAppWithInfo(appInfo, null, listener);
}

@Override
public void launchAppWithInfo(AppInfo appInfo, Object params, Launcher.AppLaunchListener listener) {
public void launchAppWithInfo(AppInfo appInfo, Object params, ResponseListener<LaunchSession> listener) {
String appName = HttpMessage.encode(appInfo.getName());
String appId = appInfo.getId();
String contentId = null;
Expand All @@ -597,7 +597,7 @@ public void launchAppWithInfo(AppInfo appInfo, Object params, Launcher.AppLaunch
}

@Override
public void launchBrowser(String url, final Launcher.AppLaunchListener listener) {
public void launchBrowser(String url, final ResponseListener<LaunchSession> listener) {
if (!(url == null || url.length() == 0))
Log.w(Util.T, "Netcast TV does not support deeplink for Browser");

Expand All @@ -619,12 +619,12 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchYouTube(String contentId, Launcher.AppLaunchListener listener) {
public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
launchYouTube(contentId, (float)0.0, listener);
}

@Override
public void launchYouTube(final String contentId, float startTime, final AppLaunchListener listener) {
public void launchYouTube(final String contentId, float startTime, final ResponseListener<LaunchSession> listener) {
if (getDIALService() != null) {
getDIALService().getLauncher().launchYouTube(contentId, startTime, listener);
return;
Expand All @@ -650,7 +650,7 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchHulu(final String contentId, final Launcher.AppLaunchListener listener) {
public void launchHulu(final String contentId, final ResponseListener<LaunchSession> listener) {
final String appName = "Hulu";

getApplication(appName, new AppInfoListener() {
Expand All @@ -668,7 +668,7 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchNetflix(final String contentId, final Launcher.AppLaunchListener listener) {
public void launchNetflix(final String contentId, final ResponseListener<LaunchSession> listener) {
if (!serviceDescription.getModelNumber().equals("4.0")) {
launchApp("Netflix", listener);
return;
Expand Down Expand Up @@ -734,7 +734,7 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchAppStore(final String appId, final AppLaunchListener listener) {
public void launchAppStore(final String appId, final ResponseListener<LaunchSession> listener) {
if (!serviceDescription.getModelNumber().equals("4.0")) {
launchApp("LG Smart World", listener); // TODO: this will not work in Korea, use Korean name instead
return;
Expand Down Expand Up @@ -1392,15 +1392,15 @@ public CapabilityPriorityLevel getExternalInputControlPriorityLevel() {
}

@Override
public void launchInputPicker(final AppLaunchListener listener) {
public void launchInputPicker(final ResponseListener<LaunchSession> listener) {
final String appName = "Input List";
final String encodedStr = HttpMessage.encode(appName);

getApplication(encodedStr, new AppInfoListener() {

@Override
public void onSuccess(final AppInfo appInfo) {
Launcher.AppLaunchListener launchListener = new Launcher.AppLaunchListener() {
ResponseListener<LaunchSession> launchListener = new ResponseListener<LaunchSession>() {

@Override
public void onSuccess(LaunchSession session) {
Expand Down
22 changes: 9 additions & 13 deletions src/com/connectsdk/service/RokuService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void close(ResponseListener<Object> responseListener) {
}

@Override
public void launchApp(String appId, AppLaunchListener listener) {
public void launchApp(String appId, ResponseListener<LaunchSession> listener) {
if (appId == null) {
Util.postError(listener, new ServiceCommandError(0,
"Must supply a valid app id", null));
Expand All @@ -159,14 +159,13 @@ public void launchApp(String appId, AppLaunchListener listener) {
}

@Override
public void launchAppWithInfo(AppInfo appInfo,
Launcher.AppLaunchListener listener) {
public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
launchAppWithInfo(appInfo, null, listener);
}

@Override
public void launchAppWithInfo(final AppInfo appInfo, Object params,
final Launcher.AppLaunchListener listener) {
final ResponseListener<LaunchSession> listener) {
if (appInfo == null || appInfo.getId() == null) {
Util.postError(listener, new ServiceCommandError(-1,
"Cannot launch app without valid AppInfo object",
Expand Down Expand Up @@ -324,19 +323,17 @@ public ServiceSubscription<AppStateListener> subscribeAppState(
}

@Override
public void launchBrowser(String url, Launcher.AppLaunchListener listener) {
public void launchBrowser(String url, ResponseListener<LaunchSession> listener) {
Util.postError(listener, ServiceCommandError.notSupported());
}

@Override
public void launchYouTube(String contentId,
Launcher.AppLaunchListener listener) {
public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
launchYouTube(contentId, (float) 0.0, listener);
}

@Override
public void launchYouTube(String contentId, float startTime,
AppLaunchListener listener) {
public void launchYouTube(String contentId, float startTime, ResponseListener<LaunchSession> listener) {
if (getDIALService() != null) {
getDIALService().getLauncher().launchYouTube(contentId, startTime,
listener);
Expand All @@ -349,8 +346,7 @@ public void launchYouTube(String contentId, float startTime,
}

@Override
public void launchNetflix(final String contentId,
final Launcher.AppLaunchListener listener) {
public void launchNetflix(final String contentId, final ResponseListener<LaunchSession> listener) {
getAppList(new AppListListener() {

@Override
Expand Down Expand Up @@ -381,7 +377,7 @@ public void onError(ServiceCommandError error) {

@Override
public void launchHulu(final String contentId,
final Launcher.AppLaunchListener listener) {
final ResponseListener<LaunchSession> listener) {
getAppList(new AppListListener() {

@Override
Expand All @@ -408,7 +404,7 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchAppStore(final String appId, AppLaunchListener listener) {
public void launchAppStore(final String appId, ResponseListener<LaunchSession> listener) {
AppInfo appInfo = new AppInfo("11");
appInfo.setName("Channel Store");

Expand Down
22 changes: 11 additions & 11 deletions src/com/connectsdk/service/WebOSTVService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,20 +408,20 @@ public CapabilityPriorityLevel getLauncherCapabilityLevel() {
}

@Override
public void launchApp(String appId, AppLaunchListener listener) {
public void launchApp(String appId, ResponseListener<LaunchSession> listener) {
AppInfo appInfo = new AppInfo();
appInfo.setId(appId);

launchAppWithInfo(appInfo, listener);
}

@Override
public void launchAppWithInfo(AppInfo appInfo, Launcher.AppLaunchListener listener) {
public void launchAppWithInfo(AppInfo appInfo, ResponseListener<LaunchSession> listener) {
launchAppWithInfo(appInfo, null, listener);
}

@Override
public void launchAppWithInfo(final AppInfo appInfo, Object params, final Launcher.AppLaunchListener listener) {
public void launchAppWithInfo(final AppInfo appInfo, Object params, final ResponseListener<LaunchSession> listener) {
String uri = "ssap://system.launcher/launch";
JSONObject payload = new JSONObject();

Expand Down Expand Up @@ -478,7 +478,7 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchBrowser(String url, final Launcher.AppLaunchListener listener) {
public void launchBrowser(String url, final ResponseListener<LaunchSession> listener) {
String uri = "ssap://system.launcher/open";
JSONObject payload = new JSONObject();

Expand Down Expand Up @@ -516,12 +516,12 @@ public void onError(ServiceCommandError error) {
}

@Override
public void launchYouTube(String contentId, Launcher.AppLaunchListener listener) {
public void launchYouTube(String contentId, ResponseListener<LaunchSession> listener) {
launchYouTube(contentId, (float) 0.0, listener);
}

@Override
public void launchYouTube(final String contentId, float startTime, final AppLaunchListener listener) {
public void launchYouTube(final String contentId, float startTime, final ResponseListener<LaunchSession> listener) {
JSONObject params = new JSONObject();

if (contentId != null && contentId.length() > 0) {
Expand Down Expand Up @@ -549,7 +549,7 @@ public void launchYouTube(final String contentId, float startTime, final AppLaun
}

@Override
public void launchHulu(String contentId, Launcher.AppLaunchListener listener) {
public void launchHulu(String contentId, ResponseListener<LaunchSession> listener) {
JSONObject params = new JSONObject();

try {
Expand All @@ -569,7 +569,7 @@ public void launchHulu(String contentId, Launcher.AppLaunchListener listener) {
}

@Override
public void launchNetflix(String contentId, Launcher.AppLaunchListener listener) {
public void launchNetflix(String contentId, ResponseListener<LaunchSession> listener) {
JSONObject params = new JSONObject();
String netflixContentId = "m=http%3A%2F%2Fapi.netflix.com%2Fcatalog%2Ftitles%2Fmovies%2F" + contentId
+ "&source_type=4";
Expand All @@ -591,7 +591,7 @@ public void launchNetflix(String contentId, Launcher.AppLaunchListener listener)
}

@Override
public void launchAppStore(String appId, AppLaunchListener listener) {
public void launchAppStore(String appId, ResponseListener<LaunchSession> listener) {
AppInfo appInfo = new AppInfo("com.webos.app.discovery");
appInfo.setName("LG Store");

Expand Down Expand Up @@ -1801,15 +1801,15 @@ public CapabilityPriorityLevel getExternalInputControlPriorityLevel() {
}

@Override
public void launchInputPicker(final AppLaunchListener listener) {
public void launchInputPicker(final ResponseListener<LaunchSession> listener) {
final AppInfo appInfo = new AppInfo() {
{
setId("com.webos.app.inputpicker");
setName("InputPicker");
}
};

launchAppWithInfo(appInfo, null, new AppLaunchListener() {
launchAppWithInfo(appInfo, null, new ResponseListener<LaunchSession>() {
@Override
public void onSuccess(LaunchSession object) {
listener.onSuccess(object);
Expand Down
3 changes: 1 addition & 2 deletions src/com/connectsdk/service/capability/ExternalInputControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.List;

import com.connectsdk.core.ExternalInputInfo;
import com.connectsdk.service.capability.Launcher.AppLaunchListener;
import com.connectsdk.service.capability.listeners.ResponseListener;
import com.connectsdk.service.sessions.LaunchSession;

Expand All @@ -49,7 +48,7 @@ public interface ExternalInputControl extends CapabilityMethods {
public ExternalInputControl getExternalInput();
public CapabilityPriorityLevel getExternalInputControlPriorityLevel();

public void launchInputPicker(AppLaunchListener listener);
public void launchInputPicker(ResponseListener<LaunchSession> listener);
public void closeInputPicker(LaunchSession launchSessionm, ResponseListener<Object> listener);

public void getExternalInputList(ExternalInputListListener listener);
Expand Down
Loading

0 comments on commit f368b63

Please sign in to comment.