Skip to content

Commit 6515024

Browse files
committed
Merge branch 'release/3.4.3'
2 parents 663d5e3 + c52d1e9 commit 6515024

13 files changed

+36
-36
lines changed

MEGA.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@
859859
413199751BD7BD5D002CD6EA /* NSDate+DateTools.m */,
860860
);
861861
name = DateTools;
862-
path = Vendor/DateTools/DateTools;
862+
path = Vendor/DateTools/DateTools/DateTools;
863863
sourceTree = "<group>";
864864
};
865865
4147C2CE1B4EE8A400A37044 /* CoreData */ = {

iMEGA/Cloud drive/CloudDriveTableViewController.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -568,12 +568,12 @@ - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleFo
568568
- (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath {
569569
MEGANode *node;
570570
if (tableView == self.searchDisplayController.searchResultsTableView) {
571-
if (indexPath.row > matchSearchNodes.count) {
571+
if (indexPath.row > matchSearchNodes.count || indexPath.row < 0) {
572572
return @"";
573573
}
574574
node = [matchSearchNodes objectAtIndex:indexPath.row];
575575
} else {
576-
if (indexPath.row > self.nodes.size.integerValue) {
576+
if (indexPath.row > self.nodes.size.integerValue || indexPath.row < 0) {
577577
return @"";
578578
}
579579
node = [self.nodes nodeAtIndex:indexPath.row];

iMEGA/Contacts/ContactsViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ - (UIImage *)avatarForUser:(MEGAUser *)user withSize:(CGSize )avatarSize {
360360
if (fileExists) {
361361
avatar = [UIImage imageWithContentsOfFile:avatarFilePath];
362362
} else {
363-
NSString *colorString = [[MEGASdkManager sharedMEGASdk] avatarColorForUser:user];
363+
NSString *colorString = [MEGASdk avatarColorForUser:user];
364364
avatar = [UIImage imageForName:[user email].uppercaseString size:avatarSize backgroundColor:[UIColor colorFromHexString:colorString] textColor:[UIColor whiteColor] font:[UIFont fontWithName:kFont size:(avatarSize.width/2)]];
365365

366366
[self requestAvatarForUser:user destinationFilePath:avatarFilePath];

iMEGA/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<key>CFBundlePackageType</key>
3737
<string>APPL</string>
3838
<key>CFBundleShortVersionString</key>
39-
<string>3.4.1</string>
39+
<string>3.4.3</string>
4040
<key>CFBundleSignature</key>
4141
<string>????</string>
4242
<key>CFBundleURLTypes</key>
@@ -51,7 +51,7 @@
5151
</dict>
5252
</array>
5353
<key>CFBundleVersion</key>
54-
<string>50</string>
54+
<string>53</string>
5555
<key>ITSAppUsesNonExemptEncryption</key>
5656
<false/>
5757
<key>LSRequiresIPhoneOS</key>

iMEGA/My Account/MyAccountViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ - (void)setUserAvatar {
137137
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:avatarFilePath];
138138

139139
if (!fileExists) {
140-
NSString *colorString = [[MEGASdkManager sharedMEGASdk] avatarColorForUser:user];
140+
NSString *colorString = [MEGASdk avatarColorForUser:user];
141141
CGSize avatarSize = self.userAvatarImageView.frame.size;
142142
UIImage *avatarImage = [UIImage imageForName:[user email].uppercaseString size:avatarSize backgroundColor:[UIColor colorFromHexString:colorString] textColor:[UIColor whiteColor] font:[UIFont fontWithName:kFont size:(avatarSize.width/2)]];
143143
self.userAvatarImageView.image = avatarImage;

iMEGA/Settings/Settings.storyboard

+22-22
Large diffs are not rendered by default.

iMEGA/Vendor/DateTools

Submodule DateTools updated 230 files

iMEGA/Vendor/PureLayout

iMEGA/Vendor/SAMKeychain

iMEGA/Vendor/SDK

Submodule SDK updated 71 files

0 commit comments

Comments
 (0)