Merge branch 'release/3.4.3'

meganz · Apr 10, 2017 · 6515024 · 6515024
2 parents 663d5e3 + c52d1e9
commit 6515024
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 36 deletions.
diff --git 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 = "<group>";
 		};
 		4147C2CE1B4EE8A400A37044 /* CoreData */ = {

diff --git 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
@@ -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
@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.1</string>
+	<string>3.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -51,7 +51,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>50</string>
+	<string>53</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git 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
diff --git a/iMEGA/Vendor/DZNEmptyDataSet b/iMEGA/Vendor/DZNEmptyDataSet
diff --git a/iMEGA/Vendor/DateTools b/iMEGA/Vendor/DateTools
diff --git a/iMEGA/Vendor/LTHPasscodeViewController b/iMEGA/Vendor/LTHPasscodeViewController
diff --git a/iMEGA/Vendor/PureLayout b/iMEGA/Vendor/PureLayout
diff --git a/iMEGA/Vendor/SAMKeychain b/iMEGA/Vendor/SAMKeychain
diff --git a/iMEGA/Vendor/SDK b/iMEGA/Vendor/SDK
diff --git a/iMEGA/Vendor/SVProgressHUD b/iMEGA/Vendor/SVProgressHUD
+1 −1		Examples/Countries/Countries/MainViewController.m
+3 −3		Examples/Countries/Pods/NSManagedObjectContext-Hydrate/Source/NSManagedObjectContext+Hydrate.m
+3 −3		Source/UIScrollView+EmptyDataSet.m
+12 −0		CHANGELOG.md
+27 −7		LTHPasscodeViewController/LTHPasscodeViewController.m
+1 −1		Localizations/LTHPasscodeViewController.bundle/de.lproj/LTHPasscodeViewController.strings
+1 −0		.gitignore
+2 −0		README.md
+3 −2		bindings/ios/3rdparty/build-cares.sh
+1 −1		bindings/ios/3rdparty/build-curl.sh
+2 −2		bindings/ios/3rdparty/build-libevent2.sh
+1 −1		bindings/ios/3rdparty/build-libuv.sh
+1 −1		bindings/ios/3rdparty/build-openssl.sh
+22 −2		bindings/ios/MEGASDK.xcodeproj/project.pbxproj
+2 −2		bindings/ios/MEGASdk.h
+8 −4		bindings/ios/MEGASdk.mm
+13 −5		bindings/ios/Private/DelegateMEGAGlobalListener.mm
+36 −12		bindings/ios/Private/DelegateMEGAListener.mm
+14 −5		bindings/ios/Private/DelegateMEGARequestListener.mm
+16 −8		bindings/ios/Private/DelegateMEGATransferListener.mm
+0 −3		bindings/ios/mega/config.h
+2 −1		bindings/megaapi.i
+1 −0		bindings/qt/sdk.pri
+15 −0		bindings/wp8/MNode.cpp
+3 −0		bindings/wp8/MNode.h
+4 −1		bindings/wp8/MRequest.h
+66 −46		bindings/wp8/MTransfer.cpp
+61 −40		bindings/wp8/MTransfer.h
+82 −0		bindings/wp8/MTransferData.cpp
+52 −0		bindings/wp8/MTransferData.h
+370 −10		bindings/wp8/MegaSDK.cpp
+58 −0		bindings/wp8/MegaSDK.h
+2 −0		bindings/wp8/vs2013/mega.vcxproj
+6 −0		bindings/wp8/vs2013/mega.vcxproj.filters
+2 −0		bindings/wp8/vs2015/mega.vcxproj
+6 −0		bindings/wp8/vs2015/mega.vcxproj.filters
+5 −1		configure.ac
+12 −2		contrib/QtCreator/MEGAcmd/MEGAcmdClient/MEGAcmdClient.pro
+13 −0		contrib/QtCreator/MEGAcmd/MEGAcmdLoader/MEGAcmdLoader.pro
+10 −0		contrib/QtCreator/MEGAcmd/MEGAcmdServer/MEGAcmdServer.pro
+3 −3		contrib/build_sdk.sh
+22 −14		examples/megacli.cpp
+1 −1		examples/megacli.h
+8 −2		examples/megacmd/comunicationsmanager.h
+1 −1		examples/megacmd/megacmd.cpp
+3 −0		examples/megacmd/megacmdexecuter.cpp
+2 −2		examples/megacmd/megacmdexecuter.h
+24 −16		include/mega/command.h
+2 −1		include/mega/filesystem.h
+6 −1		include/mega/megaapp.h
+14 −4		include/mega/megaclient.h
+4 −0		include/mega/osx/osxutils.h
+1 −0		include/mega/posix/meganet.h
+12 −15		include/mega/types.h
+1 −1		include/mega/version.h
+183 −30		include/megaapi.h
+45 −13		include/megaapi_impl.h
+2 −2		src/backofftimer.cpp
+322 −68		src/commands.cpp
+15 −11		src/filesystem.cpp
+58 −14		src/megaapi.cpp
+267 −86		src/megaapi_impl.cpp
+147 −38		src/megaclient.cpp
+24 −0		src/osx/osxutils.mm
+9 −2		src/posix/fs.cpp
+45 −0		src/posix/net.cpp
+2 −2		src/transfer.cpp
+1 −1		src/transferslot.cpp
+1 −1		src/user.cpp
+199 −0		src/utils.cpp
+1 −0		tests/megacmd_get_test.sh
+13 −21		tests/sdk_test.cpp
+25 −9		tests/sync_test.py
+20 −0		tests/sync_test_app.py
+43 −17		tests/sync_test_base.py
+36 −13		tests/sync_test_megasync.py
+1 −0		tests/tests.cpp
+5 −0		.gitignore
+17 −0		CHANGELOG.md
+1 −1		Demo/Classes/AppDelegate.h
+1 −1		Demo/Classes/AppDelegate.m
+1 −1		Demo/Classes/ViewController.h
+11 −2		Demo/Classes/ViewController.m
+18 −12		Demo/ViewController.xib
+1 −1		Demo/main.m
+1 −1		Demo/tvOS Demo/AppDelegate.h
+1 −1		Demo/tvOS Demo/AppDelegate.m
+5 −22		LICENSE.txt
+16 −4		README.md
+1 −1		SVProgressHUD-Framework/Info.plist
+3 −3		SVProgressHUD.podspec
+11 −5		SVProgressHUD.xcodeproj/project.pbxproj
+1 −1		SVProgressHUD.xcodeproj/xcshareddata/xcschemes/SVProgressHUD-Framework.xcscheme
+1 −1		SVProgressHUD/SVIndefiniteAnimatedView.h
+1 −1		SVProgressHUD/SVIndefiniteAnimatedView.m
+1 −1		SVProgressHUD/SVProgressAnimatedView.h
+1 −3		SVProgressHUD/SVProgressAnimatedView.m
+7 −3		SVProgressHUD/SVProgressHUD.h
+407 −355		SVProgressHUD/SVProgressHUD.m
+1 −1		SVProgressHUD/SVRadialGradientLayer.h
+1 −1		SVProgressHUD/SVRadialGradientLayer.m