Skip to content

Commit 69ed820

Browse files
AndyScherzingerAndyScherzinger
committed
fix: ktlintCheck by reformatting kt code
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent 2c7c720 commit 69ed820

23 files changed

+73
-108
lines changed

‎app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class ChatBlocksDaoTest {
5252
@Test
5353
fun testGetConnectedChatBlocks() =
5454
runTest {
55-
5655
usersDao.saveUser(createUserEntity("account1", "Account 1"))
5756
val account1 = usersDao.getUserWithUserId("account1").blockingGet()
5857

@@ -67,7 +66,7 @@ class ChatBlocksDaoTest {
6766
accountId = account1.id,
6867
"def",
6968
roomName = "Conversation Two"
70-
),
69+
)
7170
)
7271
)
7372

‎app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@ import android.text.TextUtils
1313
import android.util.Log
1414
import android.view.View
1515
import androidx.core.content.ContextCompat
16-
import androidx.lifecycle.lifecycleScope
1716
import autodagger.AutoInjector
1817
import coil.load
1918
import com.nextcloud.android.common.ui.theme.utils.ColorRole
2019
import com.nextcloud.talk.R
21-
import com.nextcloud.talk.adapters.messages.OutcomingPollMessageViewHolder.Companion
2220
import com.nextcloud.talk.api.NcApi
2321
import com.nextcloud.talk.application.NextcloudTalkApplication
2422
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
2523
import com.nextcloud.talk.chat.ChatActivity
24+
import com.nextcloud.talk.chat.data.model.ChatMessage
2625
import com.nextcloud.talk.databinding.ItemCustomIncomingLinkPreviewMessageBinding
2726
import com.nextcloud.talk.extensions.loadBotsAvatar
2827
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
2928
import com.nextcloud.talk.extensions.loadFederatedUserAvatar
30-
import com.nextcloud.talk.chat.data.model.ChatMessage
3129
import com.nextcloud.talk.ui.theme.ViewThemeUtils
3230
import com.nextcloud.talk.utils.ApiUtils
3331
import com.nextcloud.talk.utils.DateUtils

‎app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,19 @@ import android.view.MotionEvent
2020
import android.view.View
2121
import android.webkit.WebView
2222
import android.webkit.WebViewClient
23-
import androidx.lifecycle.lifecycleScope
2423
import autodagger.AutoInjector
2524
import coil.load
2625
import com.google.android.material.snackbar.Snackbar
2726
import com.nextcloud.android.common.ui.theme.utils.ColorRole
2827
import com.nextcloud.talk.R
29-
import com.nextcloud.talk.adapters.messages.IncomingPollMessageViewHolder.Companion
3028
import com.nextcloud.talk.application.NextcloudTalkApplication
3129
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
3230
import com.nextcloud.talk.chat.ChatActivity
31+
import com.nextcloud.talk.chat.data.model.ChatMessage
3332
import com.nextcloud.talk.databinding.ItemCustomIncomingLocationMessageBinding
3433
import com.nextcloud.talk.extensions.loadBotsAvatar
3534
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
3635
import com.nextcloud.talk.extensions.loadFederatedUserAvatar
37-
import com.nextcloud.talk.chat.data.model.ChatMessage
3836
import com.nextcloud.talk.ui.theme.ViewThemeUtils
3937
import com.nextcloud.talk.utils.ApiUtils
4038
import com.nextcloud.talk.utils.DateUtils

‎app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@ import android.text.TextUtils
1212
import android.util.Log
1313
import android.view.View
1414
import androidx.core.content.ContextCompat
15-
import androidx.lifecycle.lifecycleScope
1615
import autodagger.AutoInjector
1716
import coil.load
1817
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1918
import com.nextcloud.talk.R
20-
import com.nextcloud.talk.adapters.messages.IncomingTextMessageViewHolder.Companion
2119
import com.nextcloud.talk.api.NcApi
2220
import com.nextcloud.talk.application.NextcloudTalkApplication
2321
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
2422
import com.nextcloud.talk.chat.ChatActivity
23+
import com.nextcloud.talk.chat.data.model.ChatMessage
2524
import com.nextcloud.talk.databinding.ItemCustomIncomingPollMessageBinding
2625
import com.nextcloud.talk.extensions.loadBotsAvatar
2726
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
2827
import com.nextcloud.talk.extensions.loadFederatedUserAvatar
29-
import com.nextcloud.talk.chat.data.model.ChatMessage
3028
import com.nextcloud.talk.polls.ui.PollMainDialogFragment
3129
import com.nextcloud.talk.ui.theme.ViewThemeUtils
3230
import com.nextcloud.talk.utils.ApiUtils

