Skip to content

Commit 3b7e91a

Browse files
committed
dispose dart callbacks when activity is closed
We cannot do this on the dart side yet until flutter/flutter#66994 is resolved
1 parent 42c81f4 commit 3b7e91a

7 files changed

Lines changed: 75 additions & 12 deletions

File tree

‎android/app/src/main/kotlin/io/rebble/fossil/bridges/AppLifecycle.kt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.rebble.fossil.bridges
22

3+
import androidx.lifecycle.Lifecycle
4+
import androidx.lifecycle.LifecycleEventObserver
5+
import androidx.lifecycle.LifecycleOwner
36
import io.flutter.plugin.common.BasicMessageChannel
47
import io.flutter.plugin.common.BinaryMessenger
58
import io.flutter.plugin.common.StandardMessageCodec
@@ -15,7 +18,8 @@ import javax.inject.Inject
1518
class AppLifecycle @Inject constructor(
1619
binaryMessenger: BinaryMessenger,
1720
mainActivity: MainActivity,
18-
coroutineScope: CoroutineScope
21+
coroutineScope: CoroutineScope,
22+
lifecycle: Lifecycle
1923
) : FlutterBridge {
2024
private val bootTrigger = CompletableDeferred<Boolean>()
2125

@@ -41,5 +45,13 @@ class AppLifecycle @Inject constructor(
4145
wrapped["result"] = output.toMapExt()
4246
wrapped
4347
}
48+
49+
lifecycle.addObserver(object : LifecycleEventObserver {
50+
override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
51+
if (event == Lifecycle.Event.ON_DESTROY) {
52+
channel.setMessageHandler(null)
53+
}
54+
}
55+
})
4456
}
4557
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package io.rebble.fossil.bridges
2+
3+
import androidx.lifecycle.Lifecycle
4+
import androidx.lifecycle.LifecycleEventObserver
5+
import androidx.lifecycle.LifecycleOwner
6+
import io.flutter.plugin.common.BinaryMessenger
7+
import io.rebble.fossil.di.PerActivity
8+
import javax.inject.Inject
9+
10+
@PerActivity
11+
/**
12+
* Helper that automatically closes down all pigeon bridges when activity is destroyed
13+
*/
14+
class BridgeLifecycleController @Inject constructor(
15+
private val binaryMessenger: BinaryMessenger,
16+
lifecycle: Lifecycle
17+
) {
18+
private val activatedSetupMethods = ArrayList<(BinaryMessenger, Any?) -> Unit>()
19+
20+
fun <T> setupControl(pigeonSetupMethod: (BinaryMessenger, T) -> Unit, callback: T) {
21+
pigeonSetupMethod(binaryMessenger, callback)
22+
@Suppress("UNCHECKED_CAST")
23+
activatedSetupMethods.add(pigeonSetupMethod as (BinaryMessenger, Any?) -> Unit)
24+
}
25+
26+
fun <T> createCallbacks(pigeonSetupMethod: (BinaryMessenger) -> T): T {
27+
return pigeonSetupMethod(binaryMessenger)
28+
}
29+
30+
init {
31+
println("Init controller")
32+
lifecycle.addObserver(object : LifecycleEventObserver {
33+
override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
34+
if (event == Lifecycle.Event.ON_DESTROY) {
35+
for (setupMethod in activatedSetupMethods) {
36+
setupMethod.invoke(binaryMessenger, null)
37+
}
38+
}
39+
}
40+
})
41+
}
42+
}

‎android/app/src/main/kotlin/io/rebble/fossil/bridges/Connection.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.rebble.fossil.bridges
22

3-
import io.flutter.plugin.common.BinaryMessenger
43
import io.rebble.fossil.bluetooth.BlueCommon
54
import io.rebble.fossil.bluetooth.ConnectionLooper
65
import io.rebble.fossil.bluetooth.ConnectionState
@@ -13,13 +12,13 @@ import javax.inject.Inject
1312

