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

Add device_id and record tag

Browse Source
This commit is contained in:
yostyle
2022-10-19 13:10:59 +02:00
parent ec08a54c60
commit b4848d309d
11 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/CellData/RoomBubbleCellData.h
+2 -1
View File
@@ -37,7 +37,8 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
RoomBubbleCellDataTagPoll,
RoomBubbleCellDataTagLocation,
RoomBubbleCellDataTagLiveLocation,
RoomBubbleCellDataTagVoiceBroadcast
RoomBubbleCellDataTagVoiceBroadcastPlayback,
RoomBubbleCellDataTagVoiceBroadcastRecord
};
/**
Riot/Modules/Room/CellData/RoomBubbleCellData.m
+17 -7
View File
@@ -183,13 +183,23 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
self.displayTimestampForSelectedComponentOnLeftWhenPossible = NO;
}
}
else if ([event.type isEqualToString:VoiceBroadcastSettings.eventType])
else if ([event.type isEqualToString:VoiceBroadcastSettings.voiceBroadcastInfoContentKeyType])
{
self.tag = RoomBubbleCellDataTagVoiceBroadcast;
MXEvent *roomVoiceBroadcastInfoEvent = [roomState stateEventsWithType:VoiceBroadcastSettings.voiceBroadcastInfoContentKeyType].lastObject;
VoiceBroadcastInfo *lastVoiceBroadcastInfo = [VoiceBroadcastInfo modelFromJSON: roomVoiceBroadcastInfoEvent.content];
if ([VoiceBroadcastInfo isStartedFor:lastVoiceBroadcastInfo.state] &&
[event.sender isEqualToString: self.mxSession.myUserId] &&
[lastVoiceBroadcastInfo.deviceId isEqualToString:self.mxSession.myDeviceId]) {
self.tag = RoomBubbleCellDataTagVoiceBroadcastRecord;
} else {
self.tag = RoomBubbleCellDataTagVoiceBroadcastPlayback;
}
self.collapsable = NO;
self.collapsed = NO;
MXLogDebug(@"VB incoming initWithEvent")
break;
}
@@ -205,7 +215,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
}
else if (event.content[VoiceBroadcastSettings.voiceBroadcastContentKeyChunkType])
{
self.tag = RoomBubbleCellDataTagVoiceBroadcast;
self.tag = RoomBubbleCellDataTagVoiceBroadcastPlayback;
self.collapsable = NO;
self.collapsed = NO;
}
@@ -315,7 +325,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
}
break;
case RoomBubbleCellDataTagVoiceBroadcast:
case RoomBubbleCellDataTagVoiceBroadcastPlayback:
if (RiotSettings.shared.enableVoiceBroadcast == YES &&
[VoiceBroadcastInfo isStartedFor:[VoiceBroadcastInfo modelFromJSON:self.events.lastObject.content].state])
{
@@ -1072,7 +1082,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
case RoomBubbleCellDataTagLiveLocation:
shouldAddEvent = NO;
break;
case RoomBubbleCellDataTagVoiceBroadcast:
case RoomBubbleCellDataTagVoiceBroadcastPlayback:
shouldAddEvent = NO;
break;
default:
@@ -1143,7 +1153,7 @@ NSString *const URLPreviewDidUpdateNotification = @"URLPreviewDidUpdateNotificat
{
shouldAddEvent = NO;
}
} else if ([event.type isEqualToString:VoiceBroadcastSettings.eventType]) {
} else if ([event.type isEqualToString:VoiceBroadcastSettings.voiceBroadcastInfoContentKeyType]) {
shouldAddEvent = NO;
}
break;