refactor: rename TauriActivity to WryActivity (#926)

* refactor: rename `TauriActivity` to `WryActivity` * use `WryActivity` instead of `AppCompatActivity` * update to tao 0.19
tauri-apps · Apr 17, 2023 · d560981 · d560981
1 parent 8c680ef
commit d560981
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/.changes/tao-0.19.md b/.changes/tao-0.19.md
@@ -0,0 +1,5 @@
+---
+"wry": minor
+---
+
+Update `tao` to `0.19`
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,7 +41,7 @@ serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
 url = "2.3"
-tao = { version = "0.18.0", default-features = false, features = [ "serde" ] }
+tao = { version = "0.19", default-features = false, features = [ "serde" ] }
 http = "0.2.9"
 
 [dev-dependencies]

diff --git a/src/webview/android/kotlin/RustWebChromeClient.kt b/src/webview/android/kotlin/RustWebChromeClient.kt
@@ -28,16 +28,14 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import androidx.core.content.FileProvider
 import java.io.File
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.*
 
 
-class RustWebChromeClient(appActivity: AppCompatActivity) : WebChromeClient() {
+class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
   private interface PermissionListener {
     fun onPermissionSelect(isGranted: Boolean?)
   }
@@ -46,7 +44,7 @@ class RustWebChromeClient(appActivity: AppCompatActivity) : WebChromeClient() {
     fun onActivityResult(result: ActivityResult?)
   }
 
-  private val activity: AppCompatActivity
+  private val activity: WryActivity
   private var permissionLauncher: ActivityResultLauncher<Array<String>>
   private var activityLauncher: ActivityResultLauncher<Intent>
   private var permissionListener: PermissionListener? = null

diff --git a/src/webview/android/kotlin/TauriActivity.kt → src/webview/android/kotlin/WryActivity.kt b/src/webview/android/kotlin/TauriActivity.kt → src/webview/android/kotlin/WryActivity.kt
@@ -12,7 +12,7 @@ import android.webkit.WebView
 import android.view.KeyEvent
 import androidx.appcompat.app.AppCompatActivity
 
-abstract class TauriActivity : AppCompatActivity() {
+abstract class WryActivity : AppCompatActivity() {
     lateinit var m_webview: RustWebView
 
     val version: String
@@ -112,7 +112,7 @@ abstract class TauriActivity : AppCompatActivity() {
         }
     }
 
-    private external fun create(activity: TauriActivity)
+    private external fun create(activity: WryActivity)
     private external fun start()
     private external fun resume()
     private external fun pause()

diff --git a/src/webview/android/main_pipe.rs b/src/webview/android/main_pipe.rs
@@ -47,12 +47,14 @@ impl MainPipe<'_> {
         WebViewMessage::CreateWebView(attrs) => {
           let CreateWebViewAttributes {
             url,
+            #[cfg(any(debug_assertions, feature = "devtools"))]
             devtools,
             transparent,
             background_color,
             headers,
             on_webview_created,
             autoplay,
+            ..
           } = attrs;
           // Create webview
           let rust_webview_class = find_class(
@@ -275,6 +277,7 @@ pub(crate) enum WebViewMessage {
 
 pub(crate) struct CreateWebViewAttributes {
   pub url: String,
+  #[cfg(any(debug_assertions, feature = "devtools"))]
   pub devtools: bool,
   pub transparent: bool,
   pub background_color: Option<RGBA>,

diff --git a/src/webview/android/mod.rs b/src/webview/android/mod.rs
@@ -37,18 +37,18 @@ pub struct Context<'a> {
 
 #[macro_export]
 macro_rules! android_binding {
-  ($domain:ident, $package:ident, $main: ident) => {
+  ($domain:ident, $package:ident, $main:ident) => {
     android_binding!($domain, $package, $main, ::wry)
   };
-  ($domain:ident, $package:ident, $main: ident, $wry: path) => {
+  ($domain:ident, $package:ident, $main:ident, $wry:path) => {
     use $wry::{
       application::{
         android_binding as tao_android_binding, android_fn, generate_package_name,
         platform::android::ndk_glue::*,
       },
       webview::prelude::*,
     };
-    tao_android_binding!($domain, $package, setup, $main);
+    tao_android_binding!($domain, $package, WryActivity, setup, $main);
     android_fn!(
       $domain,
       $package,
@@ -131,7 +131,7 @@ pub unsafe fn setup(env: JNIEnv, looper: &ForeignLooper, activity: GlobalRef) {
   let webchrome_client = env
     .new_object(
       rust_webchrome_client_class,
-      "(Landroidx/appcompat/app/AppCompatActivity;)V",
+      &format!("(L{}/WryActivity;)V", PACKAGE.get().unwrap()),
       &[activity.as_obj().into()],
     )
     .unwrap();
@@ -175,6 +175,7 @@ impl InnerWebView {
       url,
       initialization_scripts,
       ipc_handler,
+      #[cfg(any(debug_assertions, feature = "devtools"))]
       devtools,
       custom_protocols,
       background_color,
@@ -202,6 +203,7 @@ impl InnerWebView {
 
       MainPipe::send(WebViewMessage::CreateWebView(CreateWebViewAttributes {
         url: url_string,
+        #[cfg(any(debug_assertions, feature = "devtools"))]
         devtools,
         background_color,
         transparent,