🗒 "My Notes" conversation

VideoCalls/ChatMessageTableViewCell.h

@@ -32,6 +32,7 @@ static NSString *AutoCompletionCellIdentifier   = @"AutoCompletionCellIdentifier
 - (void)setGuestAvatar:(NSString *)displayName;
 - (void)setBotAvatar;
 - (void)setChangelogAvatar;
+- (void)setNotesAvatar;
 - (void)setDeliveryState:(ChatMessageDeliveryState)state;
 
 @end

VideoCalls/ChatMessageTableViewCell.m

@@ -189,6 +189,11 @@ - (void)setChangelogAvatar
     [_avatarView setImage:[UIImage imageNamed:@"changelog"]];
 }
 
+- (void)setNotesAvatar
+{
+    [_avatarView setImage:[UIImage imageNamed:@"notes"]];
+}
+
 - (void)setDeliveryState:(ChatMessageDeliveryState)state
 {
     [self.statusView.subviews makeObjectsPerformSelector: @selector(removeFromSuperview)];

VideoCalls/Images.xcassets/notes.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "notes.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

VideoCalls/NCChatViewController.m

@@ -304,6 +304,9 @@ - (void)setTitleView
         case kNCRoomTypeChangelog:
             [_titleView.image setImage:[UIImage imageNamed:@"changelog"]];
             break;
+        case kNCRoomTypeNotes:
+            [_titleView.image setImage:[UIImage imageNamed:@"notes"]];
+            break;
         default:
             break;
     }