‎app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@ import android.util.Log
1515
import android.util.TypedValue
1616
import android.view.View
1717
import androidx.core.content.ContextCompat
18-
import androidx.lifecycle.lifecycleScope
1918
import autodagger.AutoInjector
2019
import coil.load
2120
import com.nextcloud.android.common.ui.theme.utils.ColorRole
2221
import com.nextcloud.talk.R
2322
import com.nextcloud.talk.application.NextcloudTalkApplication
2423
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
2524
import com.nextcloud.talk.chat.ChatActivity
25+
import com.nextcloud.talk.chat.data.model.ChatMessage
2626
import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding
2727
import com.nextcloud.talk.extensions.loadBotsAvatar
2828
import com.nextcloud.talk.extensions.loadChangelogBotAvatar
2929
import com.nextcloud.talk.extensions.loadFederatedUserAvatar
30-
import com.nextcloud.talk.chat.data.model.ChatMessage
3130
import com.nextcloud.talk.ui.theme.ViewThemeUtils
3231
import com.nextcloud.talk.utils.ApiUtils
3332
import com.nextcloud.talk.utils.DateUtils
@@ -37,9 +36,7 @@ import com.nextcloud.talk.utils.preferences.AppPreferences
3736
import com.stfalcon.chatkit.messages.MessageHolders
3837
import kotlinx.coroutines.CoroutineScope
3938
import kotlinx.coroutines.Dispatchers
40-
import kotlinx.coroutines.coroutineScope
4139
import kotlinx.coroutines.flow.first
42-
import kotlinx.coroutines.flow.flowOf
4340
import kotlinx.coroutines.launch
4441
import kotlinx.coroutines.withContext
4542
import javax.inject.Inject

‎app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt

+26-28
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ import android.content.Context
1212
import android.util.Log
1313
import android.view.View
1414
import androidx.appcompat.content.res.AppCompatResources
15-
import androidx.lifecycle.lifecycleScope
1615
import autodagger.AutoInjector
1716
import coil.load
1817
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1918
import com.nextcloud.talk.R
20-
import com.nextcloud.talk.adapters.messages.OutcomingPollMessageViewHolder.Companion
2119
import com.nextcloud.talk.api.NcApi
2220
import com.nextcloud.talk.application.NextcloudTalkApplication
2321
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
2422
import com.nextcloud.talk.chat.ChatActivity
25-
import com.nextcloud.talk.databinding.ItemCustomOutcomingLinkPreviewMessageBinding
2623
import com.nextcloud.talk.chat.data.model.ChatMessage
24+
import com.nextcloud.talk.databinding.ItemCustomOutcomingLinkPreviewMessageBinding
2725
import com.nextcloud.talk.models.json.chat.ReadStatus
2826
import com.nextcloud.talk.ui.theme.ViewThemeUtils
2927
import com.nextcloud.talk.utils.ApiUtils
@@ -164,32 +162,32 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) :
164162
message.parentMessageId!!
165163
).first()
166164
}
167-
parentChatMessage.activeUser = message.activeUser
168-
parentChatMessage.imageUrl?.let {
169-
binding.messageQuote.quotedMessageImage.visibility = View.VISIBLE
170-
binding.messageQuote.quotedMessageImage.load(it) {
171-
addHeader(
172-
"Authorization",
173-
ApiUtils.getCredentials(message.activeUser!!.username, message.activeUser!!.token)!!
174-
)
175-
}
176-
} ?: run {
177-
binding.messageQuote.quotedMessageImage.visibility = View.GONE
178-
}
179-
binding.messageQuote.quotedMessageAuthor.text = parentChatMessage.actorDisplayName
180-
?: context.getText(R.string.nc_nick_guest)
181-
binding.messageQuote.quotedMessage.text = messageUtils
182-
.enrichChatReplyMessageText(
183-
binding.messageQuote.quotedMessage.context,
184-
parentChatMessage,
185-
false,
186-
viewThemeUtils
165+
parentChatMessage.activeUser = message.activeUser
166+
parentChatMessage.imageUrl?.let {
167+
binding.messageQuote.quotedMessageImage.visibility = View.VISIBLE
168+
binding.messageQuote.quotedMessageImage.load(it) {
169+
addHeader(
170+
"Authorization",
171+
ApiUtils.getCredentials(message.activeUser!!.username, message.activeUser!!.token)!!
187172
)
188-
viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
189-
viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
190-
viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
191-
192-
binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE
173+
}
174+
} ?: run {
175+
binding.messageQuote.quotedMessageImage.visibility = View.GONE
176+
}
177+
binding.messageQuote.quotedMessageAuthor.text = parentChatMessage.actorDisplayName
178+
?: context.getText(R.string.nc_nick_guest)
179+
binding.messageQuote.quotedMessage.text = messageUtils
180+
.enrichChatReplyMessageText(
181+
binding.messageQuote.quotedMessage.context,
182+
parentChatMessage,
183+
false,
184+
viewThemeUtils
185+
)
186+
viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
187+
viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
188+
viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
189+
190+
binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE
193191
} catch (e: Exception) {
194192
Log.d(TAG, "Error when processing parent message in view holder", e)
195193
}

