Merge pull request #415 from gavine99/main-compose-race-conditions

fix possible race conditions in main and compose activities
This commit is contained in:
octoshrimpy
2025-04-07 10:28:05 -04:00
committed by GitHub
2 changed files with 7 additions and 7 deletions
@@ -1205,7 +1205,7 @@ class ComposeViewModel @Inject constructor(
// Delete the message // Delete the message
view.confirmDeleteIntent view.confirmDeleteIntent
.withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation -> .withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation ->
deleteMessages.execute(DeleteMessages.Params(messages, conversation.id)) deleteMessages.execute(DeleteMessages.Params(messages.toList(), conversation.id))
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { view.clearSelection() } .subscribe { view.clearSelection() }
@@ -353,7 +353,7 @@ class MainViewModel @Inject constructor(
view.optionsItemIntent view.optionsItemIntent
.filter { itemId -> itemId == R.id.unarchive } .filter { itemId -> itemId == R.id.unarchive }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markUnarchived.execute(conversations) markUnarchived.execute(conversations.toList())
view.showArchivedSnackbar(conversations.count()) view.showArchivedSnackbar(conversations.count())
view.clearSelection() view.clearSelection()
} }
@@ -385,7 +385,7 @@ class MainViewModel @Inject constructor(
view.optionsItemIntent view.optionsItemIntent
.filter { itemId -> itemId == R.id.pin } .filter { itemId -> itemId == R.id.pin }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markPinned.execute(conversations) markPinned.execute(conversations.toList())
view.clearSelection() view.clearSelection()
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
@@ -394,7 +394,7 @@ class MainViewModel @Inject constructor(
view.optionsItemIntent view.optionsItemIntent
.filter { itemId -> itemId == R.id.unpin } .filter { itemId -> itemId == R.id.unpin }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markUnpinned.execute(conversations) markUnpinned.execute(conversations.toList())
view.clearSelection() view.clearSelection()
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
@@ -404,7 +404,7 @@ class MainViewModel @Inject constructor(
.filter { itemId -> itemId == R.id.read } .filter { itemId -> itemId == R.id.read }
.filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } } .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markRead.execute(conversations) markRead.execute(conversations.toList())
view.clearSelection() view.clearSelection()
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
@@ -414,7 +414,7 @@ class MainViewModel @Inject constructor(
.filter { itemId -> itemId == R.id.unread } .filter { itemId -> itemId == R.id.unread }
.filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } } .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
.withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
markUnread.execute(conversations) markUnread.execute(conversations.toList())
view.clearSelection() view.clearSelection()
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
@@ -488,7 +488,7 @@ class MainViewModel @Inject constructor(
view.confirmDeleteIntent view.confirmDeleteIntent
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { conversations -> .subscribe { conversations ->
deleteConversations.execute(conversations) deleteConversations.execute(conversations.toList())
view.clearSelection() view.clearSelection()
} }