Skip to content

Use is custom avatar on room #1209

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

Merged
Ivansss merged 2 commits into from
May 4, 2023
Merged

Use is custom avatar on room #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef6d57f
Use 'isCustomAvatar' for conversation avatars
SystemKeeper May 2, 2023
dd1af99
Increase database version
SystemKeeper May 2, 2023
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
2 changes: 1 addition & 1 deletion NextcloudTalk/NCDatabaseManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

NSString *const kTalkDatabaseFolder = @"Library/Application Support/Talk";
NSString *const kTalkDatabaseFileName = @"talk.realm";
uint64_t const kTalkDatabaseSchemaVersion = 50;
uint64_t const kTalkDatabaseSchemaVersion = 51;

NSString * const kCapabilitySystemMessages = @"system-messages";
NSString * const kCapabilityNotificationLevels = @"notification-levels";
Expand Down
1 change: 1 addition & 0 deletions NextcloudTalk/NCRoom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ extern NSString * const NCRoomObjectTypeRoom;
@property (nonatomic, assign) NSInteger callRecording;
@property (nonatomic, assign) NSInteger callStartTime;
@property (nonatomic, copy) NSString *avatarVersion;
@property (nonatomic, assign) BOOL isCustomAvatar;

+ (instancetype)roomWithDictionary:(NSDictionary *)roomDict;
+ (instancetype)roomWithDictionary:(NSDictionary *)roomDict andAccountId:(NSString *)accountId;
Expand Down
2 changes: 2 additions & 0 deletions NextcloudTalk/NCRoom.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ + (instancetype)roomWithDictionary:(NSDictionary *)roomDict
room.callRecording = [[roomDict objectForKey:@"callRecording"] integerValue];
room.callStartTime = [[roomDict objectForKey:@"callStartTime"] integerValue];
room.avatarVersion = [roomDict objectForKey:@"avatarVersion"];
room.isCustomAvatar = [roomDict objectForKey:@"isCustomAvatar"];

// Local-only field -> update only if there's actually a value
if ([roomDict objectForKey:@"pendingMessage"] != nil) {
Expand Down Expand Up @@ -186,6 +187,7 @@ + (void)updateRoom:(NCRoom *)managedRoom withRoom:(NCRoom *)room
managedRoom.callRecording = room.callRecording;
managedRoom.callStartTime = room.callStartTime;
managedRoom.avatarVersion = room.avatarVersion;
managedRoom.isCustomAvatar = room.isCustomAvatar;
}

+ (NSString *)primaryKey {
Expand Down
4 changes: 1 addition & 3 deletions NextcloudTalk/RoomAvatarInfoTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ import UIKit
self.headerView.avatarImageView.setAvatar(for: self.room, with: self.traitCollection.userInterfaceStyle)

self.headerView.editView.isHidden = !NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityConversationAvatars, forAccountId: self.room.accountId)

// TODO: When all avatars have a version, this needs to be adjusted to
self.headerView.trashButton.isHidden = self.room.avatarVersion.isEmpty
self.headerView.trashButton.isHidden = !self.room.isCustomAvatar

// Need to have an explicit size here for the header view
let size = self.headerView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
Expand Down