‎app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ import android.view.View
1818
import android.webkit.WebView
1919
import android.webkit.WebViewClient
2020
import androidx.appcompat.content.res.AppCompatResources
21-
import androidx.lifecycle.lifecycleScope
2221
import autodagger.AutoInjector
2322
import coil.load
2423
import com.google.android.flexbox.FlexboxLayout
2524
import com.google.android.material.snackbar.Snackbar
2625
import com.nextcloud.android.common.ui.theme.utils.ColorRole
2726
import com.nextcloud.talk.R
28-
import com.nextcloud.talk.adapters.messages.IncomingPollMessageViewHolder.Companion
2927
import com.nextcloud.talk.application.NextcloudTalkApplication
3028
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
3129
import com.nextcloud.talk.chat.ChatActivity
32-
import com.nextcloud.talk.databinding.ItemCustomOutcomingLocationMessageBinding
3330
import com.nextcloud.talk.chat.data.model.ChatMessage
31+
import com.nextcloud.talk.databinding.ItemCustomOutcomingLocationMessageBinding
3432
import com.nextcloud.talk.models.json.chat.ReadStatus
3533
import com.nextcloud.talk.ui.theme.ViewThemeUtils
3634
import com.nextcloud.talk.utils.ApiUtils

‎app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ import android.content.Context
1212
import android.util.Log
1313
import android.view.View
1414
import androidx.appcompat.content.res.AppCompatResources
15-
import androidx.lifecycle.lifecycleScope
1615
import autodagger.AutoInjector
1716
import coil.load
1817
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1918
import com.nextcloud.talk.R
20-
import com.nextcloud.talk.adapters.messages.IncomingPollMessageViewHolder.Companion
2119
import com.nextcloud.talk.api.NcApi
2220
import com.nextcloud.talk.application.NextcloudTalkApplication
2321
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
2422
import com.nextcloud.talk.chat.ChatActivity
25-
import com.nextcloud.talk.databinding.ItemCustomOutcomingPollMessageBinding
2623
import com.nextcloud.talk.chat.data.model.ChatMessage
24+
import com.nextcloud.talk.databinding.ItemCustomOutcomingPollMessageBinding
2725
import com.nextcloud.talk.models.json.chat.ReadStatus
2826
import com.nextcloud.talk.polls.ui.PollMainDialogFragment
2927
import com.nextcloud.talk.ui.theme.ViewThemeUtils

‎app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,17 @@ import android.view.View
1717
import android.widget.SeekBar
1818
import androidx.appcompat.content.res.AppCompatResources
1919
import androidx.core.content.ContextCompat
20-
import androidx.lifecycle.lifecycleScope
2120
import androidx.work.WorkInfo
2221
import androidx.work.WorkManager
2322
import autodagger.AutoInjector
2423
import coil.load
2524
import com.nextcloud.android.common.ui.theme.utils.ColorRole
2625
import com.nextcloud.talk.R
27-
import com.nextcloud.talk.adapters.messages.IncomingPollMessageViewHolder.Companion
2826
import com.nextcloud.talk.application.NextcloudTalkApplication
2927
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
3028
import com.nextcloud.talk.chat.ChatActivity
31-
import com.nextcloud.talk.databinding.ItemCustomOutcomingVoiceMessageBinding
3229
import com.nextcloud.talk.chat.data.model.ChatMessage
30+
import com.nextcloud.talk.databinding.ItemCustomOutcomingVoiceMessageBinding
3331
import com.nextcloud.talk.models.json.chat.ReadStatus
3432
import com.nextcloud.talk.ui.theme.ViewThemeUtils
3533
import com.nextcloud.talk.utils.ApiUtils

‎app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

