diff --git a/MEGA.xcodeproj/project.pbxproj b/MEGA.xcodeproj/project.pbxproj index 2e6f484163..504d4e3e5d 100644 --- a/MEGA.xcodeproj/project.pbxproj +++ b/MEGA.xcodeproj/project.pbxproj @@ -859,7 +859,7 @@ 413199751BD7BD5D002CD6EA /* NSDate+DateTools.m */, ); name = DateTools; - path = Vendor/DateTools/DateTools; + path = Vendor/DateTools/DateTools/DateTools; sourceTree = ""; }; 4147C2CE1B4EE8A400A37044 /* CoreData */ = { diff --git a/iMEGA/Cloud drive/CloudDriveTableViewController.m b/iMEGA/Cloud drive/CloudDriveTableViewController.m index a06debfd8e..0aec1069e8 100644 --- a/iMEGA/Cloud drive/CloudDriveTableViewController.m +++ b/iMEGA/Cloud drive/CloudDriveTableViewController.m @@ -568,12 +568,12 @@ - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleFo - (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath { MEGANode *node; if (tableView == self.searchDisplayController.searchResultsTableView) { - if (indexPath.row > matchSearchNodes.count) { + if (indexPath.row > matchSearchNodes.count || indexPath.row < 0) { return @""; } node = [matchSearchNodes objectAtIndex:indexPath.row]; } else { - if (indexPath.row > self.nodes.size.integerValue) { + if (indexPath.row > self.nodes.size.integerValue || indexPath.row < 0) { return @""; } node = [self.nodes nodeAtIndex:indexPath.row]; diff --git a/iMEGA/Contacts/ContactsViewController.m b/iMEGA/Contacts/ContactsViewController.m index 7a41856909..8c892d4ec6 100644 --- a/iMEGA/Contacts/ContactsViewController.m +++ b/iMEGA/Contacts/ContactsViewController.m @@ -360,7 +360,7 @@ - (UIImage *)avatarForUser:(MEGAUser *)user withSize:(CGSize )avatarSize { if (fileExists) { avatar = [UIImage imageWithContentsOfFile:avatarFilePath]; } else { - NSString *colorString = [[MEGASdkManager sharedMEGASdk] avatarColorForUser:user]; + NSString *colorString = [MEGASdk avatarColorForUser:user]; avatar = [UIImage imageForName:[user email].uppercaseString size:avatarSize backgroundColor:[UIColor colorFromHexString:colorString] textColor:[UIColor whiteColor] font:[UIFont fontWithName:kFont size:(avatarSize.width/2)]]; [self requestAvatarForUser:user destinationFilePath:avatarFilePath]; diff --git a/iMEGA/Info.plist b/iMEGA/Info.plist index 542be36588..a9da3fa12b 100644 --- a/iMEGA/Info.plist +++ b/iMEGA/Info.plist @@ -36,7 +36,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.4.1 + 3.4.3 CFBundleSignature ???? CFBundleURLTypes @@ -51,7 +51,7 @@ CFBundleVersion - 50 + 53 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/iMEGA/My Account/MyAccountViewController.m b/iMEGA/My Account/MyAccountViewController.m index b90d7b235a..a42f709dda 100644 --- a/iMEGA/My Account/MyAccountViewController.m +++ b/iMEGA/My Account/MyAccountViewController.m @@ -137,7 +137,7 @@ - (void)setUserAvatar { BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:avatarFilePath]; if (!fileExists) { - NSString *colorString = [[MEGASdkManager sharedMEGASdk] avatarColorForUser:user]; + NSString *colorString = [MEGASdk avatarColorForUser:user]; CGSize avatarSize = self.userAvatarImageView.frame.size; UIImage *avatarImage = [UIImage imageForName:[user email].uppercaseString size:avatarSize backgroundColor:[UIColor colorFromHexString:colorString] textColor:[UIColor whiteColor] font:[UIFont fontWithName:kFont size:(avatarSize.width/2)]]; self.userAvatarImageView.image = avatarImage; diff --git a/iMEGA/Settings/Settings.storyboard b/iMEGA/Settings/Settings.storyboard index eec60509c7..0b66f85bba 100644 --- a/iMEGA/Settings/Settings.storyboard +++ b/iMEGA/Settings/Settings.storyboard @@ -1,5 +1,5 @@ - - + + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -620,7 +620,7 @@ - + @@ -654,7 +654,7 @@ - + @@ -742,7 +742,7 @@ - + @@ -759,7 +759,7 @@ - + @@ -780,7 +780,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -1239,8 +1239,8 @@ -