From b192e0ec600509b2e521b2ffa625e1b8b74bc846 Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Fri, 11 Oct 2024 07:37:04 -0500 Subject: [PATCH] linter Signed-off-by: rapterjet2004 --- .../com/nextcloud/talk/activities/CallActivity.kt | 10 +++++----- .../adapters/messages/TemporaryMessageViewHolder.kt | 1 - .../java/com/nextcloud/talk/chat/ChatActivity.kt | 8 ++------ .../com/nextcloud/talk/chat/MessageInputFragment.kt | 12 ++++++------ .../talk/chat/viewmodels/MessageInputViewModel.kt | 1 - 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 7f9ee8f6b..74fbfa91e 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -95,11 +95,14 @@ import com.nextcloud.talk.ui.dialog.AudioOutputDialog import com.nextcloud.talk.ui.dialog.MoreCallActionsDialog import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.SpreedFeatures +import com.nextcloud.talk.utils.CapabilitiesUtil +import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability +import com.nextcloud.talk.utils.CapabilitiesUtil.isCallRecordingAvailable import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.NotificationUtils.cancelExistingNotificationsForRoom import com.nextcloud.talk.utils.NotificationUtils.getCallRingtoneUri import com.nextcloud.talk.utils.ReceiverFlag +import com.nextcloud.talk.utils.SpreedFeatures import com.nextcloud.talk.utils.VibrationUtils.vibrateShort import com.nextcloud.talk.utils.animations.PulseAnimation import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CALL_VOICE_ONLY @@ -117,9 +120,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_START_CALL_AFTER_ROOM_SWITCH import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SWITCH_TO_ROOM -import com.nextcloud.talk.utils.CapabilitiesUtil -import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability -import com.nextcloud.talk.utils.CapabilitiesUtil.isCallRecordingAvailable import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import com.nextcloud.talk.utils.power.PowerManagerUtils import com.nextcloud.talk.utils.registerPermissionHandlerBroadcastReceiver @@ -129,9 +129,9 @@ import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingConfirmStop import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingErrorState import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingStartedState import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingStartingState -import com.nextcloud.talk.webrtc.WebRTCUtils import com.nextcloud.talk.webrtc.PeerConnectionWrapper import com.nextcloud.talk.webrtc.PeerConnectionWrapper.PeerConnectionObserver +import com.nextcloud.talk.webrtc.WebRTCUtils import com.nextcloud.talk.webrtc.WebRtcAudioManager import com.nextcloud.talk.webrtc.WebRtcAudioManager.AudioDevice import com.nextcloud.talk.webrtc.WebSocketConnectionHelper diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageViewHolder.kt index 29003ee99..42f4c693e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/TemporaryMessageViewHolder.kt @@ -110,7 +110,6 @@ class TemporaryMessageViewHolder(outgoingView: View, payload: Any) : layout ) ViewCompat.setBackground(bubble, bubbleDrawable) - } private fun processParentMessage(message: ChatMessage) { diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 0c6e68c17..80d241700 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -566,7 +566,6 @@ class ChatActivity : adapter?.notifyDataSetChanged() Log.d("Julius", "End i: $i") } - } this.lifecycleScope.launch { @@ -2507,9 +2506,9 @@ class ChatActivity : if (currentConversation!!.remoteServer != null) { val apiVersion = ApiUtils.getSignalingApiVersion(conversationUser!!, intArrayOf(ApiUtils.API_V3, 2, 1)) - ncApi!!.getSignalingSettings( + ncApi.getSignalingSettings( credentials, - ApiUtils.getUrlForSignalingSettings(apiVersion, conversationUser!!.baseUrl, roomToken!!) + ApiUtils.getUrlForSignalingSettings(apiVersion, conversationUser!!.baseUrl, roomToken) ).blockingSubscribe(object : Observer { override fun onSubscribe(d: Disposable) { // unused atm @@ -3672,9 +3671,6 @@ class ChatActivity : override fun editTemporaryMessage(id: Int, newMessage: String) { messageInputViewModel.editQueuedMessage(currentConversation!!.internalId, id, newMessage) adapter?.notifyDataSetChanged() // TODO optimize this - // TODO disable messageInput cursor and have cursor active in the message with keyboard out - from marcel - - } override fun deleteTemporaryMessage(id: Int) { diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt index a7dfe6522..79af0a4f5 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt @@ -178,15 +178,15 @@ class MessageInputFragment : Fragment() { } viewLifecycleOwner.lifecycleScope.launch { - var wasOnline: Boolean // TODO maye redo this logic, seems it might be misfiring + var wasOnline: Boolean networkMonitor.isOnline .onEach { isOnline -> wasOnline = !binding.fragmentConnectionLost.isShown - val connectionGained = (!wasOnline && isOnline) - Log.d(TAG, "isOnline: $isOnline\nwasOnline: $wasOnline\nconnectionGained: $connectionGained") - handleMessageQueue(isOnline) - handleUI(isOnline, connectionGained) - }.collect() + val connectionGained = (!wasOnline && isOnline) + Log.d(TAG, "isOnline: $isOnline\nwasOnline: $wasOnline\nconnectionGained: $connectionGained") + handleMessageQueue(isOnline) + handleUI(isOnline, connectionGained) + }.collect() } chatActivity.messageInputViewModel.messageQueueSizeFlow.observe(viewLifecycleOwner) { size -> diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt index 0dbe93a9f..c553de7d9 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt @@ -146,7 +146,6 @@ class MessageInputViewModel @Inject constructor( messageQueue.add(qMsg) dataStore.saveMessageQueue(internalId, messageQueue) _messageQueueSizeFlow.update { messageQueue.size } - val id = internalId.substringBefore('@') _messageQueueFlow.postValue(listOf(qMsg)) return }