Merge pull request #1808 from meganz/release/v3.6.6

Release v3.6.6
meganz · Jan 8, 2020 · bfd31af · bfd31af
2 parents bfff951 + 1f8f194
commit bfd31af
Show file tree

Hide file tree

Showing 78 changed files with 7,040 additions and 2,048 deletions.
diff --git a/bindings/ios/MEGADelegate.h b/bindings/ios/MEGADelegate.h
@@ -240,6 +240,8 @@ NS_ASSUME_NONNULL_BEGIN
  *          300: suspension only for multiple copyright violations.
  *          400: the subuser account has been disabled.
  *          401: the subuser account has been removed.
+ *          500: The account needs to be verified by an SMS code.
+ *          700: the account is supended for Weak Account Protection.
  *
  * - EventStorage: when the status of the storage changes.
  *

diff --git a/bindings/ios/MEGAGlobalDelegate.h b/bindings/ios/MEGAGlobalDelegate.h
@@ -142,6 +142,8 @@ NS_ASSUME_NONNULL_BEGIN
  *          300: suspension only for multiple copyright violations.
  *          400: the subuser account has been disabled.
  *          401: the subuser account has been removed.
+ *          500: The account needs to be verified by an SMS code.
+ *          700: the account is supended for Weak Account Protection.
  *
  * - EventStorage: when the status of the storage changes.
  *

diff --git a/bindings/ios/MEGANode.mm b/bindings/ios/MEGANode.mm
@@ -178,7 +178,7 @@ - (BOOL)isRemoved {
 }
 
 - (BOOL)hasChangedType:(MEGANodeChangeType)changeType {
-    return self.megaNode ? self.megaNode->hasChanged(changeType) : NO;
+    return self.megaNode ? self.megaNode->hasChanged(int(changeType)) : NO;
 }
 
 - (MEGANodeChangeType)getChanges {

diff --git a/bindings/ios/MEGARequest.h b/bindings/ios/MEGARequest.h
@@ -143,6 +143,14 @@ typedef NS_ENUM (NSInteger, MEGARequestType) {
     MEGARequestTypePublicLinkInformation,
     MEGARequestTypeGetBackgroundUploadURL,
     MEGARequestTypeCompleteBackgroundUpload,
+    MEGARequestTypeCloudStorageUsed,
+    MEGARequestTypeSendSMSVerificationCode,
+    MEGARequestTypeCheckSMSVerificationCode,
+    MEGARequestTypeGetRegisteredContacts,
+    MEGARequestTypeGetCountryCallingCodes,
+    MEGARequestTypeVerifyCredentials,
+    MEGARequestTypeGetMiscFlags,
+    MEGARequestTypeResendVerificationEmail,
     TotalOfRequestTypes
 };
 

diff --git a/bindings/ios/MEGASDK.xcodeproj/project.pbxproj b/bindings/ios/MEGASDK.xcodeproj/project.pbxproj
@@ -89,6 +89,7 @@
 		A8827A5C1F178A0D0097B5DE /* DelegateMEGATreeProcessorListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8827A5B1F178A0D0097B5DE /* DelegateMEGATreeProcessorListener.mm */; };
 		A88722DC1FFE6A8B00E3F443 /* mediafileattribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A88722DB1FFE6A8A00E3F443 /* mediafileattribute.cpp */; };
 		A8A86BD51F559EDA00C214DA /* mega_zxcvbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A86BD41F559EDA00C214DA /* mega_zxcvbn.cpp */; };
+		A8C45FD7237AB61A00342F36 /* testhooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C45FD6237AB61A00342F36 /* testhooks.cpp */; };
 		A8FD7334230ABA400070A5E8 /* MEGACancelToken.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8FD7333230ABA400070A5E8 /* MEGACancelToken.mm */; };
 		A8FD7B641E93B40E0031FC50 /* osxutils.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8FD7B631E93B40E0031FC50 /* osxutils.mm */; };
 		B6657E9C225C2B6200EF8D91 /* raid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6657E9B225C2B6200EF8D91 /* raid.cpp */; };
@@ -307,6 +308,8 @@
 		A8A86BD21F559C0100C214DA /* mega_utf8proc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mega_utf8proc.h; sourceTree = "<group>"; };
 		A8A86BD31F559C0100C214DA /* mega_zxcvbn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mega_zxcvbn.h; sourceTree = "<group>"; };
 		A8A86BD41F559EDA00C214DA /* mega_zxcvbn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mega_zxcvbn.cpp; path = ../../src/mega_zxcvbn.cpp; sourceTree = "<group>"; };
+		A8C45FD5237AB5FE00342F36 /* testhooks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testhooks.h; sourceTree = "<group>"; };
+		A8C45FD6237AB61A00342F36 /* testhooks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testhooks.cpp; path = ../../src/testhooks.cpp; sourceTree = "<group>"; };
 		A8EBFDD21EFAE14C00DF89DA /* MEGAEvent+init.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MEGAEvent+init.h"; sourceTree = "<group>"; };
 		A8FD7332230ABA400070A5E8 /* MEGACancelToken.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MEGACancelToken.h; sourceTree = "<group>"; };
 		A8FD7333230ABA400070A5E8 /* MEGACancelToken.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MEGACancelToken.mm; sourceTree = "<group>"; };
@@ -380,6 +383,7 @@
 				940BEFAE19ED92C2007E7FA2 /* share.cpp */,
 				940BEFAF19ED92C2007E7FA2 /* sharenodekeys.cpp */,
 				940BEFB019ED92C2007E7FA2 /* sync.cpp */,
+				A8C45FD6237AB61A00342F36 /* testhooks.cpp */,
 				940BEFB119ED92C2007E7FA2 /* transfer.cpp */,
 				940BEFB219ED92C2007E7FA2 /* transferslot.cpp */,
 				940BEFB319ED92C2007E7FA2 /* treeproc.cpp */,
@@ -562,6 +566,7 @@
 				940BF06619EDBCAD007E7FA2 /* share.h */,
 				940BF06719EDBCAD007E7FA2 /* sharenodekeys.h */,
 				940BF06819EDBCAD007E7FA2 /* sync.h */,
+				A8C45FD5237AB5FE00342F36 /* testhooks.h */,
 				940BF06919EDBCAD007E7FA2 /* thread */,
 				940BF06D19EDBCAD007E7FA2 /* thread.h */,
 				940BF06E19EDBCAD007E7FA2 /* transfer.h */,
@@ -778,6 +783,7 @@
 				A8A86BD51F559EDA00C214DA /* mega_zxcvbn.cpp in Sources */,
 				A8FD7B641E93B40E0031FC50 /* osxutils.mm in Sources */,
 				940BEFB819ED92C2007E7FA2 /* backofftimer.cpp in Sources */,
+				A8C45FD7237AB61A00342F36 /* testhooks.cpp in Sources */,
 				BFD7F5172341B3A60039A6EE /* MEGAPushNotificationSettings.mm in Sources */,
 				940BEFF419ED9351007E7FA2 /* net.cpp in Sources */,
 				940BF01119ED97B9007E7FA2 /* MEGANode.mm in Sources */,