1413
@OptIn(ExperimentalCoroutinesApi::class)
1514
class Connection @Inject constructor(
16-
binaryMessenger: BinaryMessenger,
15+
bridgeLifecycleController: BridgeLifecycleController,
1716
private val connectionLooper: ConnectionLooper,
1817
private val blueCommon: BlueCommon,
1918
private val coroutineScope: CoroutineScope
2019
) : FlutterBridge, Pigeons.ConnectionControl {
2120
init {
22-
Pigeons.ConnectionControl.setup(binaryMessenger, this)
21+
bridgeLifecycleController.setupControl(Pigeons.ConnectionControl::setup, this)
2322
}
2423

2524
override fun isConnected(): Pigeons.BooleanWrapper {

‎android/app/src/main/kotlin/io/rebble/fossil/bridges/Notifications.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.rebble.fossil.bridges
22

3-
import io.flutter.plugin.common.BinaryMessenger
43
import io.rebble.fossil.pigeons.Pigeons
54
import io.rebble.libpebblecommon.blobdb.PushNotification
65
import io.rebble.libpebblecommon.services.notification.NotificationService
@@ -9,12 +8,12 @@ import kotlinx.coroutines.launch
98
import javax.inject.Inject
109

1110
class Notifications @Inject constructor(
12-
binaryMessenger: BinaryMessenger,
11+
bridgeLifecycleController: BridgeLifecycleController,
1312
private val notificationService: NotificationService,
1413
private val coroutineScope: CoroutineScope
1514
) : FlutterBridge, Pigeons.NotificationsControl {
1615
init {
17-
Pigeons.NotificationsControl.setup(binaryMessenger, this)
16+
bridgeLifecycleController.setupControl(Pigeons.NotificationsControl::setup, this)
1817
}
1918

2019
override fun sendTestNotification() {

‎android/app/src/main/kotlin/io/rebble/fossil/bridges/Scan.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.rebble.fossil.bridges
22

3-
import io.flutter.plugin.common.BinaryMessenger
43
import io.rebble.fossil.bluetooth.scan.BleScanner
54
import io.rebble.fossil.bluetooth.scan.ClassicScanner
65
import io.rebble.fossil.pigeons.ListWrapper
@@ -12,15 +11,16 @@ import javax.inject.Inject
1211

1312
@OptIn(ExperimentalUnsignedTypes::class)
1413
class Scan @Inject constructor(
15-
binaryMessenger: BinaryMessenger,
14+
bridgeLifecycleController: BridgeLifecycleController,
1615
private val bleScanner: BleScanner,
1716
private val classicScanner: ClassicScanner,
1817
private val coroutineScope: CoroutineScope
1918
) : FlutterBridge, Pigeons.ScanControl {
20-
private val scanCallbacks = Pigeons.ScanCallbacks(binaryMessenger)
19+
private val scanCallbacks =
20+
bridgeLifecycleController.createCallbacks(Pigeons::ScanCallbacks)
2121

2222
init {
23-
Pigeons.ScanControl.setup(binaryMessenger, this)
23+
bridgeLifecycleController.setupControl(Pigeons.ScanControl::setup, this)
2424
}
2525

2626
override fun startBleScan() {

‎android/app/src/main/kotlin/io/rebble/fossil/di/ActivityModule.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.rebble.fossil.di
22

3+
import androidx.lifecycle.Lifecycle
34
import androidx.lifecycle.lifecycleScope
45
import dagger.Module
56
import dagger.Provides
@@ -10,6 +11,11 @@ import kotlinx.coroutines.CoroutineScope
1011

1112
@Module
1213
class ActivityModule {
14+
@Provides
15+
fun provideLifecycle(mainActivity: MainActivity): Lifecycle {
16+
return mainActivity.lifecycle
17+
}
18+
1319
@Provides
1420
fun provideCoroutineScope(mainActivity: MainActivity): CoroutineScope {
1521
return mainActivity.lifecycleScope

‎android/app/src/main/kotlin/io/rebble/fossil/di/ActivitySubcomponent.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import dagger.BindsInstance
44
import dagger.Subcomponent
55
import io.rebble.fossil.MainActivity
66
import io.rebble.fossil.bridges.FlutterBridge
7+
import javax.inject.Scope
78

9+
@PerActivity
810
@Subcomponent(
911
modules = [
1012
ActivityModule::class,
@@ -18,4 +20,7 @@ interface ActivitySubcomponent {
1820
interface Factory {
1921
fun create(@BindsInstance mainActivity: MainActivity): ActivitySubcomponent
2022
}
21-
}
23+
}
24+
25+
@Scope
26+
annotation class PerActivity

0 commit comments

Comments
 (0)