Fixed tests fixed lint

Author: Alex Risch

library/src/androidTest/java/org/xmtp/android/library/FramesTest.kt

@@ -16,7 +16,6 @@ import java.net.HttpURLConnection
 import java.net.URL
 
 @RunWith(AndroidJUnit4::class)
-
 class FramesTest {
     @Test
     fun testFramesClient() {
@@ -49,10 +48,10 @@ class FramesTest {
             signedPayload = framesClient.signFrameAction(inputs = frameInputs)
         }
         val postUrl = metadata.extractedTags["fc:frame:post_url"]
-            ?: throw Exception("postUrl should exist")
+        assertNotNull(postUrl)
         val response: GetMetadataResponse
         runBlocking {
-            response = framesClient.proxy.post(url = postUrl, payload = signedPayload)
+            response = framesClient.proxy.post(url = postUrl!!, payload = signedPayload)
         }
 
         assertEquals(response.extractedTags["fc:frame"], "vNext")

library/src/main/java/org/xmtp/android/library/frames/FramesClient.kt

@@ -1,8 +1,6 @@
 package org.xmtp.android.library.frames
 
 import android.util.Base64
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.xmtp.android.library.Client
 import org.xmtp.android.library.frames.Constants.PROTOCOL_VERSION
 import org.xmtp.android.library.messages.PrivateKeyBuilder
@@ -15,30 +13,35 @@ import org.xmtp.proto.message.contents.Frames.FrameAction
 
 class FramesClient(private val xmtpClient: Client, var proxy: OpenFramesProxy = OpenFramesProxy()) {
 
-    suspend fun signFrameAction(inputs: FrameActionInputs): FramePostPayload = withContext(Dispatchers.IO) {
+    suspend fun signFrameAction(inputs: FrameActionInputs): FramePostPayload {
         val opaqueConversationIdentifier = buildOpaqueIdentifier(inputs)
         val frameUrl = inputs.frameUrl
         val buttonIndex = inputs.buttonIndex
-        val inputText = inputs.inputText ?: ""
-        val state = inputs.state ?: ""
+        val inputText = inputs.inputText
+        val state = inputs.state
         val now = System.currentTimeMillis() / 1000
-        val test = FrameActionBody
+        val frameActionBuilder = FrameActionBody
             .newBuilder()
             .setFrameUrl(frameUrl)
             .setButtonIndex(buttonIndex)
-            .setInputText(inputText)
-            .setState(state)
-            .setUnixTimestamp(
-            now.toInt()
-        )
+            .setOpaqueConversationIdentifier(opaqueConversationIdentifier)
+            .setTimestamp(now)
+            .setUnixTimestamp(now.toInt())
 
-        val toSign = test.build()
+        if (inputText != null) {
+            frameActionBuilder.inputText = inputText
+        }
+        if (state != null) {
+            frameActionBuilder.state = state
+        }
+
+        val toSign = frameActionBuilder.build()
         val signedAction = Base64.encodeToString(buildSignedFrameAction(toSign), Base64.NO_WRAP)
 
         val untrustedData = FramePostUntrustedData(frameUrl, now, buttonIndex, inputText, state, xmtpClient.address, opaqueConversationIdentifier, now.toInt())
         val trustedData = FramePostTrustedData(signedAction)
 
-        FramePostPayload("xmtp@$PROTOCOL_VERSION", untrustedData, trustedData)
+        return FramePostPayload("xmtp@$PROTOCOL_VERSION", untrustedData, trustedData)
     }
 
     private suspend fun signDigest(digest: ByteArray): Signature {
@@ -47,7 +50,7 @@ class FramesClient(private val xmtpClient: Client, var proxy: OpenFramesProxy =
         return PrivateKeyBuilder(privateKey).sign(digest)
     }
 
-    private suspend fun getPublicKeyBundle():  SignedPublicKeyBundle  {
+    private fun getPublicKeyBundle(): SignedPublicKeyBundle {
         return xmtpClient.keys.getPublicKeyBundle()
     }
 
@@ -59,9 +62,9 @@ class FramesClient(private val xmtpClient: Client, var proxy: OpenFramesProxy =
         val frameAction = FrameAction.newBuilder()
             .setActionBody(actionBodyInputs.toByteString())
             .setSignature(signature)
-            .setSignedPublicKeyBundle(publicKeyBundle).build();
+            .setSignedPublicKeyBundle(publicKeyBundle).build()
 
-        return frameAction.toByteArray();
+        return frameAction.toByteArray()
     }
 
     private fun buildOpaqueIdentifier(inputs: FrameActionInputs): String {

library/src/main/java/org/xmtp/android/library/frames/ProxyClient.kt

@@ -18,7 +18,7 @@ class ProxyClient(private val baseUrl: String) {
         return Gson().fromJson(response, GetMetadataResponse::class.java)
     }
 
-    suspend fun post(url: String, payload: Any): GetMetadataResponse {
+    fun post(url: String, payload: Any): GetMetadataResponse {
         val connection = URL("$baseUrl?url=${java.net.URLEncoder.encode(url, "UTF-8")}").openConnection() as HttpURLConnection
         connection.requestMethod = "POST"
         connection.setRequestProperty("Content-Type", "application/json; utf-8")