Skip to content

Commit db34f93

Browse files
committed
Disable pro details fetching
1 parent cb1bd3c commit db34f93

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

app/src/main/java/org/thoughtcrime/securesms/pro/FetchProDetailsWorker.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.Flow
2020
import kotlinx.coroutines.flow.mapNotNull
2121
import org.session.libsession.snode.SnodeClock
2222
import org.session.libsession.utilities.ConfigFactoryProtocol
23+
import org.session.libsession.utilities.TextSecurePreferences
2324
import org.session.libsignal.exceptions.NonRetryableException
2425
import org.session.libsignal.utilities.Log
2526
import org.thoughtcrime.securesms.auth.LoginStateRepository
@@ -48,8 +49,14 @@ class FetchProDetailsWorker @AssistedInject constructor(
4849
private val loginStateRepository: LoginStateRepository,
4950
private val snodeClock: SnodeClock,
5051
private val configFactory: ConfigFactoryProtocol,
52+
private val prefs: TextSecurePreferences,
5153
) : CoroutineWorker(context, params) {
5254
override suspend fun doWork(): Result {
55+
if (!prefs.forcePostPro()) {
56+
Log.d(TAG, "Pro details fetch skipped because pro is not enabled")
57+
return Result.success()
58+
}
59+
5360
val proMasterKey =
5461
requireNotNull(loginStateRepository.peekLoginState()?.seeded?.proMasterPrivateKey) {
5562
"User must be logged in to fetch pro details"

app/src/main/java/org/thoughtcrime/securesms/pro/ProDetailsRepository.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.map
1212
import kotlinx.coroutines.flow.onStart
1313
import kotlinx.coroutines.flow.stateIn
1414
import org.session.libsession.snode.SnodeClock
15+
import org.session.libsession.utilities.TextSecurePreferences
1516
import org.session.libsignal.utilities.Log
1617
import org.thoughtcrime.securesms.auth.LoginStateRepository
1718
import org.thoughtcrime.securesms.debugmenu.DebugLogGroup
@@ -29,6 +30,7 @@ class ProDetailsRepository @Inject constructor(
2930
private val snodeClock: SnodeClock,
3031
@ManagerScope scope: CoroutineScope,
3132
loginStateRepository: LoginStateRepository,
33+
private val prefs: TextSecurePreferences,
3234
) {
3335
sealed interface LoadState {
3436
val lastUpdated: Pair<ProDetails, Instant>?
@@ -83,6 +85,11 @@ class ProDetailsRepository @Inject constructor(
8385
* made regardless of the freshness of the last update.
8486
*/
8587
fun requestRefresh(force: Boolean = false) {
88+
if (!prefs.forcePostPro()) {
89+
Log.d(DebugLogGroup.PRO_DATA.label, "Pro hasn't been enabled, skipping refresh")
90+
return
91+
}
92+
8693
val currentState = loadState.value
8794
if (!force && (currentState is LoadState.Loading || currentState is LoadState.Loaded) &&
8895
currentState.lastUpdated?.second?.plusSeconds(MIN_UPDATE_INTERVAL_SECONDS)

0 commit comments

Comments
 (0)