bare-ndk 0.1.1 → 0.1.2

package/binding.cc

@@ -24,6 +24,7 @@ bare_ndk_exports(js_env_t *env, js_value_t *exports) {
 
   V("webViewInit", bare_ndk_web_view_init)
   V("webViewDebuggingEnabled", bare_ndk_web_view_debugging_enabled)
+  V("webViewJavaScriptEnabled", bare_ndk_web_view_javascript_enabled)
   V("webViewLoadURL", bare_ndk_web_view_load_url)
   V("webViewLoadData", bare_ndk_web_view_load_data)
 #undef V

package/lib/activity.h

@@ -15,8 +15,6 @@ extern ANativeActivity *bare_native_activity;
 struct bare_ndk_activity_t {
   java_global_ref_t<java_object_t<"android/app/Activity">> handle;
 
-  java_global_ref_t<java_class_t<"android/app/Activity">> init;
-
   java_env_t java;
 };
 
@@ -28,8 +26,6 @@ bare_ndk_activity_init(js_env_t *env, js_callback_info_t *info) {
 
   activity->java = bare_native_activity->env;
 
-  activity->init = java_class_t<"android/app/Activity">(activity->java);
-
   activity->handle = java_object_t<"android/app/Activity">(activity->java, bare_native_activity->clazz);
 
   js_external_t<bare_ndk_activity_t> handle;
@@ -59,7 +55,7 @@ bare_ndk_activity_content_view(js_env_t *env, js_callback_info_t *info) {
   err = js_get_value(env, js_external_t<bare_ndk_view_t>(argv[1]), view);
   assert(err == 0);
 
-  auto set_content_view = activity->init.get_method<void(java_object_t<"android/view/View">)>("setContentView");
+  auto set_content_view = activity->handle.get_class().get_method<void(java_object_t<"android/view/View">)>("setContentView");
 
   set_content_view(activity->handle, view->handle);
 

package/lib/web-view.h

@@ -11,8 +11,6 @@
 struct bare_ndk_web_view_t {
   java_global_ref_t<java_object_t<"android/webkit/WebView">> handle;
 
-  java_global_ref_t<java_class_t<"android/webkit/WebView">> init;
-
   js_env_t *env;
   js_ref_t *ctx;
 };
@@ -47,9 +45,9 @@ bare_ndk_web_view_init(js_env_t *env, js_callback_info_t *info) {
 
   web_view->env = env;
 
-  web_view->init = java_class_t<"android/webkit/WebView">(activity->java);
+  auto init = java_class_t<"android/webkit/WebView">(activity->java);
 
-  web_view->handle = web_view->init(java_object_t<"android/content/Context">(activity->java, activity->handle));
+  web_view->handle = init(java_object_t<"android/content/Context">(activity->java, activity->handle));
 
   err = js_create_reference(env, argv[1], 1, &web_view->ctx);
   assert(err == 0);
@@ -90,6 +88,37 @@ bare_ndk_web_view_debugging_enabled(js_env_t *env, js_callback_info_t *info) {
   return nullptr;
 }
 
+static js_value_t *
+bare_ndk_web_view_javascript_enabled(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 2;
+  js_value_t *argv[2];
+
+  err = js_get_callback_info(env, info, &argc, argv, nullptr, nullptr);
+  assert(err == 0);
+
+  assert(argc == 2);
+
+  bare_ndk_web_view_t *web_view;
+  err = js_get_value(env, js_external_t<bare_ndk_web_view_t>(argv[0]), web_view);
+  assert(err == 0);
+
+  bool enabled;
+  err = js_get_value(env, js_boolean_t(argv[1]), enabled);
+  assert(err == 0);
+
+  auto get_settings = web_view->handle.get_class().get_method<java_object_t<"android/webkit/WebSettings">()>("getSettings");
+
+  auto settings = get_settings(web_view->handle);
+
+  auto set_javascript_enabled = settings.get_class().get_method<void(bool)>("setJavaScriptEnabled");
+
+  set_javascript_enabled(settings, enabled);
+
+  return nullptr;
+}
+
 static js_value_t *
 bare_ndk_web_view_load_url(js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -110,7 +139,7 @@ bare_ndk_web_view_load_url(js_env_t *env, js_callback_info_t *info) {
   err = js_get_value(env, js_string_t(argv[1]), url);
   assert(err == 0);
 
-  auto load_url = web_view->init.get_method<void(std::string)>("loadUrl");
+  auto load_url = web_view->handle.get_class().get_method<void(std::string)>("loadUrl");
 
   load_url(web_view->handle, url);
 
@@ -153,7 +182,7 @@ bare_ndk_web_view_load_data(js_env_t *env, js_callback_info_t *info) {
   err = js_get_value(env, js_string_t(argv[5]), history_url);
   assert(err == 0);
 
-  auto load_data = web_view->init.get_method<void(std::string, std::string, std::string, std::string, std::string)>("loadDataWithBaseURL");
+  auto load_data = web_view->handle.get_class().get_method<void(std::string, std::string, std::string, std::string, std::string)>("loadDataWithBaseURL");
 
   load_data(web_view->handle, base_url, data, mime_type, encoding, history_url);
 

package/lib/web-view.js

@@ -14,6 +14,11 @@ module.exports = class NDKWebView extends NDKView {
     return this
   }
 
+  javaScriptEnabled(enabled = true) {
+    binding.webViewJavaScriptEnabled(this._handle, enabled)
+    return this
+  }
+
   loadURL(url) {
     binding.webViewLoadURL(this._handle, url)
     return this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ndk",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Android NDK bindings and runtime for Bare",
   "exports": {
     "./package": "./package.json",