@@ -1554,6 +1557,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         } else if ([message.actorType isEqualToString:@"bots"]) {
             if ([message.actorId isEqualToString:@"changelog"]) {
                 [normalCell setChangelogAvatar];
+            } else if ([message.actorId isEqualToString:@"notes"]) {
+                [normalCell setNotesAvatar];
             } else {
                 [normalCell setBotAvatar];
             }
@@ -1598,6 +1603,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         } else if ([message.actorType isEqualToString:@"bots"]) {
             if ([message.actorId isEqualToString:@"changelog"]) {
                 [normalCell setChangelogAvatar];
+            } else if ([message.actorId isEqualToString:@"notes"]) {
+                [normalCell setNotesAvatar];
             } else {
                 [normalCell setBotAvatar];
             }

VideoCalls/NCRoom.h

@@ -16,7 +16,8 @@ typedef enum NCRoomType {
     kNCRoomTypeOneToOne = 1,
     kNCRoomTypeGroup,
     kNCRoomTypePublic,
-    kNCRoomTypeChangelog
+    kNCRoomTypeChangelog,
+    kNCRoomTypeNotes
 } NCRoomType;
 
 typedef enum NCRoomNotificationLevel {
@@ -78,6 +79,7 @@ extern NSString * const NCRoomObjectTypeSharePassword;
 - (BOOL)canModerate;
 - (BOOL)isNameEditable;
 - (BOOL)isLeavable;
+- (BOOL)isMyNotes;
 - (BOOL)userCanStartCall;
 - (NSString *)deletionMessage;
 - (NSString *)notificationLevelString;

VideoCalls/NCRoom.m

@@ -128,6 +128,11 @@ - (BOOL)isLockedOneToOne
     return self.type == kNCRoomTypeOneToOne && [[NCSettingsController sharedInstance] serverHasTalkCapability:kCapabilityLockedOneToOneRooms];
 }
 
+- (BOOL)isMyNotes
+{
+    return self.type == kNCRoomTypeNotes;
+}
+
 - (BOOL)userCanStartCall
 {
     if ([[NCSettingsController sharedInstance] serverHasTalkCapability:kCapabilityStartCallFlag] && !self.canStartCall) {
@@ -149,6 +154,8 @@ - (NSString *)deletionMessage
     NSString *message = @"Do you really want to delete this conversation?";
     if (self.type == kNCRoomTypeOneToOne) {
         message = [NSString stringWithFormat:@"If you delete the conversation, it will also be deleted for %@", self.displayName];
+    } else if (self.type == kNCRoomTypeNotes) {
+        message = @"Do you really want to delete \"My notes\"?";
     } else if ([self.participants count] > 1) {
         message = @"If you delete the conversation, it will also be deleted for all other participants.";
     }
@@ -194,7 +201,7 @@ - (NSString *)lastMessageString
         actorName = @"Guest";
     }
     // No actor name cases
-    if (self.lastMessage.isSystemMessage || (self.type == kNCRoomTypeOneToOne && !ownMessage) || self.type == kNCRoomTypeChangelog) {
+    if (self.lastMessage.isSystemMessage || (self.type == kNCRoomTypeOneToOne && !ownMessage) || self.type == kNCRoomTypeChangelog || self.type == kNCRoomTypeNotes) {
         actorName = @"";
     }
     // Use only the first name

VideoCalls/RoomInfoTableViewController.m

@@ -199,7 +199,7 @@ - (NSArray *)getRoomInfoSections
     // Room actions section
     [sections addObject:[NSNumber numberWithInt:kRoomInfoSectionActions]];
     // Moderator sections
-    if (_room.canModerate) {
+    if (_room.canModerate && !_room.isMyNotes) {
         // Public room section
         [sections addObject:[NSNumber numberWithInt:kRoomInfoSectionPublic]];
         // Webinar section
@@ -229,7 +229,7 @@ - (NSArray *)getRoomActions
     // Favorite action
     [actions addObject:[NSNumber numberWithInt:kRoomActionFavorite]];
     // Notification levels action
-    if ([[NCSettingsController sharedInstance] serverHasTalkCapability:kCapabilityNotificationLevels]) {
+    if ([[NCSettingsController sharedInstance] serverHasTalkCapability:kCapabilityNotificationLevels] && !_room.isMyNotes) {
         [actions addObject:[NSNumber numberWithInt:kRoomActionNotifications]];
     }
     // Public room actions
@@ -1091,6 +1091,13 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 }
                     break;
 
+                case kNCRoomTypeNotes:
+                {
+                    cell.roomNameTextField.text = _room.displayName;
+                    [cell.roomImage setImage:[UIImage imageNamed:@"notes"]];
+                }
+                    break;
+
                 default:
                     break;
             }

VideoCalls/RoomSearchTableViewController.m

@@ -132,6 +132,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             [cell.roomImage setImage:[UIImage imageNamed:@"changelog"]];
             break;
 
+        case kNCRoomTypeNotes:
+            [cell.roomImage setImage:[UIImage imageNamed:@"notes"]];
+            break;
+
         default:
             break;
     }

VideoCalls/RoomsTableViewController.m

@@ -638,7 +638,7 @@ - (void)presentMoreActionsForRoomAtIndexPath:(NSIndexPath *)indexPath
     [favoriteAction setValue:[[UIImage imageNamed:favImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forKey:@"image"];
     [optionsActionSheet addAction:favoriteAction];
     // Notification levels
-    if ([[NCSettingsController sharedInstance] serverHasTalkCapability:kCapabilityNotificationLevels]) {
+    if ([[NCSettingsController sharedInstance] serverHasTalkCapability:kCapabilityNotificationLevels] && !room.isMyNotes) {
         UIAlertAction *notificationsAction = [UIAlertAction actionWithTitle:[NSString stringWithFormat:@"Notifications: %@", room.notificationLevelString]
                                                                       style:UIAlertActionStyleDefault
                                                                     handler:^void (UIAlertAction *action) {
@@ -861,6 +861,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             [cell.roomImage setImage:[UIImage imageNamed:@"changelog"]];
             break;
 
+        case kNCRoomTypeNotes:
+            [cell.roomImage setImage:[UIImage imageNamed:@"notes"]];
+            break;
+
         default:
             break;
     }