diff --git a/sample/src/main/kotlin/com/imallan/toothpickkotlin/MainActivity.kt b/sample/src/main/kotlin/com/imallan/toothpickkotlin/MainActivity.kt index 4d24557..eb021eb 100644 --- a/sample/src/main/kotlin/com/imallan/toothpickkotlin/MainActivity.kt +++ b/sample/src/main/kotlin/com/imallan/toothpickkotlin/MainActivity.kt @@ -41,7 +41,7 @@ class MainActivity : AppCompatActivity() { constructor(view: View) { mView = view - Toothpick.bind(this, view) + Toothpick.bind(this@MyView, view) } @OnClick(R.id.button_press_me_2) diff --git a/toothpick/src/main/kotlin/com/imallan/toothpick/Toothpick.kt b/toothpick/src/main/kotlin/com/imallan/toothpick/Toothpick.kt index 9a3aab0..fae36e9 100644 --- a/toothpick/src/main/kotlin/com/imallan/toothpick/Toothpick.kt +++ b/toothpick/src/main/kotlin/com/imallan/toothpick/Toothpick.kt @@ -17,7 +17,7 @@ object Toothpick { fun bind(activity: Activity) { val injectorName = "${activity.javaClass.canonicalName}\$\$ViewInjector" var bindMethod = mMethodMap[injectorName] - if (mMethodMap[injectorName] == null) { + if (bindMethod == null) { val clazz = Class.forName(injectorName) bindMethod = clazz.getDeclaredMethod("bindActivity", Any::class.java, Activity::class.java) mMethodMap.put(injectorName, bindMethod) @@ -27,8 +27,8 @@ object Toothpick { fun bind(obj: Any, view: View) { val injectorName = "${obj.javaClass.name}\$\$ViewInjector" - var bindMethod = mMethodMap[injectorName] - if (mMethodMapForView[injectorName] == null) { + var bindMethod = mMethodMapForView[injectorName] + if (bindMethod == null) { val clazz = Class.forName(injectorName) bindMethod = clazz.getDeclaredMethod("bindView", Any::class.java, View::class.java) mMethodMapForView.put(injectorName, bindMethod)