Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Plugin Controller not static so it creates new instance for each Flutter Engine #723

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.5.31'
ext.kotlin_version = '1.8.21'
repositories {
mavenCentral()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:7.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/reactive_ble_mobile/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'

buildscript {
ext.detekt_version = '1.17.1'
ext.kotlin_version = '1.5.31'
ext.kotlin_version = '1.8.21'
repositories {
google()
mavenCentral()
Expand All @@ -13,7 +13,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,43 +1,25 @@
package com.signify.hue.flutterreactiveble

import android.content.Context
import io.flutter.embedding.engine.plugins.FlutterPlugin
import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
import io.flutter.plugin.common.MethodChannel.Result

class ReactiveBlePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
private val pluginController = PluginController()

override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
initializePlugin(binding.binaryMessenger, binding.applicationContext, this)
}
val channel = MethodChannel(binding.binaryMessenger, "flutter_reactive_ble_method")
channel.setMethodCallHandler(this)

override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
deinitializePlugin()
pluginController.initialize(binding.binaryMessenger, binding.applicationContext)
}

companion object {
lateinit var pluginController: PluginController

@JvmStatic
private fun initializePlugin(
messenger: BinaryMessenger,
context: Context,
plugin: ReactiveBlePlugin
) {
val channel = MethodChannel(messenger, "flutter_reactive_ble_method")
channel.setMethodCallHandler(plugin)
pluginController = PluginController()
pluginController.initialize(messenger, context)
}

@JvmStatic
private fun deinitializePlugin() {
pluginController.deinitialize()
}
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
pluginController.deinitialize()
}

override fun onMethodCall(call: MethodCall, result: Result) {
pluginController.execute(call, result)
}
}
}