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

Fix Code style

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-05-04 07:28:37 +02:00
parent 529541d896
commit bc641e2d07
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
View File

@ -302,7 +302,6 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
var hasParticipantsInCall = false var hasParticipantsInCall = false
var inCallOnDifferentDevice = false var inCallOnDifferentDevice = false
val apiVersion = ApiUtils.getConversationApiVersion(signatureVerification.userEntity, intArrayOf(1)) val apiVersion = ApiUtils.getConversationApiVersion(signatureVerification.userEntity, intArrayOf(1))
if (apiVersion == null) { if (apiVersion == null) {

1
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -49,7 +49,6 @@ import com.nextcloud.talk.R
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.controllers.CallNotificationController import com.nextcloud.talk.controllers.CallNotificationController
import com.nextcloud.talk.controllers.ChatController
import com.nextcloud.talk.controllers.ConversationsListController import com.nextcloud.talk.controllers.ConversationsListController
import com.nextcloud.talk.controllers.LockedController import com.nextcloud.talk.controllers.LockedController
import com.nextcloud.talk.controllers.ServerSelectionController import com.nextcloud.talk.controllers.ServerSelectionController

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

@ -1692,7 +1692,6 @@ class ChatController(args: Bundle) :
Log.e(TAG, "No supported API version found") Log.e(TAG, "No supported API version found")
} }
ncApi?.deleteChatMessage( ncApi?.deleteChatMessage(
credentials, credentials,
ApiUtils.getUrlForChatMessage(apiVersion, conversationUser?.baseUrl, roomToken, ApiUtils.getUrlForChatMessage(apiVersion, conversationUser?.baseUrl, roomToken,

14
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -736,8 +736,11 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
if (participant.type == Participant.ParticipantType.MODERATOR) { if (participant.type == Participant.ParticipantType.MODERATOR) {
ncApi.demoteModeratorToUser( ncApi.demoteModeratorToUser(
credentials, credentials,
ApiUtils.getUrlForRoomModerators(apiVersion, conversationUser.baseUrl, ApiUtils.getUrlForRoomModerators(
conversation!!.token), apiVersion,
conversationUser.baseUrl,
conversation!!.token
),
participant.userId participant.userId
) )
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -748,8 +751,11 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
} else if (participant.type == Participant.ParticipantType.USER) { } else if (participant.type == Participant.ParticipantType.USER) {
ncApi.promoteUserToModerator( ncApi.promoteUserToModerator(
credentials, credentials,
ApiUtils.getUrlForRoomModerators(apiVersion, conversationUser.baseUrl, ApiUtils.getUrlForRoomModerators(
conversation!!.token), apiVersion,
conversationUser.baseUrl,
conversation!!.token
),
participant.userId participant.userId
) )
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())