From c2074306a980366ebb90f1d79005b406dcc78672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 16 Sep 2021 07:31:33 +0200
Subject: [PATCH] Fix linter issues
---
.../org/briarproject/briar/desktop/chat/Chat.kt | 3 +--
.../desktop/chat/ChatHistoryConversationVisitor.kt | 6 +++---
.../chat/ConversationMessageHeaderComparator.kt | 3 +--
.../org/briarproject/briar/desktop/chat/UiState.kt | 2 +-
.../briar/desktop/paul/views/BriarUIStateManager.kt | 2 --
.../briar/desktop/paul/views/PrivateMessageView.kt | 11 ++++++-----
6 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt
index d687df5a2b..883a6e84c7 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt
@@ -25,5 +25,4 @@ class Chat {
val author = String.format("%s (%s): ", name, formatter.format(dateTime))
messages.add(SimpleMessage(local, author, messageText!!, "time", true))
}
-
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt
index 1983c8a870..b65cf985c2 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt
@@ -65,7 +65,8 @@ class ChatHistoryConversationVisitor(
override fun visitIntroductionRequest(r: IntroductionRequest): Void? {
chat.appendMessage(
- r.isLocal, r.timestamp, String.format(
+ r.isLocal, r.timestamp,
+ String.format(
"You received an introduction request! Username: %s, Message: %s",
r.name, r.text
)
@@ -94,5 +95,4 @@ class ChatHistoryConversationVisitor(
}
return null
}
-
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt
index 32205bfb2d..a2b4b680e1 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt
@@ -10,5 +10,4 @@ class ConversationMessageHeaderComparator : Comparator<ConversationMessageHeader
): Int {
return h1.timestamp.compareTo(h2.timestamp)
}
-
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt
index e787fc238c..996727a4f1 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt
@@ -4,4 +4,4 @@ sealed class UiState<out T> {
object Loading : UiState<Nothing>()
data class Success<out T>(val data: T) : UiState<T>()
data class Error(val exception: Exception) : UiState<Nothing>()
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt
index 4088522fe3..e0b9c0c402 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt
@@ -13,8 +13,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import org.briarproject.bramble.api.contact.Contact
-import org.briarproject.briar.api.conversation.ConversationManager
-import org.briarproject.briar.api.messaging.MessagingManager
import org.briarproject.briar.desktop.paul.theme.briarBlack
/*
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
index 11649262c0..65971e55ea 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
@@ -74,7 +74,6 @@ import org.briarproject.briar.desktop.paul.theme.divider
import org.briarproject.briar.desktop.paul.theme.lightGray
import java.util.Collections
-
val HEADER_SIZE = 66.dp
@Composable
@@ -206,9 +205,11 @@ fun ContactCard(selContact: MutableState<Contact>, contact: Contact) {
}
Row(
modifier = Modifier.fillMaxWidth().height(HEADER_SIZE).background(bgColor)
- .clickable(onClick = {
- selContact.value = contact
- }),
+ .clickable(
+ onClick = {
+ selContact.value = contact
+ }
+ ),
horizontalArrangement = Arrangement.SpaceBetween
) {
Row(modifier = Modifier.align(Alignment.CenterVertically).padding(horizontal = 16.dp)) {
@@ -426,4 +427,4 @@ fun ChatState(id: ContactId): MutableState<UiState<Chat>> {
}
return state
-}
\ No newline at end of file
+}
--
GitLab