Skip to content

Fix for long full names being not nicely cut off #399

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

Open
TheSkorm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for long full names being not nicely cut off #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions TelegramTest/TLUserCategory.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,9 +462,7 @@ - (NSString *)fullName {
if(!self.last_name)
self.last_name = @"";

NSString *fullName = [[[[NSString stringWithFormat:@"%@%@%@", self.first_name,self.first_name.length > 0 ? @" " : @"", self.last_name] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] singleLine] htmlentities];
if(fullName.length > 30)
fullName = [fullName substringToIndex:30];
NSString *fullName = [[[NSString stringWithFormat:@"%@%@%@", self.first_name,self.first_name.length > 0 ? @" " : @"", self.last_name] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] singleLine];


[self setDFullName:fullName];
Expand Down Expand Up @@ -656,10 +654,6 @@ - (NSString *) dialogFullName {

userName = [userName singleLine];

if(userName.length > 30)
userName = [userName substringToIndex:30];


return userName;
}

Expand Down
4 changes: 2 additions & 2 deletions TelegramTest/UsersManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@ -(void)updateUserName:(NSString *)userName completeHandler:(void (^)(TLUser *))c

-(void)updateAccount:(NSString *)firstName lastName:(NSString *)lastName completeHandler:(void (^)(TLUser *))completeHandler errorHandler:(void (^)(NSString *))errorHandler {

firstName = firstName.length > 30 ? [firstName substringToIndex:30] : firstName;
firstName = firstName.length > 255 ? [firstName substringToIndex:255] : firstName;

lastName = lastName.length > 30 ? [lastName substringToIndex:30] : lastName;
lastName = lastName.length > 255 ? [lastName substringToIndex:255] : lastName;


if([firstName isEqualToString:self.userSelf.first_name] && [lastName isEqualToString:self.userSelf.last_name])
Expand Down