+7-13
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID
162162
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_BREAKOUT_ROOM
163163
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_MODERATOR
164164
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_RECORDING_STATE
165-
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID
166165
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
167166
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_START_CALL_AFTER_ROOM_SWITCH
168167
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SWITCH_TO_ROOM
@@ -187,7 +186,6 @@ import kotlinx.coroutines.withContext
187186
import org.greenrobot.eventbus.Subscribe
188187
import org.greenrobot.eventbus.ThreadMode
189188
import retrofit2.HttpException
190-
import retrofit2.Response
191189
import java.io.File
192190
import java.io.IOException
193191
import java.net.HttpURLConnection
@@ -291,6 +289,7 @@ class ChatActivity :
291289
var newMessagesCount = 0
292290
var startCallFromNotification: Boolean = false
293291
var startCallFromRoomSwitch: Boolean = false
292+
294293
// lateinit var roomId: String
295294
var voiceOnly: Boolean = true
296295
private lateinit var path: String
@@ -600,7 +599,7 @@ class ChatActivity :
600599

601600
chatViewModel.loadMessages(
602601
withCredentials = credentials!!,
603-
withUrl = urlForChatting,
602+
withUrl = urlForChatting
604603
)
605604
}
606605

@@ -985,7 +984,8 @@ class ChatActivity :
985984

986985
if (newState == AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
987986
if (layoutManager!!.findFirstCompletelyVisibleItemPosition() > 0 &&
988-
!binding.unreadMessagesPopup.isShown) {
987+
!binding.unreadMessagesPopup.isShown
988+
) {
989989
binding.scrollDownButton.visibility = View.VISIBLE
990990
} else {
991991
binding.scrollDownButton.visibility = View.GONE
@@ -2504,7 +2504,6 @@ class ChatActivity :
25042504
unreadChatMessage.message = context.getString(R.string.nc_new_messages)
25052505
adapter?.addToStart(unreadChatMessage, false)
25062506

2507-
25082507
if (scrollToEndOnUpdate) {
25092508
binding.scrollDownButton.visibility = View.GONE
25102509
newMessagesCount = 0
@@ -2519,7 +2518,6 @@ class ChatActivity :
25192518
}
25202519
}
25212520

2522-
25232521
for (chatMessage in chatMessageList) {
25242522
chatMessage.activeUser = conversationUser
25252523

@@ -2630,7 +2628,6 @@ class ChatActivity :
26302628
// see getImageUrl() source code
26312629
setUpWaveform(currentlyPlayedVoiceMessage!!, voiceMessageToRestoreWasPlaying)
26322630
Log.d(RESUME_AUDIO_TAG, "resume audio procedure completed")
2633-
26342631
} else {
26352632
Log.d(RESUME_AUDIO_TAG, "No voice message to restore")
26362633
}
@@ -2639,7 +2636,7 @@ class ChatActivity :
26392636
voiceMessageToRestoreWasPlaying = false
26402637
}
26412638

2642-
private fun getItemFromAdapter(messageId: String): Pair<ChatMessage,Int>? {
2639+
private fun getItemFromAdapter(messageId: String): Pair<ChatMessage, Int>? {
26432640
if (adapter != null) {
26442641
val messagePosition = adapter!!.items!!.indexOfFirst {
26452642
it.item is ChatMessage && (it.item as ChatMessage).id == messageId
@@ -2652,9 +2649,7 @@ class ChatActivity :
26522649
Log.d(TAG, "currentItem retrieved was not chatmessage or its id was not correct")
26532650
}
26542651
} else {
2655-
Log.d(
2656-
TAG, "messagePosition is -1, adapter # of items: " + adapter!!.itemCount
2657-
)
2652+
Log.d(TAG, "messagePosition is -1, adapter # of items: " + adapter!!.itemCount)
26582653
}
26592654
} else {
26602655
Log.d(TAG, "TalkMessagesListAdapter is null")
@@ -2831,7 +2826,6 @@ class ChatActivity :
28312826
while (chatMessageIterator.hasNext()) {
28322827
val currentMessage = chatMessageIterator.next()
28332828

2834-
28352829
if (isInfoMessageAboutDeletion(currentMessage) ||
28362830
isReactionsMessage(currentMessage) ||
28372831
isPollVotedMessage(currentMessage) ||
@@ -3176,7 +3170,7 @@ class ChatActivity :
31763170
val lon = data["longitude"]!!
31773171
metaData =
31783172
"{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
3179-
"\"longitude\":\"$lon\",\"name\":\"$name\"}"
3173+
"\"longitude\":\"$lon\",\"name\":\"$name\"}"
31803174
}
31813175

31823176
when (type) {

‎app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ interface ChatMessageRepository : LifecycleAwareManager {
3232

3333
val lastCommonReadFlow: Flow<Int>
3434

35-
fun setData(
36-
conversationModel: ConversationModel,
37-
credentials: String,
38-
urlForChatting: String
39-
)
35+
fun setData(conversationModel: ConversationModel, credentials: String, urlForChatting: String)
4036

4137
fun loadInitialMessages(withNetworkParams: Bundle): Job
4238

0 commit comments

Comments
 (0)