Fix memory leak

wada811 · Mar 7, 2021 · 6a050b5 · 6a050b5
1 parent 5c65ceb
commit 6a050b5
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/DataBinding-ktx/src/main/java/com/wada811/databinding/ActivityDataBinding.kt b/DataBinding-ktx/src/main/java/com/wada811/databinding/ActivityDataBinding.kt
@@ -8,20 +8,15 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.FragmentActivity
 
-fun <T : ViewDataBinding> FragmentActivity.dataBinding(): Lazy<T> = object : Lazy<T> {
-    private var binding: T? = null
-    override fun isInitialized(): Boolean = binding != null
-    override val value: T
-        get() = binding ?: bind<T>(getContentView()).also {
-            it.lifecycleOwner = this@dataBinding
-            binding = it
-        }
-
-    private fun FragmentActivity.getContentView(): View {
-        return checkNotNull(findViewById<ViewGroup>(android.R.id.content).getChildAt(0)) {
-            "Call setContentView or Use Activity's secondary constructor passing layout res id."
-        }
+fun <T : ViewDataBinding> FragmentActivity.dataBinding(): Lazy<T> = lazy(LazyThreadSafetyMode.NONE) {
+    bind<T>(getContentView()).also {
+        it.lifecycleOwner = this@dataBinding
     }
+}
 
-    private fun <T : ViewDataBinding> bind(view: View): T = DataBindingUtil.bind(view)!!
+private fun <T : ViewDataBinding> bind(view: View): T = DataBindingUtil.bind(view)!!
+private fun FragmentActivity.getContentView(): View {
+    return checkNotNull(findViewById<ViewGroup>(android.R.id.content).getChildAt(0)) {
+        "Call setContentView or Use Activity's secondary constructor passing layout res id."
+    }
 }