Merge pull request #560 from code-payments/release/2.1.11

release 2.1.11

Author: jeffyanta

.github/workflows/build-upload-android-internal.yml

@@ -89,7 +89,7 @@ jobs:
           SERVICE_ACCOUNT_KEY_JSON: ${{ steps.service_account_json_file.outputs.filePath }}
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: assets
           path: |

api/src/main/java/com/getcode/analytics/AnalyticsManager.kt

@@ -17,12 +17,17 @@ import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
-enum class Action(val value: String) {
-    CreateAccount("Action: Create Account"),
-    EnterPhone("Action: Enter Phone"),
-    VerifyPhone("Action: Verify Phone"),
-    ConfirmAccessKey("Action: Confirm Access Key"),
-    CompletedOnboarding("Action: Completed Onboarding"),
+sealed class Action(private val _value: String) {
+    data object CreateAccount : Action("Create Account")
+    data object EnterPhone : Action("Enter Phone")
+    data object VerifyPhone : Action("Verify Phone")
+    data object ConfirmAccessKey : Action("Confirm Access Key")
+    data object CompletedOnboarding : Action("Completed Onboarding")
+    data object OpenConnectAccount: Action("Open Connect X Screen")
+    data object MessageCodeOnX: Action("Message Code on X")
+
+    val value: String
+        get() = "Action: $_value"
 }
 
 enum class ActionSource(val value: String) {

api/src/main/java/com/getcode/db/ConversationDao.kt

@@ -1,14 +1,12 @@
 package com.getcode.db
 
-import androidx.paging.PagingData
 import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.RewriteQueriesToDropUnusedColumns
-import androidx.room.Transaction
 import com.getcode.model.Conversation
 import com.getcode.model.ConversationWithLastPointers
 import com.getcode.model.ID

api/src/main/java/com/getcode/model/Fiat.kt

@@ -1,7 +1,10 @@
 package com.getcode.model
 
+import kotlinx.serialization.Serializable
+
 sealed interface Value
 
+@Serializable
 data class Fiat(
     val currency: CurrencyCode,
     val amount: Double,

api/src/main/java/com/getcode/model/KinAmount.kt

@@ -27,6 +27,8 @@ data class KinAmount(
     }
 
     companion object {
+        val Zero = newInstance(0, Rate.oneToOne)
+
         fun newInstance(kin: Int, rate: Rate): KinAmount {
             return newInstance(fromKin(kin), rate)
         }

api/src/main/java/com/getcode/model/TwitterUser.kt

@@ -2,6 +2,7 @@ package com.getcode.model
 
 import android.webkit.MimeTypeMap
 import com.codeinc.gen.user.v1.IdentityService
+import com.codeinc.gen.user.v1.friendshipCostOrNull
 import com.getcode.solana.keys.PublicKey
 import com.getcode.solana.keys.base58
 import com.getcode.utils.serializer.PublicKeyAsStringSerializer
@@ -21,7 +22,9 @@ data class TwitterUser(
     override val imageUrl: String?,
     val displayName: String,
     val followerCount: Int,
-    val verificationStatus: VerificationStatus
+    val verificationStatus: VerificationStatus,
+    val costOfFriendship: Fiat,
+    val isFriend: Boolean,
 ): TipMetadata {
 
     override val platform: String = "X"
@@ -52,7 +55,10 @@ data class TwitterUser(
                 imageUrl = avatarUrl,
                 followerCount = proto.followerCount,
                 tipAddress = tipAddress,
-                verificationStatus = VerificationStatus.entries.getOrNull(proto.verifiedTypeValue) ?: VerificationStatus.unknown
+                verificationStatus = VerificationStatus.entries.getOrNull(proto.verifiedTypeValue) ?: VerificationStatus.unknown,
+//                costOfFriendship = kotlin.runCatching { proto.friendshipCostOrNull }.getOrNull()
+                costOfFriendship = Fiat(currency = CurrencyCode.USD, amount = 1.00),
+                isFriend = runCatching { proto.isFriend }.getOrNull() ?: false
             )
         }
     }

api/src/main/java/com/getcode/model/chat/MessageContent.kt

@@ -340,9 +340,9 @@ sealed interface MessageContent {
             proto: MessageContentV1,
         ): MessageContent? {
             return when (proto.typeCase) {
-                ChatServiceV1.Content.TypeCase.LOCALIZED -> Localized(
+                ChatServiceV1.Content.TypeCase.SERVER_LOCALIZED -> Localized(
                     isFromSelf = false,
-                    value = proto.localized.keyOrText
+                    value = proto.serverLocalized.keyOrText
                 )
 
                 ChatServiceV1.Content.TypeCase.EXCHANGE_DATA -> {

api/src/main/java/com/getcode/network/ConversationListController.kt

@@ -0,0 +1,53 @@
+package com.getcode.network
+
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.getcode.model.chat.Chat
+import javax.inject.Inject
+
+class ConversationListController @Inject constructor(
+    private val historyController: ChatHistoryController,
+) {
+    private val pagingConfig = PagingConfig(pageSize = 20)
+
+    fun observeConversations() =
+        Pager(
+            config = pagingConfig,
+            initialKey = null,
+        ) { ChatPagingSource(historyController.chats.value.orEmpty()) }.flow
+}
+
+class ChatPagingSource(
+    private val chats: List<Chat>
+) : PagingSource<Int, Chat>() {
+
+    override fun getRefreshKey(state: PagingState<Int, Chat>): Int? {
+        return state.anchorPosition?.let { anchorPosition ->
+            val anchorPage = state.closestPageToPosition(anchorPosition)
+            anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Chat> {
+        val currentList = chats
+        val position = params.key ?: 0
+        val pageSize = params.loadSize
+
+        return try {
+            val items = currentList.subList(
+                position.coerceAtMost(currentList.size),
+                (position + pageSize).coerceAtMost(currentList.size)
+            )
+
+            LoadResult.Page(
+                data = items,
+                prevKey = if (position > 0) position - pageSize else null,
+                nextKey = if (position + pageSize < currentList.size) position + pageSize else null
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+}

api/src/main/java/com/getcode/network/TipController.kt

@@ -39,6 +39,7 @@ import kotlin.concurrent.fixedRateTimer
 
 typealias TipUser = Pair<String, CodePayload>
 
+
 @Singleton
 class TipController @Inject constructor(
     private val client: Client,
@@ -108,10 +109,11 @@ class TipController @Inject constructor(
 
     private suspend fun callForConnectedUser() {
         Timber.d("twitter poll call")
-        val tipAddress = SessionManager.getOrganizer()?.primaryVault ?: return
+        val organizer = SessionManager.getOrganizer() ?: return
+        val tipAddress = organizer.primaryVault
         // only set lastPoll if we actively attempt to reach RPC
         lastPoll = System.currentTimeMillis()
-        client.fetchTwitterUser(tipAddress)
+        client.fetchTwitterUser(organizer, tipAddress)
             .onSuccess {
                 Timber.d("current user twitter connected @ ${it.username}")
                 prefRepository.set(PrefsString.KEY_TIP_ACCOUNT, Json.encodeToString(it))
@@ -152,10 +154,11 @@ class TipController @Inject constructor(
     }
 
     suspend fun fetch(username: String): TwitterUser? {
+        val organizer = SessionManager.getOrganizer() ?: return null
         val key = username.lowercase()
         return cachedUsers.getOrPutIfNonNull(key) {
             Timber.d("fetching user $username")
-            client.fetchTwitterUser(username).getOrThrow()
+            client.fetchTwitterUser(organizer, username).getOrThrow()
         }
     }
 

api/src/main/java/com/getcode/network/TwitterUserController.kt

@@ -0,0 +1,38 @@
+package com.getcode.network
+
+import com.getcode.manager.SessionManager
+import com.getcode.model.TwitterUser
+import com.getcode.network.client.Client
+import com.getcode.network.client.fetchTwitterUser
+import com.getcode.network.repository.BetaFlagsRepository
+import com.getcode.network.repository.PrefRepository
+import com.getcode.utils.getOrPutIfNonNull
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TwitterUserController @Inject constructor(
+    private val client: Client,
+    betaFlags: BetaFlagsRepository,
+    private val prefRepository: PrefRepository,
+) {
+    private var cachedUsers = mutableMapOf<String, TwitterUser>()
+
+
+    suspend fun fetchUser(username: String, ignoreCache: Boolean = false): TwitterUser? {
+        val organizer = SessionManager.getOrganizer() ?: return null
+        val key = username.lowercase()
+
+        if (ignoreCache) {
+            val user = client.fetchTwitterUser(organizer, username).getOrThrow()
+            cachedUsers[key] = user
+            return user
+        }
+
+        return cachedUsers.getOrPutIfNonNull(key) {
+            Timber.d("fetching user $username")
+            client.fetchTwitterUser(organizer, username).getOrThrow()
+        }
+    }
+}