Merge pull request #1728 from kiwix/feature/macgils/1727-class-cast-application

#1727 CrashReport 3.1.3: ClassCastException getActivityComponent - re…
This commit is contained in:
Seán Mac Gillicuddy 2020-01-29 13:03:06 +00:00 committed by GitHub
commit 396d59823c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions

View File

@ -22,7 +22,14 @@ import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.di.components.KiwixComponent
private val BaseActivity.kiwixComponent: KiwixComponent
get() = (applicationContext as KiwixApp).kiwixComponent
get() = kiwixApp()?.kiwixComponent ?: throw RuntimeException(
"""
applicationContext is ${applicationContext::class.java.simpleName}
application is ${application::class.java.simpleName}
""".trimIndent()
)
private fun BaseActivity.kiwixApp() = applicationContext as? KiwixApp ?: application as? KiwixApp
internal inline val BaseActivity.kiwixActivityComponent
get() = kiwixComponent

View File

@ -22,7 +22,14 @@ import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.custom.di.CustomComponent
private val BaseActivity.customComponent: CustomComponent
get() = (applicationContext as CustomApp).customComponent
get() = customApp()?.customComponent ?: throw RuntimeException(
"""
applicationContext is ${applicationContext::class.java.simpleName}
application is ${application::class.java.simpleName}
""".trimIndent()
)
private fun BaseActivity.customApp() = applicationContext as? CustomApp ?: application as? CustomApp
internal inline val BaseActivity.customActivityComponent
get() = customComponent.activityComponentBuilder().activity(this).build()