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

ignore detekt for"Detekt.TooGenericExceptionCaught" in scenarios where we need to handle NPE explicitly

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-01 13:56:09 +02:00
parent 40a08394bc
commit e4da772882
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -262,6 +262,7 @@ class ChatController(args: Bundle) :
disposableList.add(d) disposableList.add(d)
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
currentConversation = roomOverall.ocs.data currentConversation = roomOverall.ocs.data
loadAvatarForStatusBar() loadAvatarForStatusBar()
@ -969,6 +970,7 @@ class ChatController(args: Bundle) :
disposableList.add(d) disposableList.add(d)
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
inConversation = true inConversation = true
currentConversation?.sessionId = roomOverall.ocs.data.sessionId currentConversation?.sessionId = roomOverall.ocs.data.sessionId
@ -1126,14 +1128,21 @@ class ChatController(args: Bundle) :
// unused atm // unused atm
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onNext(genericOverall: GenericOverall) { override fun onNext(genericOverall: GenericOverall) {
myFirstMessage = message myFirstMessage = message
if (binding.popupBubbleView.isShown == true) { try {
binding.popupBubbleView.hide() if (binding.popupBubbleView.isShown == true) {
} binding.popupBubbleView.hide()
}
binding.messagesListView.smoothScrollToPosition(0) binding.messagesListView.smoothScrollToPosition(0)
} catch (npe: NullPointerException) {
// view binding can be null
// since this is called asynchrously and UI might have been destroyed in the meantime
Log.i(TAG, "UI destroyed - view binding already gone")
}
} }
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
@ -1236,13 +1245,20 @@ class ChatController(args: Bundle) :
disposableList.add(d) disposableList.add(d)
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onNext(response: Response<*>) { override fun onNext(response: Response<*>) {
if (response.code() == 304) { try {
pullChatMessages(1, setReadMarker, xChatLastCommonRead) if (response.code() == 304) {
} else if (response.code() == 412) { pullChatMessages(1, setReadMarker, xChatLastCommonRead)
futurePreconditionFailed = true } else if (response.code() == 412) {
} else { futurePreconditionFailed = true
processMessages(response, true, finalTimeout) } else {
processMessages(response, true, finalTimeout)
}
} catch (npe: NullPointerException) {
// view binding can be null
// since this is called asynchrously and UI might have been destroyed in the meantime
Log.i(TAG, "UI destroyed - view binding already gone")
} }
} }
@ -1267,11 +1283,18 @@ class ChatController(args: Bundle) :
disposableList.add(d) disposableList.add(d)
} }
@Suppress("Detekt.TooGenericExceptionCaught")
override fun onNext(response: Response<*>) { override fun onNext(response: Response<*>) {
if (response.code() == 412) { try {
pastPreconditionFailed = true if (response.code() == 412) {
} else { pastPreconditionFailed = true
processMessages(response, false, 0) } else {
processMessages(response, false, 0)
}
} catch (npe: NullPointerException) {
// view binding can be null
// since this is called asynchrously and UI might have been destroyed in the meantime
Log.i(TAG, "UI destroyed - view binding already gone")
} }
} }
@ -1316,9 +1339,9 @@ class ChatController(args: Bundle) :
cancelNotificationsForCurrentConversation() cancelNotificationsForCurrentConversation()
isFirstMessagesProcessing = false isFirstMessagesProcessing = false
binding.progressBar?.visibility = View.GONE binding.progressBar.visibility = View.GONE
binding.messagesListView?.visibility = View.VISIBLE binding.messagesListView.visibility = View.VISIBLE
} }
var countGroupedMessages = 0 var countGroupedMessages = 0
@ -1383,10 +1406,10 @@ class ChatController(args: Bundle) :
adapter?.itemCount == 0 adapter?.itemCount == 0
if (!shouldAddNewMessagesNotice && !shouldScroll) { if (!shouldAddNewMessagesNotice && !shouldScroll) {
if (!binding.popupBubbleView?.isShown!!) { if (!binding.popupBubbleView.isShown) {
newMessagesCount = 1 newMessagesCount = 1
binding.popupBubbleView?.show() binding.popupBubbleView.show()
} else if (binding.popupBubbleView?.isShown == true) { } else if (binding.popupBubbleView.isShown == true) {
newMessagesCount++ newMessagesCount++
} }
} else { } else {
@ -1671,13 +1694,14 @@ class ChatController(args: Bundle) :
override fun onSubscribe(d: Disposable) { override fun onSubscribe(d: Disposable) {
// unused atm // unused atm
} }
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
val bundle = Bundle() val bundle = Bundle()
bundle.putParcelable(KEY_USER_ENTITY, conversationUser) bundle.putParcelable(KEY_USER_ENTITY, conversationUser)
bundle.putString(KEY_ROOM_TOKEN, roomOverall.getOcs().getData().getToken()) bundle.putString(KEY_ROOM_TOKEN, roomOverall.getOcs().getData().getToken())
bundle.putString(KEY_ROOM_ID, roomOverall.getOcs().getData().getRoomId()) bundle.putString(KEY_ROOM_ID, roomOverall.getOcs().getData().getRoomId())
// FIXME once APIv2 or later is used only, the createRoom already returns all the data // FIXME once APIv2+ is used only, the createRoom already returns all the data
ncApi!!.getRoom( ncApi!!.getRoom(
credentials, credentials,
ApiUtils.getUrlForRoom( ApiUtils.getUrlForRoom(
@ -1691,6 +1715,7 @@ class ChatController(args: Bundle) :
override fun onSubscribe(d: Disposable) { override fun onSubscribe(d: Disposable) {
// unused atm // unused atm
} }
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
bundle.putParcelable( bundle.putParcelable(
KEY_ACTIVE_CONVERSATION, KEY_ACTIVE_CONVERSATION,
@ -1844,7 +1869,11 @@ class ChatController(args: Bundle) :
switch (webSocketCommunicationEvent.getType()) { switch (webSocketCommunicationEvent.getType()) {
case "refreshChat": case "refreshChat":
if (webSocketCommunicationEvent.getHashMap().get(BundleKeys.KEY_INTERNAL_USER_ID).equals(Long.toString(conversationUser.getId()))) { if (
webSocketCommunicationEvent
.getHashMap().get(BundleKeys.KEY_INTERNAL_USER_ID)
.equals(Long.toString(conversationUser.getId()))
) {
if (roomToken.equals(webSocketCommunicationEvent.getHashMap().get(BundleKeys.KEY_ROOM_TOKEN))) { if (roomToken.equals(webSocketCommunicationEvent.getHashMap().get(BundleKeys.KEY_ROOM_TOKEN))) {
pullChatMessages(2); pullChatMessages(2);
} }