felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 07:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Retrying & deleting failed messages

Browse Source 
- Update after code review
This commit is contained in:
Gil Eluard
2021-03-10 22:19:04 +01:00
parent c9f5e6cf0d
commit 120425389f
7 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
View File

@@ -1295,14 +1295,14 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
// Sort each rooms collection by considering first the rooms with some missed notifs, the rooms with unread, then the others.
comparator = ^NSComparisonResult(id<MXKRecentCellDataStoring> recentCellData1, id<MXKRecentCellDataStoring> recentCellData2) {
if (recentCellData1.roomSummary.room.sentStatus != MXRoomSentStatusOk
&& recentCellData2.roomSummary.room.sentStatus == MXRoomSentStatusOk)
if (recentCellData1.roomSummary.room.sentStatus != RoomSentStatusOk
&& recentCellData2.roomSummary.room.sentStatus == RoomSentStatusOk)
{
return NSOrderedAscending;
}
if (recentCellData2.roomSummary.room.sentStatus != MXRoomSentStatusOk
&& recentCellData1.roomSummary.room.sentStatus == MXRoomSentStatusOk)
if (recentCellData2.roomSummary.room.sentStatus != RoomSentStatusOk
&& recentCellData1.roomSummary.room.sentStatus == RoomSentStatusOk)
{
return NSOrderedDescending;
}
@@ -1364,14 +1364,14 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
// Sort each rooms collection by considering first the rooms with some unread messages then the others.
comparator = ^NSComparisonResult(id<MXKRecentCellDataStoring> recentCellData1, id<MXKRecentCellDataStoring> recentCellData2) {
if (recentCellData1.roomSummary.room.sentStatus != MXRoomSentStatusOk
&& recentCellData2.roomSummary.room.sentStatus == MXRoomSentStatusOk)
if (recentCellData1.roomSummary.room.sentStatus != RoomSentStatusOk
&& recentCellData2.roomSummary.room.sentStatus == RoomSentStatusOk)
{
return NSOrderedAscending;
}
if (recentCellData2.roomSummary.room.sentStatus != MXRoomSentStatusOk
&& recentCellData1.roomSummary.room.sentStatus == MXRoomSentStatusOk)
if (recentCellData2.roomSummary.room.sentStatus != RoomSentStatusOk
&& recentCellData1.roomSummary.room.sentStatus == RoomSentStatusOk)
{
return NSOrderedDescending;
}
@@ -1419,14 +1419,14 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
{
[conversationCellDataArray sortUsingComparator:^NSComparisonResult(id<MXKRecentCellDataStoring> recentCellData1, id<MXKRecentCellDataStoring> recentCellData2) {
if (recentCellData1.roomSummary.room.sentStatus != MXRoomSentStatusOk
&& recentCellData2.roomSummary.room.sentStatus == MXRoomSentStatusOk)
if (recentCellData1.roomSummary.room.sentStatus != RoomSentStatusOk
&& recentCellData2.roomSummary.room.sentStatus == RoomSentStatusOk)
{
return NSOrderedAscending;
}
if (recentCellData2.roomSummary.room.sentStatus != MXRoomSentStatusOk
&& recentCellData1.roomSummary.room.sentStatus == MXRoomSentStatusOk)
if (recentCellData2.roomSummary.room.sentStatus != RoomSentStatusOk
&& recentCellData1.roomSummary.room.sentStatus == RoomSentStatusOk)
{
return NSOrderedDescending;
}