Skip to content

Commit d70a0c5

Browse files
committed
solve detekt/ktLint warnings
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 9de538a commit d70a0c5

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3649,18 +3649,20 @@ class ChatActivity :
36493649
}
36503650

36513651
private fun handleSystemMessages(chatMessageList: List<ChatMessage>): List<ChatMessage> {
3652-
val chatMessageMap = chatMessageList.associateBy { it.id }.toMutableMap()
3652+
fun shouldRemoveMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
3653+
isInfoMessageAboutDeletion(currentMessage) ||
3654+
isReactionsMessage(currentMessage) ||
3655+
isPollVotedMessage(currentMessage) ||
3656+
isEditMessage(currentMessage) ||
3657+
isThreadCreatedMessage(currentMessage)
36533658

3659+
val chatMessageMap = chatMessageList.associateBy { it.id }.toMutableMap()
36543660
val chatMessageIterator = chatMessageMap.iterator()
3661+
36553662
while (chatMessageIterator.hasNext()) {
36563663
val currentMessage = chatMessageIterator.next()
36573664

3658-
if (isInfoMessageAboutDeletion(currentMessage) ||
3659-
isReactionsMessage(currentMessage) ||
3660-
isPollVotedMessage(currentMessage) ||
3661-
isEditMessage(currentMessage) ||
3662-
isThreadCreatedMessage(currentMessage)
3663-
) {
3665+
if (shouldRemoveMessage(currentMessage)) {
36643666
chatMessageIterator.remove()
36653667
}
36663668
}

app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ import dagger.Module
7171
import dagger.Provides
7272
import okhttp3.OkHttpClient
7373

74+
@Suppress("TooManyFunctions")
7475
@Module
7576
class RepositoryModule {
7677

app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollCreateViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PollCreateViewModel @Inject constructor(
3333
object PollCreatedState : ViewState
3434
object PollCreationFailedState : ViewState
3535

36-
private val _currentUser = currentUserProvider.currentUser.blockingGet()
36+
private val currentUser = currentUserProvider.currentUser.blockingGet()
3737

3838
private val _viewState: MutableLiveData<ViewState> = MutableLiveData(
3939
PollCreationState(
@@ -109,9 +109,9 @@ class PollCreateViewModel @Inject constructor(
109109
if (_question.isNotEmpty() && _options.value?.isNotEmpty() == true) {
110110
_viewState.value = PollCreationState(enableAddOptionButton = false, enableCreatePollButton = false)
111111

112-
val credentials = ApiUtils.getCredentials(_currentUser.username, _currentUser.token)
112+
val credentials = ApiUtils.getCredentials(currentUser.username, currentUser.token)
113113
val url = ApiUtils.getUrlForPoll(
114-
_currentUser.baseUrl!!,
114+
currentUser.baseUrl!!,
115115
roomToken
116116
)
117117

app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepository.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import io.reactivex.Observable
1313

1414
interface ReactionsRepository {
1515

16+
@Suppress("LongParameterList")
1617
fun addReaction(
1718
credentials: String?,
1819
userId: Long,
@@ -22,6 +23,7 @@ interface ReactionsRepository {
2223
emoji: String
2324
): Observable<ReactionAddedModel>
2425

26+
@Suppress("LongParameterList")
2527
fun deleteReaction(
2628
credentials: String?,
2729
userId: Long,

0 commit comments

Comments
 (0)