From bc641e2d07186b3ec76baf248069603902e5dfd7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 4 May 2021 07:28:37 +0200 Subject: [PATCH] Fix Code style Signed-off-by: Joas Schilling --- .../firebase/MagicFirebaseMessagingService.kt | 1 - .../com/nextcloud/talk/activities/MainActivity.kt | 1 - .../nextcloud/talk/controllers/ChatController.kt | 1 - .../talk/controllers/ConversationInfoController.kt | 14 ++++++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt index 927b57af5..08eba3724 100644 --- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt +++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt @@ -302,7 +302,6 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() { var hasParticipantsInCall = false var inCallOnDifferentDevice = false - val apiVersion = ApiUtils.getConversationApiVersion(signatureVerification.userEntity, intArrayOf(1)) if (apiVersion == null) { diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index 856b08f1d..afccdd979 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -49,7 +49,6 @@ import com.nextcloud.talk.R import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.controllers.CallNotificationController -import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.controllers.ConversationsListController import com.nextcloud.talk.controllers.LockedController import com.nextcloud.talk.controllers.ServerSelectionController diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 0ab0b50ff..8dee9c60a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -1692,7 +1692,6 @@ class ChatController(args: Bundle) : Log.e(TAG, "No supported API version found") } - ncApi?.deleteChatMessage( credentials, ApiUtils.getUrlForChatMessage(apiVersion, conversationUser?.baseUrl, roomToken, diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt index 10c94eb53..f0dcbdbcc 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt @@ -736,8 +736,11 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA if (participant.type == Participant.ParticipantType.MODERATOR) { ncApi.demoteModeratorToUser( credentials, - ApiUtils.getUrlForRoomModerators(apiVersion, conversationUser.baseUrl, - conversation!!.token), + ApiUtils.getUrlForRoomModerators( + apiVersion, + conversationUser.baseUrl, + conversation!!.token + ), participant.userId ) .subscribeOn(Schedulers.io()) @@ -748,8 +751,11 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA } else if (participant.type == Participant.ParticipantType.USER) { ncApi.promoteUserToModerator( credentials, - ApiUtils.getUrlForRoomModerators(apiVersion, conversationUser.baseUrl, - conversation!!.token), + ApiUtils.getUrlForRoomModerators( + apiVersion, + conversationUser.baseUrl, + conversation!!.token + ), participant.userId ) .subscribeOn(Schedulers.io())