Skip to content

Commit 325074f

Browse files
authored
Merge pull request #523 from code-payments/release/2.1.8
release/2.1.8
2 parents 6f4139b + bfc061a commit 325074f

File tree

220 files changed

+2334
-916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+2334
-916
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@master
24+
with:
25+
fetch-depth: 0
2426

2527
- name: Setup Java env
2628
uses: actions/setup-java@v3

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@master
20+
with:
21+
fetch-depth: 0
2022

2123
- name: Setup Java env
2224
uses: actions/setup-java@v3

api/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.google.protobuf.gradle.protobuf
2+
13
plugins {
24
id(Plugins.android_library)
35
id(Plugins.kotlin_android)
@@ -70,10 +72,14 @@ android {
7072

7173
dependencies {
7274
implementation(project(":common:resources"))
75+
api(project(":service:models"))
76+
implementation(project(":crypto:ed25519"))
77+
implementation(project(":crypto:kin"))
7378

7479
implementation(Libs.rxjava)
7580
implementation(Libs.kotlinx_coroutines_core)
7681
implementation(Libs.kotlinx_serialization_json)
82+
implementation(Libs.kotlinx_datetime)
7783
implementation(Libs.inject)
7884

7985
implementation(Libs.grpc_okhttp)

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,10 @@ class AnalyticsManager @Inject constructor(
269269
)
270270
}
271271

272+
override fun tipCardLinked() {
273+
track(Name.TipCardLinked)
274+
}
275+
272276
override fun backgroundSwapInitiated() {
273277
track(Name.BackgroundSwap)
274278
}
@@ -319,11 +323,12 @@ class AnalyticsManager @Inject constructor(
319323
Login("Login"),
320324
CreateAccount("Create Account"),
321325
UnintentionalLogout("Unintentional Logout"),
326+
TipCardLinked("Tip Card Linked"),
322327

323328
//Bill
324329
Bill("Bill"),
325330
Request("Request Card"),
326-
TipCard("TIp Card"),
331+
TipCard("Tip Card"),
327332

328333
//Transfer
329334
Transfer("Transfer"),

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ interface AnalyticsService {
4545
fun withdrawal(amount: KinAmount, successful: Boolean)
4646

4747
fun tipCardShown(username: String)
48+
fun tipCardLinked()
4849

4950
fun backgroundSwapInitiated()
5051
fun unintentionalLogout()
@@ -93,6 +94,7 @@ class AnalyticsServiceNull : AnalyticsService {
9394
override fun upgradePrivacy(successful: Boolean, intentId: PublicKey, actionCount: Int) = Unit
9495
override fun onBillReceived() = Unit
9596
override fun tipCardShown(username: String) = Unit
97+
override fun tipCardLinked() = Unit
9698
override fun backgroundSwapInitiated() = Unit
9799
override fun unintentionalLogout() = Unit
98100
override fun appSettingToggled(setting: AppSetting, value: Boolean) = Unit

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.getcode.db
22

3+
import androidx.paging.PagingData
4+
import androidx.paging.PagingSource
35
import androidx.room.Dao
46
import androidx.room.Delete
57
import androidx.room.Insert
@@ -19,6 +21,10 @@ interface ConversationDao {
1921
@Insert(onConflict = OnConflictStrategy.REPLACE)
2022
suspend fun upsertConversations(vararg conversation: Conversation)
2123

24+
@RewriteQueriesToDropUnusedColumns
25+
@Query("SELECT * FROM conversations")
26+
fun observeConversations(): PagingSource<Int, Conversation>
27+
2228
@RewriteQueriesToDropUnusedColumns
2329
@Query("SELECT * FROM conversations LEFT JOIN conversation_pointers ON conversations.idBase58 = conversation_pointers.conversationIdBase58 WHERE conversations.idBase58 = :id")
2430
fun observeConversation(id: String): Flow<ConversationWithLastPointers?>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.getcode.model.Conversation
44
import com.getcode.model.chat.Chat
55
import com.getcode.model.chat.ChatType
66
import com.getcode.model.chat.self
7-
import com.getcode.network.TipController
87
import com.getcode.network.localized
98
import com.getcode.network.repository.base58
109
import com.getcode.util.resources.ResourceHelper

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ data class TipCardFeature(
1717
override val available: Boolean = true, // always available
1818
): Feature
1919

20-
data class TipChatFeature(
21-
override val enabled: Boolean = BetaOptions.Defaults.tipsChatEnabled,
20+
data class TipCardOnHomeScreenFeature(
21+
override val enabled: Boolean = BetaOptions.Defaults.tipCardOnHomeScreen,
2222
override val available: Boolean = true, // always available
2323
): Feature
2424

25-
data class TipChatCashFeature(
26-
override val enabled: Boolean = BetaOptions.Defaults.tipsChatCashEnabled,
25+
data class ConversationsFeature(
26+
override val enabled: Boolean = BetaOptions.Defaults.conversationsEnabled,
27+
override val available: Boolean = true, // always available
28+
): Feature
29+
30+
data class ConversationCashFeature(
31+
override val enabled: Boolean = BetaOptions.Defaults.conversationCashEnabled,
2732
override val available: Boolean = true, // always available
2833
): Feature
2934

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,13 @@ data class Kin(val quarks: Long): Value {
6363
}
6464
}
6565

66-
fun min(a: Kin, b: Kin): Kin {
66+
private fun min(a: Kin, b: Kin): Kin {
6767
if (a.quarks > b.quarks) {
6868
return b
6969
}
7070

7171
return a
72-
}
72+
}
73+
74+
val Kin.description: String
75+
get() = "K ${toKinTruncating().quarks} ${fractionalQuarks()}"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ sealed class PrefsBool(val value: String) {
2525
data object IS_ELIGIBLE_GIVE_FIRST_KIN_AIRDROP: PrefsBool("is_eligible_give_first_kin_airdrop"), InternalRouting
2626
data object HAS_REMOVED_LOCAL_CURRENCY: PrefsBool("removed_local_currency"), InternalRouting
2727
data object SEEN_TIP_CARD : PrefsBool("seen_tip_card"), InternalRouting
28+
data object STARTED_TIP_CONNECT: PrefsBool("started_tip_connect"), InternalRouting
2829

2930
data object BUY_MODULE_AVAILABLE : PrefsBool("buy_module_available"), InternalRouting
3031

@@ -43,14 +44,14 @@ sealed class PrefsBool(val value: String) {
4344
data object SHOW_CONNECTIVITY_STATUS: PrefsBool("debug_no_network"), BetaFlag
4445
data object GIVE_REQUESTS_ENABLED: PrefsBool("give_requests_enabled"), BetaFlag
4546
data object BUY_MODULE_ENABLED : PrefsBool("buy_kin_enabled"), BetaFlag
46-
47-
4847
data object CHAT_UNSUB_ENABLED: PrefsBool("chat_unsub_enabled"), BetaFlag
4948
data object TIPS_ENABLED : PrefsBool("tips_enabled"), BetaFlag
50-
data object TIPS_CHAT_ENABLED: PrefsBool("tips_chat_enabled"), BetaFlag
51-
data object TIPS_CHAT_CASH_ENABLED: PrefsBool("tips_chat_cash_enabled"), BetaFlag
49+
data object CONVERSATIONS_ENABLED: PrefsBool("conversations_enabled"), BetaFlag
50+
data object CONVERSATION_CASH_ENABLED: PrefsBool("convo_cash_enabled"), BetaFlag
5251
data object BALANCE_CURRENCY_SELECTION_ENABLED: PrefsBool("balance_currency_enabled"), BetaFlag
5352
data object KADO_WEBVIEW_ENABLED : PrefsBool("kado_inapp_enabled"), BetaFlag
53+
data object SHARE_TWEET_TO_TIP : PrefsBool("share_tweet_to_tip"), BetaFlag
54+
data object TIP_CARD_ON_HOMESCREEN: PrefsBool("tip_card_on_home_screen"), BetaFlag
5455
}
5556

5657
val APP_SETTINGS: List<AppSetting> = listOf(PrefsBool.CAMERA_START_BY_DEFAULT, PrefsBool.REQUIRE_BIOMETRICS)

0 commit comments

Comments
 (0)