Use 'lateinit' for injected properties

Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2022-05-06 17:10:33 +02:00 committed by Andy Scherzinger (Rebase PR Action)
parent f9020dbc2b
commit 370c51ec2d

View file

@ -86,17 +86,14 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
) { ) {
private val binding: ControllerOperationsMenuBinding by viewBinding(ControllerOperationsMenuBinding::bind) private val binding: ControllerOperationsMenuBinding by viewBinding(ControllerOperationsMenuBinding::bind)
@JvmField
@Inject @Inject
var ncApi: NcApi? = null lateinit var ncApi: NcApi
@JvmField
@Inject @Inject
var userUtils: UserUtils? = null lateinit var userUtils: UserUtils
@JvmField
@Inject @Inject
var eventBus: EventBus? = null lateinit var eventBus: EventBus
private val operation: ConversationOperationEnum? private val operation: ConversationOperationEnum?
private var conversation: Conversation? = null private var conversation: Conversation? = null
@ -119,7 +116,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
override fun onViewBound(view: View) { override fun onViewBound(view: View) {
super.onViewBound(view) super.onViewBound(view)
sharedApplication!!.componentApplication.inject(this) sharedApplication!!.componentApplication.inject(this)
currentUser = userUtils!!.currentUser currentUser = userUtils.currentUser
if (!TextUtils.isEmpty(callUrl) && callUrl.contains("/call")) { if (!TextUtils.isEmpty(callUrl) && callUrl.contains("/call")) {
conversationToken = callUrl.substring(callUrl.lastIndexOf("/") + 1) conversationToken = callUrl.substring(callUrl.lastIndexOf("/") + 1)
@ -166,7 +163,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun fetchCapabilitiesForGuest() { private fun fetchCapabilitiesForGuest() {
ncApi!!.getCapabilities(null, ApiUtils.getUrlForCapabilities(baseUrl)) ncApi.getCapabilities(null, ApiUtils.getUrlForCapabilities(baseUrl))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(object : Observer<CapabilitiesOverall> { .subscribe(object : Observer<CapabilitiesOverall> {
@ -239,7 +236,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun operationJoinRoom() { private fun operationJoinRoom() {
ncApi!!.joinRoom( ncApi.joinRoom(
credentials, credentials,
ApiUtils.getUrlForParticipantsActive( ApiUtils.getUrlForParticipantsActive(
apiVersion(), apiVersion(),
@ -255,7 +252,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun operationMarkAsRead() { private fun operationMarkAsRead() {
ncApi!!.setChatReadMarker( ncApi.setChatReadMarker(
credentials, credentials,
ApiUtils.getUrlForSetChatReadMarker( ApiUtils.getUrlForSetChatReadMarker(
chatApiVersion(), chatApiVersion(),
@ -271,7 +268,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun operationMakePrivate() { private fun operationMakePrivate() {
ncApi!!.makeRoomPrivate( ncApi.makeRoomPrivate(
credentials, credentials,
ApiUtils.getUrlForRoomPublic( ApiUtils.getUrlForRoomPublic(
apiVersion(), apiVersion(),
@ -290,7 +287,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
if (conversation!!.getPassword() != null) { if (conversation!!.getPassword() != null) {
pass = conversation!!.getPassword() pass = conversation!!.getPassword()
} }
ncApi!!.setPassword( ncApi.setPassword(
credentials, credentials,
ApiUtils.getUrlForRoomPassword( ApiUtils.getUrlForRoomPassword(
apiVersion(), apiVersion(),
@ -306,7 +303,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun operationMakePublic() { private fun operationMakePublic() {
ncApi!!.makeRoomPublic( ncApi.makeRoomPublic(
credentials, credentials,
ApiUtils.getUrlForRoomPublic( ApiUtils.getUrlForRoomPublic(
apiVersion(), apiVersion(),
@ -321,7 +318,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun operationRenameRoom() { private fun operationRenameRoom() {
ncApi!!.renameRoom( ncApi.renameRoom(
credentials, credentials,
ApiUtils.getUrlForRoom( ApiUtils.getUrlForRoom(
apiVersion(), apiVersion(),
@ -340,7 +337,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
val genericOperationsObserver = GenericOperationsObserver() val genericOperationsObserver = GenericOperationsObserver()
val apiVersion = apiVersion() val apiVersion = apiVersion()
if (operation === ConversationOperationEnum.OPS_CODE_REMOVE_FAVORITE) { if (operation === ConversationOperationEnum.OPS_CODE_REMOVE_FAVORITE) {
ncApi!!.removeConversationFromFavorites( ncApi.removeConversationFromFavorites(
credentials, credentials,
ApiUtils.getUrlForRoomFavorite( ApiUtils.getUrlForRoomFavorite(
apiVersion, apiVersion,
@ -353,7 +350,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
.retry(1) .retry(1)
.subscribe(genericOperationsObserver) .subscribe(genericOperationsObserver)
} else { } else {
ncApi!!.addConversationToFavorites( ncApi.addConversationToFavorites(
credentials, credentials,
ApiUtils.getUrlForRoomFavorite( ApiUtils.getUrlForRoomFavorite(
apiVersion, apiVersion,
@ -394,7 +391,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
conversationName conversationName
) )
} }
ncApi!!.createRoom(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) ncApi.createRoom(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retry(1) .retry(1)
@ -405,7 +402,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
conversation = roomOverall.getOcs().getData() conversation = roomOverall.getOcs().getData()
ncApi!!.getRoom( ncApi.getRoom(
credentials, credentials,
ApiUtils.getUrlForRoom( ApiUtils.getUrlForRoom(
apiVersion, currentUser!!.baseUrl, apiVersion, currentUser!!.baseUrl,
@ -450,7 +447,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
private fun operationGetAndJoinRoom() { private fun operationGetAndJoinRoom() {
val apiVersion = apiVersion() val apiVersion = apiVersion()
ncApi!!.getRoom( ncApi.getRoom(
credentials, credentials,
ApiUtils.getUrlForRoom(apiVersion, baseUrl, conversationToken) ApiUtils.getUrlForRoom(apiVersion, baseUrl, conversationToken)
) )
@ -465,7 +462,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
conversation = roomOverall.getOcs().getData() conversation = roomOverall.getOcs().getData()
if (conversation!!.isHasPassword && conversation!!.isGuest) { if (conversation!!.isHasPassword && conversation!!.isGuest) {
eventBus!!.post(ConversationsListFetchDataEvent()) eventBus.post(ConversationsListFetchDataEvent())
val bundle = Bundle() val bundle = Bundle()
bundle.putParcelable(KEY_ROOM, Parcels.wrap(conversation)) bundle.putParcelable(KEY_ROOM, Parcels.wrap(conversation))
bundle.putString(KEY_CALL_URL, callUrl) bundle.putString(KEY_CALL_URL, callUrl)
@ -490,7 +487,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
.popChangeHandler(HorizontalChangeHandler()) .popChangeHandler(HorizontalChangeHandler())
) )
} else if (conversation!!.isGuest) { } else if (conversation!!.isGuest) {
ncApi!!.joinRoom( ncApi.joinRoom(
credentials, credentials,
ApiUtils.getUrlForParticipantsActive( ApiUtils.getUrlForParticipantsActive(
apiVersion, apiVersion,
@ -645,7 +642,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
conversation!!.getToken(), conversation!!.getToken(),
userId userId
) )
ncApi!!.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retry(1) .retry(1)
@ -690,7 +687,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
"groups", "groups",
groupId groupId
) )
ncApi!!.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retry(1) .retry(1)
@ -719,7 +716,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
} }
private fun initiateConversation() { private fun initiateConversation() {
eventBus!!.post(ConversationsListFetchDataEvent()) eventBus.post(ConversationsListFetchDataEvent())
val bundle = Bundle() val bundle = Bundle()
bundle.putString(KEY_ROOM_TOKEN, conversation!!.getToken()) bundle.putString(KEY_ROOM_TOKEN, conversation!!.getToken())
bundle.putString(KEY_ROOM_ID, conversation!!.getRoomId()) bundle.putString(KEY_ROOM_ID, conversation!!.getRoomId())
@ -727,7 +724,7 @@ class OperationsMenuController(args: Bundle) : NewBaseController(
bundle.putParcelable(KEY_USER_ENTITY, currentUser) bundle.putParcelable(KEY_USER_ENTITY, currentUser)
bundle.putParcelable(KEY_ACTIVE_CONVERSATION, Parcels.wrap(conversation)) bundle.putParcelable(KEY_ACTIVE_CONVERSATION, Parcels.wrap(conversation))
bundle.putString(KEY_CONVERSATION_PASSWORD, callPassword) bundle.putString(KEY_CONVERSATION_PASSWORD, callPassword)
eventBus!!.post(OpenConversationEvent(conversation, bundle)) eventBus.post(OpenConversationEvent(conversation, bundle))
} }
private fun handleObserverError(e: Throwable) { private fun handleObserverError(e: Throwable) {