-
Notifications
You must be signed in to change notification settings - Fork 119
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Split javascript interface methods into domain objects. #4289
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
...d/android/apk/app/src/main/java/dev/cobalt/coat/android_webview/H5vccPlatformService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package dev.cobalt.coat.android_webview; | ||
|
|
||
| import android.util.Base64; | ||
| import android.webkit.JavascriptInterface; | ||
| import dev.cobalt.coat.StarboardBridge; | ||
|
|
||
| public class H5vccPlatformService implements WebAppInterface { | ||
| StarboardBridge bridge; | ||
|
|
||
| // Instantiate the interface and set the context | ||
| public H5vccPlatformService(StarboardBridge b) { | ||
| bridge = b; | ||
| } | ||
|
|
||
| @Override | ||
| public String getJavaScriptInterfaceName() { | ||
| return "Android_H5vccPlatformService"; | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| public boolean has_platform_service(String servicename) { | ||
| return bridge.hasCobaltService(servicename); | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| public void open_platform_service(long number, String servicename) { | ||
| bridge.openCobaltService(number, servicename); | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| public void close_platform_service(String servicename) { | ||
| bridge.closeCobaltService(servicename); | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| public void platform_service_send(String servicename, String base64Data) { | ||
| byte[] data = Base64.decode(base64Data, Base64.DEFAULT); | ||
| bridge.sendToCobaltService(servicename, data); | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
starboard/android/apk/app/src/main/java/dev/cobalt/coat/android_webview/WebAppInterface.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package dev.cobalt.coat.android_webview; | ||
|
|
||
| public interface WebAppInterface { | ||
|
|
||
| // the name is used by WebView.addJavascriptInterface (Object object, String name) | ||
| public String getJavaScriptInterfaceName(); | ||
| } |
82 changes: 43 additions & 39 deletions
82
starboard/android/apk/app/src/main/java/dev/cobalt/util/SystemPropertiesHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,55 @@ | ||
| // Copyright 2017 The Cobalt Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package dev.cobalt.util; | ||
|
|
||
| import static dev.cobalt.util.Log.TAG; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** Utility class for accessing system properties via reflection. */ | ||
| public class SystemPropertiesHelper { | ||
| private static Method getStringMethod; | ||
|
|
||
| static { | ||
| try { | ||
| getStringMethod = | ||
| ClassLoader.getSystemClassLoader() | ||
| .loadClass("android.os.SystemProperties") | ||
| .getMethod("get", String.class); | ||
| if (getStringMethod == null) { | ||
| Log.e(TAG, "Couldn't load system properties getString"); | ||
| } | ||
| } catch (Exception exception) { | ||
| Log.e(TAG, "Exception looking up system properties methods: ", exception); | ||
| private static Method getStringMethod; | ||
|
|
||
| static { | ||
| try { | ||
| getStringMethod = | ||
| ClassLoader.getSystemClassLoader() | ||
| .loadClass("android.os.SystemProperties") | ||
| .getMethod("get", String.class); | ||
| if (getStringMethod == null) { | ||
| Log.e(TAG, "Couldn't load system properties getString"); | ||
| } | ||
| } catch (Exception exception) { | ||
| Log.e(TAG, "Exception looking up system properties methods: ", exception); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private SystemPropertiesHelper() {} | ||
| private SystemPropertiesHelper() {} | ||
|
|
||
| public static String getString(String property) { | ||
| if (getStringMethod != null) { | ||
| try { | ||
| return (String) getStringMethod.invoke(null, new Object[] {property}); | ||
| } catch (Exception exception) { | ||
| Log.e(TAG, "Exception getting system property: ", exception); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static String getRestrictedSystemProperty(String propName, String defaultValue) { | ||
| try { | ||
| Process process = Runtime.getRuntime().exec("getprop " + propName); | ||
| BufferedReader bufferedReader = | ||
| new BufferedReader(new InputStreamReader(process.getInputStream())); | ||
|
|
||
| return bufferedReader.readLine(); | ||
| } catch (IOException e) { | ||
| return defaultValue; | ||
| } | ||
| } | ||
|
|
||
| public static String getString(String property) { | ||
| if (getStringMethod != null) { | ||
| try { | ||
| return (String) getStringMethod.invoke(null, new Object[] {property}); | ||
| } catch (Exception exception) { | ||
| Log.e(TAG, "Exception getting system property: ", exception); | ||
| } | ||
| public static String getSystemProperty(String propertyName, String defaultValue) { | ||
| return System.getProperty(propertyName, defaultValue); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't delete the copyright please :)