feat(android): prepare for multi-window support

Author: lucasfernog

Cargo.lock

@@ -72,3 +72,5 @@ schemars_derive = { git = 'https://github.com/tauri-apps/schemars.git', branch =
 tauri = { path = "./crates/tauri" }
 tauri-plugin = { path = "./crates/tauri-plugin" }
 tauri-utils = { path = "./crates/tauri-utils" }
+wry = { path = "../wry" }
+tao = { path = "../tao" }

Cargo.toml

@@ -217,7 +217,7 @@ pub struct PendingWebview<T: UserEvent, R: Runtime<T>> {
   #[cfg(target_os = "android")]
   #[allow(clippy::type_complexity)]
   pub on_webview_created:
-    Option<Box<dyn Fn(CreationContext<'_, '_>) -> Result<(), jni::errors::Error> + Send>>,
+    Option<Box<dyn Fn(CreationContext<'_, '_>) -> Result<(), jni::errors::Error> + Send + Sync>>,
 
   pub web_resource_request_handler: Option<Box<WebResourceRequestHandler>>,
 
@@ -273,7 +273,7 @@ impl<T: UserEvent, R: Runtime<T>> PendingWebview<T, R> {
 
   #[cfg(target_os = "android")]
   pub fn on_webview_created<
-    F: Fn(CreationContext<'_, '_>) -> Result<(), jni::errors::Error> + Send + 'static,
+    F: Fn(CreationContext<'_, '_>) -> Result<(), jni::errors::Error> + Send + Sync + 'static,
   >(
     mut self,
     f: F,

crates/tauri-runtime/src/webview.rs

@@ -9,43 +9,51 @@ package {{package}}
 import android.content.Intent
 import android.content.res.Configuration
 import app.tauri.plugin.PluginManager
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
+
+object TauriLifecycleObserver : DefaultLifecycleObserver {
+    override fun onResume(owner: LifecycleOwner) {
+      super.onResume(owner)
+      PluginManager.onResume()
+    }
+
+    override fun onPause(owner: LifecycleOwner) {
+      super.onPause(owner)
+      PluginManager.onPause()
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+      super.onStop(owner)
+      PluginManager.onStop()
+    }
+}
 
 abstract class TauriActivity : WryActivity() {
-  var pluginManager: PluginManager = PluginManager(this)
   override val handleBackNavigation: Boolean = false
 
-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    pluginManager.onNewIntent(intent)
-  }
-
-  override fun onResume() {
-    super.onResume()
-    pluginManager.onResume()
+  fun getPluginManager(): PluginManager {
+    return PluginManager
   }
 
-  override fun onPause() {
-    super.onPause()
-    pluginManager.onPause()
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    PluginManager.onNewIntent(intent)
   }
 
   override fun onRestart() {
     super.onRestart()
-    pluginManager.onRestart()
-  }
-
-  override fun onStop() {
-    super.onStop()
-    pluginManager.onStop()
+    PluginManager.onRestart(this)
   }
 
   override fun onDestroy() {
     super.onDestroy()
-    pluginManager.onDestroy()
+    PluginManager.onDestroy(this)
   }
 
   override fun onConfigurationChanged(newConfig: Configuration) {
     super.onConfigurationChanged(newConfig)
-    pluginManager.onConfigurationChanged(newConfig)
+    PluginManager.onConfigurationChanged(newConfig)
   }
 }

crates/tauri/mobile/android-codegen/TauriActivity.kt

@@ -11,6 +11,7 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.webkit.WebView
 import androidx.activity.result.IntentSenderRequest
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import app.tauri.FsUtils
 import app.tauri.Logger
@@ -71,10 +72,18 @@ abstract class Plugin(private val activity: Activity) {
    */
   open fun onResume() {}
 
+
+  /**
+   * This event is called after onStop() when the current activity is being re-displayed to the user (the user has navigated back to it).
+   * It will be followed by onStart() and then onResume().
+   */
+  open fun onRestart(activity: AppCompatActivity) {}
+
   /**
    * This event is called after onStop() when the current activity is being re-displayed to the user (the user has navigated back to it).
    * It will be followed by onStart() and then onResume().
    */
+  @Deprecated("use onRestart(activity: AppCompatActivity) instead")
   open fun onRestart() {}
 
   /**
@@ -86,8 +95,23 @@ abstract class Plugin(private val activity: Activity) {
   /**
    * This event is called before the activity is destroyed.
    */
+  open fun onDestroy(activity: AppCompatActivity) {}
+  /**
+   * This event is called before an activity is destroyed.
+   */
+  @Deprecated("use onDestroy(activity: AppCompatActivity) instead")
   open fun onDestroy() {}
 
+  internal fun triggerOnDestroy(activity: AppCompatActivity) {
+    onDestroy(activity)
+    onDestroy()
+  }
+
+  internal fun triggerOnRestart(activity: AppCompatActivity) {
+    onRestart(activity)
+    onRestart()
+  }
+
   /**
    * This event is called when a configuration change occurs but the app does not recreate the activity.
    */

crates/tauri/mobile/android/src/main/java/app/tauri/plugin/Plugin.kt

@@ -4,7 +4,6 @@
 
 package app.tauri.plugin
 
-import android.app.PendingIntent
 import android.content.res.Configuration
 import android.content.Context
 import android.content.Intent
@@ -26,7 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import java.lang.reflect.InvocationTargetException
 
-class PluginManager(val activity: AppCompatActivity) {
+object PluginManager {
   fun interface RequestPermissionsCallback {
     fun onResult(permissions: Map<String, Boolean>)
   }
@@ -35,16 +34,33 @@ class PluginManager(val activity: AppCompatActivity) {
     fun onResult(result: ActivityResult)
   }
 
+  lateinit var activity: AppCompatActivity
   private val plugins: HashMap<String, PluginHandle> = HashMap()
-  private val startActivityForResultLauncher: ActivityResultLauncher<Intent>
-  private val startIntentSenderForResultLauncher: ActivityResultLauncher<IntentSenderRequest>
-  private val requestPermissionsLauncher: ActivityResultLauncher<Array<String>>
+  private lateinit var startActivityForResultLauncher: ActivityResultLauncher<Intent>
+  private lateinit var startIntentSenderForResultLauncher: ActivityResultLauncher<IntentSenderRequest>
+  private lateinit var requestPermissionsLauncher: ActivityResultLauncher<Array<String>>
   private var requestPermissionsCallback: RequestPermissionsCallback? = null
   private var startActivityForResultCallback: ActivityResultCallback? = null
   private var startIntentSenderForResultCallback: ActivityResultCallback? = null
-  private var jsonMapper: ObjectMapper
+  private var jsonMapper: ObjectMapper = ObjectMapper()
+    .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+    .enable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+    .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
 
   init {
+    val channelDeserializer = ChannelDeserializer({ channelId, payload ->
+      sendChannelData(channelId, payload)
+    }, jsonMapper)
+    jsonMapper
+      .registerModule(SimpleModule().addDeserializer(Channel::class.java, channelDeserializer))
+  }
+
+  fun onActivityCreate(activity: AppCompatActivity) {
+    // TODO: on destroy, we should change to a different activity
+    if (::activity.isInitialized) {
+      return
+    }
+    this.activity = activity
     startActivityForResultLauncher =
       activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()
       ) { result ->
@@ -68,17 +84,6 @@ class PluginManager(val activity: AppCompatActivity) {
           requestPermissionsCallback!!.onResult(result)
         }
       }
-
-    jsonMapper = ObjectMapper()
-      .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-      .enable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
-      .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
-
-    val channelDeserializer = ChannelDeserializer({ channelId, payload ->
-      sendChannelData(channelId, payload)
-    }, jsonMapper)
-    jsonMapper
-      .registerModule(SimpleModule().addDeserializer(Channel::class.java, channelDeserializer))
   }
 
   fun onNewIntent(intent: Intent) {
@@ -99,9 +104,9 @@ class PluginManager(val activity: AppCompatActivity) {
     }
   }
 
-  fun onRestart() {
+  fun onRestart(activity: AppCompatActivity) {
     for (plugin in plugins.values) {
-      plugin.instance.onRestart()
+      plugin.instance.triggerOnRestart(activity)
     }
   }
 
@@ -111,9 +116,9 @@ class PluginManager(val activity: AppCompatActivity) {
     }
   }
 
-  fun onDestroy() {
+  fun onDestroy(activity: AppCompatActivity) {
     for (plugin in plugins.values) {
-      plugin.instance.onDestroy()
+      plugin.instance.triggerOnDestroy(activity)
     }
   }
 
@@ -201,14 +206,12 @@ class PluginManager(val activity: AppCompatActivity) {
     }
   }
 
-  companion object {
-    fun<T> loadConfig(context: Context, plugin: String, cls: Class<T>): T {
-      val tauriConfigJson = FsUtils.readAsset(context.assets, "tauri.conf.json")
-      val mapper = ObjectMapper()
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-      val config = mapper.readValue(tauriConfigJson, Config::class.java)
-      return mapper.readValue(config.plugins[plugin].toString(), cls)
-    }
+  fun<T> loadConfig(context: Context, plugin: String, cls: Class<T>): T {
+    val tauriConfigJson = FsUtils.readAsset(context.assets, "tauri.conf.json")
+    val mapper = ObjectMapper()
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+    val config = mapper.readValue(tauriConfigJson, Config::class.java)
+    return mapper.readValue(config.plugins[plugin].toString(), cls)
   }
 
   private external fun handlePluginResponse(id: Int, success: String?, error: String?)

crates/tauri/mobile/android/src/main/java/app/tauri/plugin/PluginManager.kt

@@ -137,14 +137,7 @@ macro_rules! android_binding {
 
     ::tauri::wry::android_binding!($domain, $app_name, $wry);
 
-    ::tauri::tao::android_binding!(
-      $domain,
-      $app_name,
-      WryActivity,
-      android_setup,
-      $main,
-      ::tauri::tao
-    );
+    ::tauri::tao::android_binding!($domain, $app_name, Rust, android_setup, $main, ::tauri::tao);
 
     // be careful when renaming this, the `Java_app_tauri_plugin_PluginManager_handlePluginResponse` symbol is checked by the CLI
     ::tauri::tao::platform::android::prelude::android_fn!(