Skip to content

Commit f51fedc

Browse files
committed
Comment ProxyLifecycleProvider to fix Flutter 3.24 kotlin compilation.
1 parent 93d7a3a commit f51fedc

File tree

2 files changed

+72
-69
lines changed

2 files changed

+72
-69
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* [Android] Fix touch detection when using Unity's New Input System. [#938](https://github.com/juicycleff/flutter-unity-view-widget/pull/938)
33
* [Android] Workaround for mUnityplayer error in Unity plugins using the AndroidJavaProxy. [#908](https://github.com/juicycleff/flutter-unity-view-widget/pull/908)
44
* [Android] Add namespace for Android gradle plugin (AGP) 8 compatibility.
5+
* [Android] Fix kotlin compilation error with Flutter 3.24 and newer. [#973](https://github.com/juicycleff/flutter-unity-view-widget/issues/973)
56

67
## 2022.2.1
78

android/src/main/kotlin/com/xraph/plugin/flutter_unity_widget/FlutterUnityWidgetPlugin.kt

+71-69
Original file line numberDiff line numberDiff line change
@@ -87,78 +87,80 @@ class FlutterUnityWidgetPlugin : FlutterPlugin, ActivityAware {
8787
}
8888

8989
/**
90+
* [August 2024 UPDATE] This unused class was disabled to fix compilation errors in Flutter 3.24.
91+
*
9092
* This class provides a {@link LifecycleOwner} for the activity driven by {@link
9193
* ActivityLifecycleCallbacks}.
9294
*
9395
* <p>This is used in the case where a direct Lifecycle/Owner is not available.
9496
*/
95-
@SuppressLint("NewApi")
96-
private class ProxyLifecycleProvider(activity: Activity) : Application.ActivityLifecycleCallbacks, LifecycleOwner, LifecycleProvider {
97-
private val lifecycle = LifecycleRegistry(this)
98-
private var registrarActivityHashCode: Int = 0
99-
100-
init {
101-
UnityPlayerUtils.activity = activity
102-
this.registrarActivityHashCode = activity.hashCode()
103-
activity.application.registerActivityLifecycleCallbacks(this)
104-
}
105-
106-
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
107-
UnityPlayerUtils.activity = activity
108-
if (activity.hashCode() != registrarActivityHashCode) {
109-
return
110-
}
111-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
112-
}
113-
114-
override fun onActivityStarted(activity: Activity) {
115-
UnityPlayerUtils.activity = activity
116-
if (activity.hashCode() != registrarActivityHashCode) {
117-
return
118-
}
119-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
120-
}
121-
122-
override fun onActivityResumed(activity: Activity) {
123-
UnityPlayerUtils.activity = activity
124-
if (activity.hashCode() != registrarActivityHashCode) {
125-
return
126-
}
127-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
128-
}
129-
130-
override fun onActivityPaused(activity: Activity) {
131-
UnityPlayerUtils.activity = activity
132-
if (activity.hashCode() != registrarActivityHashCode) {
133-
return
134-
}
135-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
136-
}
137-
138-
override fun onActivityStopped(activity: Activity) {
139-
UnityPlayerUtils.activity = activity
140-
if (activity.hashCode() != registrarActivityHashCode) {
141-
return
142-
}
143-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
144-
}
145-
146-
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
147-
UnityPlayerUtils.activity = activity
148-
}
149-
150-
override fun onActivityDestroyed(activity: Activity) {
151-
UnityPlayerUtils.activity = activity
152-
if (activity.hashCode() != registrarActivityHashCode) {
153-
return
154-
}
155-
156-
activity.application.unregisterActivityLifecycleCallbacks(this)
157-
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
158-
}
159-
160-
override fun getLifecycle(): Lifecycle {
161-
return lifecycle
162-
}
163-
}
97+
// @SuppressLint("NewApi")
98+
// private class ProxyLifecycleProvider(activity: Activity) : Application.ActivityLifecycleCallbacks, LifecycleOwner, LifecycleProvider {
99+
// private val lifecycle = LifecycleRegistry(this)
100+
// private var registrarActivityHashCode: Int = 0
101+
//
102+
// init {
103+
// UnityPlayerUtils.activity = activity
104+
// this.registrarActivityHashCode = activity.hashCode()
105+
// activity.application.registerActivityLifecycleCallbacks(this)
106+
// }
107+
//
108+
// override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
109+
// UnityPlayerUtils.activity = activity
110+
// if (activity.hashCode() != registrarActivityHashCode) {
111+
// return
112+
// }
113+
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
114+
// }
115+
//
116+
// override fun onActivityStarted(activity: Activity) {
117+
// UnityPlayerUtils.activity = activity
118+
// if (activity.hashCode() != registrarActivityHashCode) {
119+
// return
120+
// }
121+
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
122+
// }
123+
//
124+
// override fun onActivityResumed(activity: Activity) {
125+
// UnityPlayerUtils.activity = activity
126+
// if (activity.hashCode() != registrarActivityHashCode) {
127+
// return
128+
// }
129+
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
130+
// }
131+
//
132+
// override fun onActivityPaused(activity: Activity) {
133+
// UnityPlayerUtils.activity = activity
134+
// if (activity.hashCode() != registrarActivityHashCode) {
135+
// return
136+
// }
137+
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
138+
// }
139+
//
140+
// override fun onActivityStopped(activity: Activity) {
141+
// UnityPlayerUtils.activity = activity
142+
// if (activity.hashCode() != registrarActivityHashCode) {
143+
// return
144+
// }
145+
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
146+
// }
147+
//
148+
// override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
149+
// UnityPlayerUtils.activity = activity
150+
// }
151+
//
152+
// override fun onActivityDestroyed(activity: Activity) {
153+
// UnityPlayerUtils.activity = activity
154+
// if (activity.hashCode() != registrarActivityHashCode) {
155+
// return
156+
// }
157+
//
158+
// activity.application.unregisterActivityLifecycleCallbacks(this)
159+
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
160+
// }
161+
//
162+
// override fun getLifecycle(): Lifecycle {
163+
// return lifecycle
164+
// }
165+
// }
164166
}

0 commit comments

Comments
 (0)