Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(crypto): Redecrypt non-UTD messages to remove no-longer-relevant warning shields #4644

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

fix(crypto): Redecrypt non-UTD messages to remove no-longer-relevant warning shields #4644

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aa64150
tool(ui): Allow getting encryption info via a Room instance
andybalaam Feb 12, 2025
8d0fd62
tool(ui): Provide a replace method for TimelineStateTransaction
andybalaam Feb 12, 2025
45ddbf1
refactor(crypto): Store the session ID of a UTD in RemoteEventTimelin…
andybalaam Feb 7, 2025
5cc10ba
refactor(crypto): Store session ID in EncryptionInfo and provide to T…
andybalaam Feb 11, 2025
dca6881
refactor(timeline): Extract a function to calculate which events to r…
andybalaam Feb 13, 2025
ff1dde9
refactor(timeline): Extract a function for retrying decryption
andybalaam Feb 13, 2025
414f03d
fix(crypto): When a session updates, re-fetch encryption info for non…
andybalaam Feb 13, 2025
d6d812b
Avoid storing session_id in TimelineItem
andybalaam Feb 17, 2025
c700762
Update doc comments
andybalaam Feb 17, 2025
0d2b71d
Collapse an if else into a single block
andybalaam Feb 17, 2025
076f076
Move the clone of state into retry_event_decryption_by_index
andybalaam Feb 17, 2025
a9331cf
Use a partition_map instead of building temporary Vecs
andybalaam Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/matrix-sdk-ui/src/timeline/controller/state_transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use std::sync::Arc;

use eyeball_im::VectorDiff;
use itertools::Itertools as _;
use matrix_sdk::deserialized_responses::TimelineEvent;
Expand All @@ -32,7 +34,7 @@ use super::{
ObservableItems, ObservableItemsTransaction, TimelineFocusKind, TimelineMetadata,
TimelineSettings,
};
use crate::events::SyncTimelineEventWithoutContent;
use crate::{events::SyncTimelineEventWithoutContent, timeline::TimelineItem};

pub(in crate::timeline) struct TimelineStateTransaction<'a> {
/// A vector transaction over the items themselves. Holds temporary state
Expand Down Expand Up @@ -441,6 +443,14 @@ impl<'a> TimelineStateTransaction<'a> {
}
}

pub(super) fn replace(
&mut self,
timeline_item_index: usize,
timeline_item: Arc<TimelineItem>,
) -> Arc<TimelineItem> {
self.items.replace(timeline_item_index, timeline_item)
}

pub(super) fn clear(&mut self) {
let has_local_echoes = self.items.iter().any(|item| item.is_local_echo());

Expand Down