android/Signal-Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-09-26 07:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add donate_friend remote megaphone action.

Browse Source
This commit is contained in:
Cody Henthorne
2024-01-10 11:52:55 -05:00
committed by GitHub
parent dd1a15c249
commit 20f8c69b07
5 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
View File

@ -615,6 +615,13 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
}
)
clickPref(
title = DSLSettingsText.from("Add donate_friend remote megaphone"),
onClick = {
viewModel.addRemoteDonateFriendMegaphone()
}
)
dividerPref()
sectionHeaderPref(DSLSettingsText.from("CDS"))

4
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsRepository.kt
View File

@ -64,7 +64,7 @@ class InternalSettingsRepository(context: Context) {
}
}
fun addRemoteDonateMegaphone() {
fun addRemoteMegaphone(actionId: RemoteMegaphoneRecord.ActionId) {
SignalExecutors.UNBOUNDED.execute {
val record = RemoteMegaphoneRecord(
uuid = UUID.randomUUID().toString(),
@ -75,7 +75,7 @@ class InternalSettingsRepository(context: Context) {
doNotShowAfter = System.currentTimeMillis() + 28.days.inWholeMilliseconds,
showForNumberOfDays = 30,
conditionalId = null,
primaryActionId = RemoteMegaphoneRecord.ActionId.DONATE,
primaryActionId = actionId,
secondaryActionId = RemoteMegaphoneRecord.ActionId.SNOOZE,
imageUrl = "/static/release-notes/donate-heart.png",
title = "Donate Test",

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt
View File

@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import io.reactivex.rxjava3.core.Observable
import org.signal.ringrtc.CallManager
import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob
import org.thoughtcrime.securesms.keyvalue.InternalValues
import org.thoughtcrime.securesms.keyvalue.SignalStore
@ -128,7 +129,11 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
}
fun addRemoteDonateMegaphone() {
repository.addRemoteDonateMegaphone()
repository.addRemoteMegaphone(RemoteMegaphoneRecord.ActionId.DONATE)
}
fun addRemoteDonateFriendMegaphone() {
repository.addRemoteMegaphone(RemoteMegaphoneRecord.ActionId.DONATE_FOR_FRIEND)
}
fun refresh() {

3
app/src/main/java/org/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord.kt
View File

@ -50,7 +50,8 @@ data class RemoteMegaphoneRecord(
enum class ActionId(val id: String, val isDonateAction: Boolean = false) {
SNOOZE("snooze"),
FINISH("finish"),
DONATE("donate", true);
DONATE("donate", true),
DONATE_FOR_FRIEND("donate_friend", true);
companion object {
fun from(id: String?): ActionId? {

9
app/src/main/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository.kt
View File

@ -9,6 +9,7 @@ import org.json.JSONArray
import org.json.JSONException
import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.badges.gifts.flow.GiftFlowActivity
import org.thoughtcrime.securesms.badges.models.Badge
import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalActivity
@ -56,10 +57,16 @@ object RemoteMegaphoneRepository {
snooze.run(context, controller, remote)
}
private val donateForFriend: Action = Action { context, controller, remote ->
controller.onMegaphoneNavigationRequested(Intent(context, GiftFlowActivity::class.java))
snooze.run(context, controller, remote)
}
private val actions = mapOf(
ActionId.SNOOZE.id to snooze,
ActionId.FINISH.id to finish,
ActionId.DONATE.id to donate
ActionId.DONATE.id to donate,
ActionId.DONATE_FOR_FRIEND.id to donateForFriend
)
@WorkerThread