Merge pull request #523 from code-payments/release/2.1.8

release/2.1.8

Author: jeffyanta

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

@@ -21,6 +21,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 0
 
       - name: Setup Java env
         uses: actions/setup-java@v3

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

@@ -17,6 +17,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 0
 
       - name: Setup Java env
         uses: actions/setup-java@v3

api/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.google.protobuf.gradle.protobuf
+
 plugins {
     id(Plugins.android_library)
     id(Plugins.kotlin_android)
@@ -70,10 +72,14 @@ android {
 
 dependencies {
     implementation(project(":common:resources"))
+    api(project(":service:models"))
+    implementation(project(":crypto:ed25519"))
+    implementation(project(":crypto:kin"))
 
     implementation(Libs.rxjava)
     implementation(Libs.kotlinx_coroutines_core)
     implementation(Libs.kotlinx_serialization_json)
+    implementation(Libs.kotlinx_datetime)
     implementation(Libs.inject)
 
     implementation(Libs.grpc_okhttp)

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

@@ -269,6 +269,10 @@ class AnalyticsManager @Inject constructor(
         )
     }
 
+    override fun tipCardLinked() {
+        track(Name.TipCardLinked)
+    }
+
     override fun backgroundSwapInitiated() {
         track(Name.BackgroundSwap)
     }
@@ -319,11 +323,12 @@ class AnalyticsManager @Inject constructor(
         Login("Login"),
         CreateAccount("Create Account"),
         UnintentionalLogout("Unintentional Logout"),
+        TipCardLinked("Tip Card Linked"),
 
         //Bill
         Bill("Bill"),
         Request("Request Card"),
-        TipCard("TIp Card"),
+        TipCard("Tip Card"),
 
         //Transfer
         Transfer("Transfer"),

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

@@ -45,6 +45,7 @@ interface AnalyticsService {
     fun withdrawal(amount: KinAmount, successful: Boolean)
 
     fun tipCardShown(username: String)
+    fun tipCardLinked()
 
     fun backgroundSwapInitiated()
     fun unintentionalLogout()
@@ -93,6 +94,7 @@ class AnalyticsServiceNull : AnalyticsService {
     override fun upgradePrivacy(successful: Boolean, intentId: PublicKey, actionCount: Int) = Unit
     override fun onBillReceived() = Unit
     override fun tipCardShown(username: String) = Unit
+    override fun tipCardLinked() = Unit
     override fun backgroundSwapInitiated() = Unit
     override fun unintentionalLogout() = Unit
     override fun appSettingToggled(setting: AppSetting, value: Boolean) = Unit

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

@@ -1,5 +1,7 @@
 package com.getcode.db
 
+import androidx.paging.PagingData
+import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
@@ -19,6 +21,10 @@ interface ConversationDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun upsertConversations(vararg conversation: Conversation)
 
+    @RewriteQueriesToDropUnusedColumns
+    @Query("SELECT * FROM conversations")
+    fun observeConversations(): PagingSource<Int, Conversation>
+
     @RewriteQueriesToDropUnusedColumns
     @Query("SELECT * FROM conversations LEFT JOIN conversation_pointers ON conversations.idBase58 = conversation_pointers.conversationIdBase58 WHERE conversations.idBase58 = :id")
     fun observeConversation(id: String): Flow<ConversationWithLastPointers?>

api/src/main/java/com/getcode/mapper/ConversationMapper.kt

@@ -4,7 +4,6 @@ import com.getcode.model.Conversation
 import com.getcode.model.chat.Chat
 import com.getcode.model.chat.ChatType
 import com.getcode.model.chat.self
-import com.getcode.network.TipController
 import com.getcode.network.localized
 import com.getcode.network.repository.base58
 import com.getcode.util.resources.ResourceHelper

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

@@ -17,13 +17,18 @@ data class TipCardFeature(
     override val available: Boolean = true, // always available
 ): Feature
 
-data class TipChatFeature(
-    override val enabled: Boolean = BetaOptions.Defaults.tipsChatEnabled,
+data class TipCardOnHomeScreenFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.tipCardOnHomeScreen,
     override val available: Boolean = true, // always available
 ): Feature
 
-data class TipChatCashFeature(
-    override val enabled: Boolean = BetaOptions.Defaults.tipsChatCashEnabled,
+data class ConversationsFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.conversationsEnabled,
+    override val available: Boolean = true, // always available
+): Feature
+
+data class ConversationCashFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.conversationCashEnabled,
     override val available: Boolean = true, // always available
 ): Feature
 

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

@@ -63,10 +63,13 @@ data class Kin(val quarks: Long): Value {
     }
 }
 
-fun min(a: Kin, b: Kin): Kin {
+private fun min(a: Kin, b: Kin): Kin {
     if (a.quarks > b.quarks) {
         return b
     }
 
     return a
-}
+}
+
+val Kin.description: String
+    get() = "K ${toKinTruncating().quarks} ${fractionalQuarks()}"

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

@@ -25,6 +25,7 @@ sealed class PrefsBool(val value: String) {
     data object IS_ELIGIBLE_GIVE_FIRST_KIN_AIRDROP: PrefsBool("is_eligible_give_first_kin_airdrop"), InternalRouting
     data object HAS_REMOVED_LOCAL_CURRENCY: PrefsBool("removed_local_currency"), InternalRouting
     data object SEEN_TIP_CARD : PrefsBool("seen_tip_card"), InternalRouting
+    data object STARTED_TIP_CONNECT: PrefsBool("started_tip_connect"), InternalRouting
 
     data object BUY_MODULE_AVAILABLE : PrefsBool("buy_module_available"), InternalRouting
 
@@ -43,14 +44,14 @@ sealed class PrefsBool(val value: String) {
     data object SHOW_CONNECTIVITY_STATUS: PrefsBool("debug_no_network"), BetaFlag
     data object GIVE_REQUESTS_ENABLED: PrefsBool("give_requests_enabled"), BetaFlag
     data object BUY_MODULE_ENABLED : PrefsBool("buy_kin_enabled"), BetaFlag
-
-
     data object CHAT_UNSUB_ENABLED: PrefsBool("chat_unsub_enabled"), BetaFlag
     data object TIPS_ENABLED : PrefsBool("tips_enabled"), BetaFlag
-    data object TIPS_CHAT_ENABLED: PrefsBool("tips_chat_enabled"), BetaFlag
-    data object TIPS_CHAT_CASH_ENABLED: PrefsBool("tips_chat_cash_enabled"), BetaFlag
+    data object CONVERSATIONS_ENABLED: PrefsBool("conversations_enabled"), BetaFlag
+    data object CONVERSATION_CASH_ENABLED: PrefsBool("convo_cash_enabled"), BetaFlag
     data object BALANCE_CURRENCY_SELECTION_ENABLED: PrefsBool("balance_currency_enabled"), BetaFlag
     data object KADO_WEBVIEW_ENABLED : PrefsBool("kado_inapp_enabled"), BetaFlag
+    data object SHARE_TWEET_TO_TIP : PrefsBool("share_tweet_to_tip"), BetaFlag
+    data object TIP_CARD_ON_HOMESCREEN: PrefsBool("tip_card_on_home_screen"), BetaFlag
 }
 
 val APP_SETTINGS: List<AppSetting> = listOf(PrefsBool.CAMERA_START_BY_DEFAULT, PrefsBool.REQUIRE_BIOMETRICS)