fix up the library linting issues

nplasterer · nplasterer · commit 06e4df029fce · 2024-01-29T20:55:46.000-08:00
diff --git a/library/src/androidTest/java/org/xmtp/android/library/GroupMembershipChangeTest.kt b/library/src/androidTest/java/org/xmtp/android/library/GroupMembershipChangeTest.kt
@@ -2,8 +2,7 @@ package org.xmtp.android.library
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -94,4 +93,4 @@ class GroupMembershipChangeTest {
         )
         assert(content?.membersAddedList.isNullOrEmpty())
     }
-}
+}
diff --git a/library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt b/library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt
@@ -4,7 +4,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import app.cash.turbine.test
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -201,4 +201,4 @@ class GroupTest {
             awaitComplete()
         }
     }
-}
+}
diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -156,7 +156,7 @@ class Client() {
         apiClient: ApiClient,
         libXMTPClient: FfiXmtpClient? = null,
     ) : this() {
-        this.address = libXMTPClient?.accountAddress() ?: address
+        this.address = address
         this.privateKeyBundleV1 = privateKeyBundleV1
         this.apiClient = apiClient
         this.contacts = Contacts(client = this)
diff --git a/library/src/main/java/org/xmtp/android/library/Conversation.kt b/library/src/main/java/org/xmtp/android/library/Conversation.kt
@@ -3,16 +3,15 @@ package org.xmtp.android.library
 import android.util.Log
 import com.google.protobuf.kotlin.toByteString
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
 import org.xmtp.android.library.codecs.EncodedContent
 import org.xmtp.android.library.libxmtp.Message
+import org.xmtp.android.library.messages.DecryptedMessage
 import org.xmtp.android.library.messages.Envelope
 import org.xmtp.android.library.messages.PagingInfoSortDirection
 import org.xmtp.proto.keystore.api.v1.Keystore.TopicMap.TopicData
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass
 import org.xmtp.proto.message.contents.Invitation
 import org.xmtp.proto.message.contents.Invitation.InvitationV1.Aes256gcmHkdfsha256
-import org.xmtp.android.library.messages.DecryptedMessage
 import java.util.Date
 
 /**
@@ -69,7 +68,6 @@ sealed class Conversation {
             }
         }
 
-
     // This distinctly identifies between two addresses.
     // Note: this will be empty for older v1 conversations.
     val conversationId: String?
diff --git a/library/src/main/java/org/xmtp/android/library/Conversations.kt b/library/src/main/java/org/xmtp/android/library/Conversations.kt
@@ -11,8 +11,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.xmtp.android.library.GRPCApiClient.Companion.makeQueryRequest
 import org.xmtp.android.library.GRPCApiClient.Companion.makeSubscribeRequest
-import org.xmtp.android.library.libxmtp.Message
-import org.xmtp.android.library.libxmtp.MessageEmitter
+import org.xmtp.android.library.messages.DecryptedMessage
 import org.xmtp.android.library.messages.Envelope
 import org.xmtp.android.library.messages.EnvelopeBuilder
 import org.xmtp.android.library.messages.InvitationV1
@@ -35,7 +34,6 @@ import org.xmtp.android.library.messages.walletAddress
 import org.xmtp.proto.keystore.api.v1.Keystore.TopicMap.TopicData
 import org.xmtp.proto.message.contents.Contact
 import org.xmtp.proto.message.contents.Invitation
-import org.xmtp.android.library.messages.DecryptedMessage
 import uniffi.xmtpv3.FfiConversations
 import uniffi.xmtpv3.FfiListConversationsOptions
 import uniffi.xmtpv3.org.xmtp.android.library.libxmtp.GroupEmitter
diff --git a/library/src/main/java/org/xmtp/android/library/Group.kt b/library/src/main/java/org/xmtp/android/library/Group.kt
@@ -1,6 +1,5 @@
 package org.xmtp.android.library
 
-import android.util.Log
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -12,16 +11,10 @@ import org.xmtp.android.library.codecs.compress
 import org.xmtp.android.library.libxmtp.Message
 import org.xmtp.android.library.libxmtp.MessageEmitter
 import org.xmtp.android.library.messages.DecryptedMessage
-import org.xmtp.android.library.messages.EnvelopeBuilder
-import org.xmtp.android.library.messages.MessageBuilder
-import org.xmtp.android.library.messages.MessageV2Builder
-import org.xmtp.android.library.messages.Pagination
 import org.xmtp.android.library.messages.PagingInfoSortDirection
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass
 import uniffi.xmtpv3.FfiGroup
 import uniffi.xmtpv3.FfiListMessagesOptions
-import uniffi.xmtpv3.FfiMessage
-import java.security.SecureRandom
 import java.util.Date
 import kotlin.time.Duration.Companion.nanoseconds
 import kotlin.time.DurationUnit
@@ -178,4 +171,4 @@ class Group(val client: Client, private val libXMTPGroup: FfiGroup) {
             libXMTPGroup.listMembers().map { it.accountAddress }
         }
     }
-}
+}
diff --git a/library/src/main/java/org/xmtp/android/library/codecs/GroupMembershipChangeCodec.kt b/library/src/main/java/org/xmtp/android/library/codecs/GroupMembershipChangeCodec.kt
@@ -1,6 +1,5 @@
 package uniffi.xmtpv3.org.xmtp.android.library.codecs
 
-import com.google.gson.GsonBuilder
 import org.xmtp.android.library.codecs.ContentCodec
 import org.xmtp.android.library.codecs.ContentTypeId
 import org.xmtp.android.library.codecs.ContentTypeIdBuilder
@@ -32,4 +31,4 @@ data class GroupMembershipChangeCodec(override var contentType: ContentTypeId =
     override fun fallback(content: GroupMembershipChanges): String? {
         return null
     }
-}
+}
diff --git a/library/src/main/java/org/xmtp/android/library/libxmtp/GroupEmitter.kt b/library/src/main/java/org/xmtp/android/library/libxmtp/GroupEmitter.kt
@@ -14,4 +14,4 @@ class GroupEmitter {
             _groups.tryEmit(conversation)
         }
     }
-}
+}
diff --git a/library/src/main/java/org/xmtp/android/library/libxmtp/Message.kt b/library/src/main/java/org/xmtp/android/library/libxmtp/Message.kt
@@ -32,4 +32,4 @@ data class Message(val client: Client, private val libXMTPMessage: FfiMessage) {
             throw XMTPException("Error decoding message", e)
         }
     }
-}
+}
diff --git a/library/src/main/java/org/xmtp/android/library/libxmtp/MessageEmitter.kt b/library/src/main/java/org/xmtp/android/library/libxmtp/MessageEmitter.kt
@@ -1,6 +1,5 @@
 package org.xmtp.android.library.libxmtp
 
-import android.util.Log
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import uniffi.xmtpv3.FfiMessage
@@ -15,4 +14,4 @@ class MessageEmitter {
             _messages.tryEmit(message)
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@ package org.xmtp.android.library`
`2`	`2`
`3`	`3`	`import androidx.test.ext.junit.runners.AndroidJUnit4`
`4`	`4`	`import androidx.test.platform.app.InstrumentationRegistry`
`5`		`-import kotlinx.coroutines.runBlocking`
`6`		`-import org.junit.Assert.*`
	`5`	`+import org.junit.Assert.assertEquals`
`7`	`6`	`import org.junit.Before`
`8`	`7`	`import org.junit.Test`
`9`	`8`	`import org.junit.runner.RunWith`
`@@ -94,4 +93,4 @@ class GroupMembershipChangeTest {`
`94`	`93`	`)`
`95`	`94`	`assert(content?.membersAddedList.isNullOrEmpty())`
`96`	`95`	`}`
`97`		`-}`
	`96`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4`
`4`	`4`	`import androidx.test.platform.app.InstrumentationRegistry`
`5`	`5`	`import app.cash.turbine.test`
`6`	`6`	`import kotlinx.coroutines.ExperimentalCoroutinesApi`
`7`		`-import org.junit.Assert.*`
	`7`	`+import org.junit.Assert.assertEquals`
`8`	`8`	`import org.junit.Before`
`9`	`9`	`import org.junit.Test`
`10`	`10`	`import org.junit.runner.RunWith`
`@@ -201,4 +201,4 @@ class GroupTest {`
`201`	`201`	`awaitComplete()`
`202`	`202`	`}`
`203`	`203`	`}`
`204`		`-}`
	`204`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ class GroupEmitter {`
`14`	`14`	`_groups.tryEmit(conversation)`
`15`	`15`	`}`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,4 @@ data class Message(val client: Client, private val libXMTPMessage: FfiMessage) {`
`32`	`32`	`throw XMTPException("Error decoding message", e)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package org.xmtp.android.library.libxmtp`
`2`	`2`
`3`		`-import android.util.Log`
`4`	`3`	`import kotlinx.coroutines.flow.MutableSharedFlow`
`5`	`4`	`import kotlinx.coroutines.flow.asSharedFlow`
`6`	`5`	`import uniffi.xmtpv3.FfiMessage`
`@@ -15,4 +14,4 @@ class MessageEmitter {`
`15`	`14`	`_messages.tryEmit(message)`
`16`	`15`	`}`
`17`	`16`	`}`
`18`		`-}`
	`17`	`+}`