[SES-2970] - Add expired groups handling (#962)
SessionHero01
1 month ago
committed by
GitHub
parent
b3623f2874
commit
097dc273b0
@ -1,71 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms.dependencies
|
|
||||||
|
|
||||||
import dagger.Lazy
|
|
||||||
import kotlinx.coroutines.CoroutineDispatcher
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
|
||||||
import network.loki.messenger.libsession_util.util.GroupInfo
|
|
||||||
import org.session.libsession.database.StorageProtocol
|
|
||||||
import org.session.libsession.messaging.groups.GroupManagerV2
|
|
||||||
import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller
|
|
||||||
import org.session.libsession.snode.SnodeClock
|
|
||||||
import org.session.libsession.utilities.getGroup
|
|
||||||
import org.session.libsignal.database.LokiAPIDatabaseProtocol
|
|
||||||
import org.session.libsignal.utilities.AccountId
|
|
||||||
import java.util.concurrent.ConcurrentHashMap
|
|
||||||
|
|
||||||
class PollerFactory(
|
|
||||||
private val scope: CoroutineScope,
|
|
||||||
private val executor: CoroutineDispatcher,
|
|
||||||
private val configFactory: ConfigFactory,
|
|
||||||
private val groupManagerV2: Lazy<GroupManagerV2>,
|
|
||||||
private val storage: Lazy<StorageProtocol>,
|
|
||||||
private val lokiApiDatabase: LokiAPIDatabaseProtocol,
|
|
||||||
private val clock: SnodeClock,
|
|
||||||
) {
|
|
||||||
|
|
||||||
private val pollers = ConcurrentHashMap<AccountId, ClosedGroupPoller>()
|
|
||||||
|
|
||||||
fun pollerFor(sessionId: AccountId): ClosedGroupPoller? {
|
|
||||||
// Check if the group is currently in our config and approved, don't start if it isn't
|
|
||||||
val invited = configFactory.getGroup(sessionId)?.invited
|
|
||||||
|
|
||||||
if (invited != false) return null
|
|
||||||
|
|
||||||
return pollers.getOrPut(sessionId) {
|
|
||||||
ClosedGroupPoller(
|
|
||||||
scope = scope,
|
|
||||||
executor = executor,
|
|
||||||
closedGroupSessionId = sessionId,
|
|
||||||
configFactoryProtocol = configFactory,
|
|
||||||
groupManagerV2 = groupManagerV2.get(),
|
|
||||||
storage = storage.get(),
|
|
||||||
lokiApiDatabase = lokiApiDatabase,
|
|
||||||
clock = clock,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun startAll() {
|
|
||||||
configFactory
|
|
||||||
.withUserConfigs { it.userGroups.allClosedGroupInfo() }
|
|
||||||
.filterNot(GroupInfo.ClosedGroupInfo::invited)
|
|
||||||
.forEach { pollerFor(it.groupAccountId)?.start() }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun stopAll() {
|
|
||||||
pollers.forEach { (_, poller) ->
|
|
||||||
poller.stop()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun updatePollers() {
|
|
||||||
val currentGroups = configFactory
|
|
||||||
.withUserConfigs { it.userGroups.allClosedGroupInfo() }.filterNot(GroupInfo.ClosedGroupInfo::invited)
|
|
||||||
val toRemove = pollers.filter { (id, _) -> id !in currentGroups.map { it.groupAccountId } }
|
|
||||||
toRemove.forEach { (id, _) ->
|
|
||||||
pollers.remove(id)?.stop()
|
|
||||||
}
|
|
||||||
startAll()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
package org.thoughtcrime.securesms.groups
|
||||||
|
|
||||||
|
import kotlinx.coroutines.GlobalScope
|
||||||
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.flow.mapNotNull
|
||||||
|
import kotlinx.coroutines.flow.scan
|
||||||
|
import kotlinx.coroutines.flow.stateIn
|
||||||
|
import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller
|
||||||
|
import org.session.libsignal.utilities.AccountId
|
||||||
|
import org.session.libsignal.utilities.Log
|
||||||
|
import javax.inject.Inject
|
||||||
|
import javax.inject.Singleton
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class keeps track of what groups are expired.
|
||||||
|
*
|
||||||
|
* This is done by listening to the state of all group pollers and keeping track of last
|
||||||
|
* known expired state of each group.
|
||||||
|
*
|
||||||
|
* The end result is not persisted and is only available in memory.
|
||||||
|
*/
|
||||||
|
@Singleton
|
||||||
|
class ExpiredGroupManager @Inject constructor(
|
||||||
|
pollerManager: GroupPollerManager,
|
||||||
|
) {
|
||||||
|
@Suppress("OPT_IN_USAGE")
|
||||||
|
val expiredGroups: StateFlow<Set<AccountId>> = pollerManager.watchAllGroupPollingState()
|
||||||
|
.mapNotNull { (groupId, state) ->
|
||||||
|
val expired = (state as? ClosedGroupPoller.StartedState)?.expired
|
||||||
|
|
||||||
|
if (expired == null) {
|
||||||
|
// Poller doesn't know about the expiration state yet, so we skip
|
||||||
|
// the this update. It's important we do this as we want to use the
|
||||||
|
// "last known state" if the poller doesn't know about the expiration state yet.
|
||||||
|
return@mapNotNull null
|
||||||
|
}
|
||||||
|
|
||||||
|
groupId to expired
|
||||||
|
}
|
||||||
|
|
||||||
|
// This scan keep track of all expired groups. Whenever there is a new state for a group
|
||||||
|
// poller, we compare the state with the previous state and update the set of expired groups.
|
||||||
|
.scan(emptySet<AccountId>()) { previous, (groupId, expired) ->
|
||||||
|
if (expired && groupId !in previous) {
|
||||||
|
Log.d("ExpiredGroupManager", "Marking group $groupId expired.")
|
||||||
|
previous + groupId
|
||||||
|
} else if (!expired && groupId in previous) {
|
||||||
|
Log.d("ExpiredGroupManager", "Unmarking group $groupId expired.")
|
||||||
|
previous - groupId
|
||||||
|
} else {
|
||||||
|
previous
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.stateIn(GlobalScope, SharingStarted.Eagerly, emptySet())
|
||||||
|
}
|
||||||
@ -0,0 +1,149 @@
|
|||||||
|
package org.thoughtcrime.securesms.groups
|
||||||
|
|
||||||
|
import dagger.Lazy
|
||||||
|
import kotlinx.coroutines.CoroutineDispatcher
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||||
|
import kotlinx.coroutines.GlobalScope
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.flow.combine
|
||||||
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
|
import kotlinx.coroutines.flow.filter
|
||||||
|
import kotlinx.coroutines.flow.flatMapLatest
|
||||||
|
import kotlinx.coroutines.flow.flowOf
|
||||||
|
import kotlinx.coroutines.flow.map
|
||||||
|
import kotlinx.coroutines.flow.merge
|
||||||
|
import kotlinx.coroutines.flow.onStart
|
||||||
|
import kotlinx.coroutines.flow.scan
|
||||||
|
import kotlinx.coroutines.flow.stateIn
|
||||||
|
import org.session.libsession.database.StorageProtocol
|
||||||
|
import org.session.libsession.messaging.groups.GroupManagerV2
|
||||||
|
import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller
|
||||||
|
import org.session.libsession.snode.SnodeClock
|
||||||
|
import org.session.libsession.utilities.ConfigUpdateNotification
|
||||||
|
import org.session.libsession.utilities.TextSecurePreferences
|
||||||
|
import org.session.libsignal.database.LokiAPIDatabaseProtocol
|
||||||
|
import org.session.libsignal.utilities.AccountId
|
||||||
|
import org.session.libsignal.utilities.Log
|
||||||
|
import org.thoughtcrime.securesms.dependencies.ConfigFactory
|
||||||
|
import org.thoughtcrime.securesms.dependencies.POLLER_SCOPE
|
||||||
|
import org.thoughtcrime.securesms.util.AppVisibilityManager
|
||||||
|
import javax.inject.Inject
|
||||||
|
import javax.inject.Named
|
||||||
|
import javax.inject.Singleton
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class manages the lifecycle of group pollers.
|
||||||
|
*
|
||||||
|
* It listens for changes in the user's groups config and starts or stops pollers as needed. It
|
||||||
|
* also considers the app's visibility state to decide whether to start or stop pollers.
|
||||||
|
*
|
||||||
|
* All the processes here are automatic and you don't need to do anything to start or stop pollers.
|
||||||
|
*
|
||||||
|
* This class also provide state monitoring facilities to check the state of a group poller.
|
||||||
|
*/
|
||||||
|
@Singleton
|
||||||
|
class GroupPollerManager @Inject constructor(
|
||||||
|
@Named(POLLER_SCOPE) scope: CoroutineScope,
|
||||||
|
@Named(POLLER_SCOPE) executor: CoroutineDispatcher,
|
||||||
|
configFactory: ConfigFactory,
|
||||||
|
groupManagerV2: Lazy<GroupManagerV2>,
|
||||||
|
storage: StorageProtocol,
|
||||||
|
lokiApiDatabase: LokiAPIDatabaseProtocol,
|
||||||
|
clock: SnodeClock,
|
||||||
|
preferences: TextSecurePreferences,
|
||||||
|
appVisibilityManager: AppVisibilityManager,
|
||||||
|
) {
|
||||||
|
@Suppress("OPT_IN_USAGE")
|
||||||
|
private val activeGroupPollers: StateFlow<Map<AccountId, ClosedGroupPoller>> =
|
||||||
|
combine(
|
||||||
|
preferences.watchLocalNumber(),
|
||||||
|
appVisibilityManager.isAppVisible
|
||||||
|
) { localNumber, visible -> localNumber != null && visible }
|
||||||
|
.distinctUntilChanged()
|
||||||
|
|
||||||
|
// This flatMap produces a flow of groups that should be polled now
|
||||||
|
.flatMapLatest { shouldPoll ->
|
||||||
|
if (shouldPoll) {
|
||||||
|
(configFactory.configUpdateNotifications
|
||||||
|
.filter { it is ConfigUpdateNotification.UserConfigsMerged || it == ConfigUpdateNotification.UserConfigsModified } as Flow<*>)
|
||||||
|
.onStart { emit(Unit) }
|
||||||
|
.map {
|
||||||
|
configFactory.withUserConfigs { it.userGroups.allClosedGroupInfo() }
|
||||||
|
.mapNotNullTo(hashSetOf()) { group ->
|
||||||
|
group.groupAccountId.takeIf { group.shouldPoll }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.distinctUntilChanged()
|
||||||
|
} else {
|
||||||
|
// There shouldn't be any group polling at this stage
|
||||||
|
flowOf(emptySet())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// This scan compares the previous active group pollers with the incoming set of groups
|
||||||
|
// that should be polled now, to work out which pollers should be started or stopped,
|
||||||
|
// and finally emits the new state
|
||||||
|
.scan(emptyMap<AccountId, ClosedGroupPoller>()) { previous, newActiveGroupIDs ->
|
||||||
|
// Go through previous pollers and stop those that are not in the new set
|
||||||
|
for ((groupId, poller) in previous) {
|
||||||
|
if (groupId !in newActiveGroupIDs) {
|
||||||
|
Log.d(TAG, "Stopping poller for $groupId")
|
||||||
|
poller.stop()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Go through new set, pick the existing pollers and create/start those that are
|
||||||
|
// not in the previous map
|
||||||
|
newActiveGroupIDs.associateWith { groupId ->
|
||||||
|
var poller = previous[groupId]
|
||||||
|
|
||||||
|
if (poller == null) {
|
||||||
|
Log.d(TAG, "Starting poller for $groupId")
|
||||||
|
poller = ClosedGroupPoller(
|
||||||
|
scope = scope,
|
||||||
|
executor = executor,
|
||||||
|
closedGroupSessionId = groupId,
|
||||||
|
configFactoryProtocol = configFactory,
|
||||||
|
groupManagerV2 = groupManagerV2.get(),
|
||||||
|
storage = storage,
|
||||||
|
lokiApiDatabase = lokiApiDatabase,
|
||||||
|
clock = clock,
|
||||||
|
).also { it.start() }
|
||||||
|
}
|
||||||
|
|
||||||
|
poller
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.stateIn(GlobalScope, SharingStarted.Eagerly, emptyMap())
|
||||||
|
|
||||||
|
|
||||||
|
@Suppress("OPT_IN_USAGE")
|
||||||
|
fun watchGroupPollingState(groupId: AccountId): Flow<ClosedGroupPoller.State> {
|
||||||
|
return activeGroupPollers
|
||||||
|
.flatMapLatest { pollers ->
|
||||||
|
pollers[groupId]?.state ?: flowOf(ClosedGroupPoller.IdleState)
|
||||||
|
}
|
||||||
|
.distinctUntilChanged()
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalCoroutinesApi::class)
|
||||||
|
fun watchAllGroupPollingState(): Flow<Pair<AccountId, ClosedGroupPoller.State>> {
|
||||||
|
return activeGroupPollers
|
||||||
|
.flatMapLatest { pollers ->
|
||||||
|
// Merge all poller states into a single flow of (groupId, state) pairs
|
||||||
|
merge(
|
||||||
|
*pollers
|
||||||
|
.map { (id, poller) -> poller.state.map { state -> id to state } }
|
||||||
|
.toTypedArray()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "GroupPollerHandler"
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
package org.thoughtcrime.securesms.util
|
||||||
|
|
||||||
|
import androidx.lifecycle.DefaultLifecycleObserver
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import androidx.lifecycle.ProcessLifecycleOwner
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import javax.inject.Inject
|
||||||
|
import javax.inject.Singleton
|
||||||
|
|
||||||
|
@Singleton
|
||||||
|
class AppVisibilityManager @Inject constructor() {
|
||||||
|
private val mutableIsAppVisible = MutableStateFlow(false)
|
||||||
|
|
||||||
|
init {
|
||||||
|
ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
|
||||||
|
override fun onStart(owner: LifecycleOwner) {
|
||||||
|
mutableIsAppVisible.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStop(owner: LifecycleOwner) {
|
||||||
|
mutableIsAppVisible.value = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
val isAppVisible: StateFlow<Boolean> get() = mutableIsAppVisible
|
||||||
|
}
|
||||||
@ -0,0 +1,84 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/blockedBanner"
|
||||||
|
android:contentDescription="@string/AccessibilityId_blockedBanner"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?danger"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible"
|
||||||
|
>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/blockedBannerTextView"
|
||||||
|
android:contentDescription="@string/AccessibilityId_blockedBannerText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_margin="@dimen/medium_spacing"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="@dimen/small_font_size"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tools:text="Elon is blocked. Unblock them?" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/outdatedDisappearingBanner"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?colorAccent"
|
||||||
|
android:contentDescription="@string/AccessibilityId_outdated_group_banner"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/outdatedDisappearingBannerTextView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:layout_marginVertical="@dimen/very_small_spacing"
|
||||||
|
android:layout_marginHorizontal="@dimen/medium_spacing"
|
||||||
|
android:textColor="@color/black"
|
||||||
|
android:textSize="@dimen/small_font_size"
|
||||||
|
tools:text="This user's client is outdated, things may not work as expected" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/outdatedGroupBanner"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:background="?colorAccent"
|
||||||
|
android:paddingVertical="@dimen/very_small_spacing"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:textColor="?message_sent_text_color"
|
||||||
|
android:paddingHorizontal="@dimen/medium_spacing"
|
||||||
|
android:contentDescription="@string/AccessibilityId_outdated_group_banner"
|
||||||
|
android:textSize="@dimen/small_font_size"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:text="@string/groupLegacyBanner"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/groupExpiredBanner"
|
||||||
|
android:text="@string/groupNotUpdatedWarning"
|
||||||
|
android:gravity="center"
|
||||||
|
android:background="@color/accent_orange"
|
||||||
|
android:textColor="@color/black"
|
||||||
|
android:paddingHorizontal="@dimen/medium_spacing"
|
||||||
|
android:paddingVertical="@dimen/very_small_spacing"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:id="@+id/messageRequestBar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/messageRequestBlock"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:contentDescription="@string/AccessibilityId_messageRequestsBlock"
|
||||||
|
android:textColor="?danger"
|
||||||
|
android:paddingHorizontal="@dimen/massive_spacing"
|
||||||
|
android:paddingVertical="@dimen/small_spacing"
|
||||||
|
android:textSize="@dimen/text_size"
|
||||||
|
tools:text="@string/deleteAfterGroupPR1BlockUser"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/sendAcceptsTextView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="@dimen/medium_spacing"
|
||||||
|
android:alpha="0.6"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:text="@string/messageRequestsAcceptDescription"
|
||||||
|
android:textColor="?android:textColorPrimary"
|
||||||
|
android:textSize="@dimen/small_font_size" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="@dimen/medium_spacing"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/acceptMessageRequestButton"
|
||||||
|
style="@style/Widget.Session.Button.Common.ProminentOutline"
|
||||||
|
android:contentDescription="@string/AccessibilityId_messageRequestsAccept"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="@dimen/medium_button_height"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="@string/accept" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/declineMessageRequestButton"
|
||||||
|
style="@style/Widget.Session.Button.Common.DangerOutline"
|
||||||
|
android:contentDescription="@string/AccessibilityId_deleteRequest"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="@dimen/medium_button_height"
|
||||||
|
android:layout_marginStart="@dimen/medium_spacing"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="@string/delete" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
Loading…
Reference in New Issue