gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2173 from nextcloud/chore/noid/basecontroller-injected-nullability

Browse Source 
NewBaseController: Inject kotlin fields without @JvmField and nullable type
This commit is contained in:
Andy Scherzinger 2022-06-28 21:57:55 +02:00 committed by GitHub
commit cbd7e89828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
View File

@ -68,12 +68,10 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
} }
@Inject @Inject
@JvmField lateinit var appPreferences: AppPreferences
var appPreferences: AppPreferences? = null
@Inject @Inject
@JvmField lateinit var context: Context
var context: Context? = null
protected open val title: String? protected open val title: String?
get() = null get() = null
@ -93,6 +91,8 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
} }
init { init {
@Suppress("LeakingThis")
sharedApplication!!.componentApplication.inject(this)
addLifecycleListener(object : LifecycleListener() { addLifecycleListener(object : LifecycleListener() {
override fun postCreateView(controller: Controller, view: View) { override fun postCreateView(controller: Controller, view: View) {
onViewBound(view) onViewBound(view)
@ -271,7 +271,6 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
} }
private fun cleanTempCertPreference() { private fun cleanTempCertPreference() {
sharedApplication!!.componentApplication.inject(this)
val temporaryClassNames: MutableList<String> = ArrayList() val temporaryClassNames: MutableList<String> = ArrayList()
temporaryClassNames.add(ServerSelectionController::class.java.name) temporaryClassNames.add(ServerSelectionController::class.java.name)
temporaryClassNames.add(AccountVerificationController::class.java.name) temporaryClassNames.add(AccountVerificationController::class.java.name)