public teardown

regulad · Oct 21, 2024 · 452fc4e · 452fc4e
1 parent 7bbb463
commit 452fc4e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 64 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "xyz.regulad"
-version = "1.2.2"
+version = "1.2.3"
 
 nexusPublishing {
     repositories {

diff --git a/compose/src/main/java/xyz/regulad/regulib/compose/ComposableWebView.kt b/compose/src/main/java/xyz/regulad/regulib/compose/ComposableWebView.kt
diff --git a/wifi/src/main/java/xyz/regulad/regulib/wifi/WifiP2pManagerView.kt b/wifi/src/main/java/xyz/regulad/regulib/wifi/WifiP2pManagerView.kt
@@ -247,7 +247,7 @@ class WifiP2pManagerView private constructor(private val wifiP2pManager: WifiP2p
      *
      * This can only be called once.
      */
-    private fun teardown() {
+    fun teardown() {
         if (this::frameworkChannel.isInitialized && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             frameworkChannel.close()
         }
@@ -256,7 +256,14 @@ class WifiP2pManagerView private constructor(private val wifiP2pManager: WifiP2p
     }
 
     protected fun finalize() {
-        teardown()
+        if (managerInitializedState.value) {
+            Log.d(TAG, "WifiP2pManagerView was not torn down before being finalized. Tearing down now.")
+            try {
+                teardown()
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to teardown WifiP2pManagerView", e)
+            }
+        }
     }
 
     // methods