Merge pull request #1622 from meganz/release/v3.6.3

Release/v3.6.3
meganz · Oct 10, 2019 · d6bcd74 · d6bcd74
2 parents 529437a + 49df2e3
commit d6bcd74
Show file tree

Hide file tree

Showing 42 changed files with 3,186 additions and 903 deletions.
diff --git a/bindings/ios/MEGACancelToken.h b/bindings/ios/MEGACancelToken.h
@@ -0,0 +1,41 @@
+/**
+ * @file MEGACancelToken.h
+ * @brief Cancel MEGASdk methods.
+ *
+ * (c) 2019- by Mega Limited, Auckland, New Zealand
+ *
+ * This file is part of the MEGA SDK - Client Access Engine.
+ *
+ * Applications using the MEGA API must present a valid application key
+ * and comply with the the rules set forth in the Terms of Service.
+ *
+ * The MEGA SDK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Simplified (2-clause) BSD License.
+ *
+ * You should have received a copy of the license along with this
+ * program.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MEGACancelToken : NSObject
+
+/**
+ * @brief The state of the flag
+ */
+@property (nonatomic, readonly, getter=isCancelled) BOOL cancelled;
+
+/**
+ * @brief Allows to set the value of the flag
+ * @param newValue YES to force the cancelation of the processing. NO to reset.
+ */
+- (void)cancelWithNewValue:(BOOL)newValue;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/bindings/ios/MEGACancelToken.mm b/bindings/ios/MEGACancelToken.mm
@@ -0,0 +1,60 @@
+/**
+ * @file MEGACancelToken.m
+ * @brief Cancel MEGASdk methods.
+ *
+ * (c) 2019- by Mega Limited, Auckland, New Zealand
+ *
+ * This file is part of the MEGA SDK - Client Access Engine.
+ *
+ * Applications using the MEGA API must present a valid application key
+ * and comply with the the rules set forth in the Terms of Service.
+ *
+ * The MEGA SDK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Simplified (2-clause) BSD License.
+ *
+ * You should have received a copy of the license along with this
+ * program.
+ */
+
+#import "MEGACancelToken.h"
+#import "megaapi.h"
+#import "MEGACancelToken+init.h"
+
+@interface MEGACancelToken ()
+
+@property (nonatomic) mega::MegaCancelToken *megaCancelToken;
+
+@end
+
+@implementation MEGACancelToken
+
+- (instancetype)init {
+    self = [super init];
+
+    if (self) {
+        _megaCancelToken = mega::MegaCancelToken::createInstance();
+    }
+
+    return self;
+}
+
+- (void)dealloc {
+    delete _megaCancelToken;
+}
+
+- (mega::MegaCancelToken *)getCPtr {
+    return self.megaCancelToken;
+}
+
+- (BOOL)isCancelled {
+    return self.megaCancelToken->isCancelled();
+}
+
+- (void)cancelWithNewValue:(BOOL)newValue {
+    self.megaCancelToken->cancel(newValue);
+}
+
+@end
diff --git a/bindings/ios/MEGADelegate.h b/bindings/ios/MEGADelegate.h
@@ -28,6 +28,8 @@
 #import "MEGAContactRequestList.h"
 #import "MEGAEvent.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class MEGASdk;
 
 /**
@@ -280,3 +282,5 @@
 - (void)onEvent:(MEGASdk *)api event:(MEGAEvent *)event;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/bindings/ios/MEGAEvent.h b/bindings/ios/MEGAEvent.h
@@ -31,7 +31,9 @@ typedef NS_ENUM(NSUInteger, Event) {
     EventNodesCurrent = 6,
     EventMediaInfoReady = 7,
     EventStorageSumChanged = 8,
-    EventBusinessStatus = 9
+    EventBusinessStatus = 9,
+    EventKeyModified = 10,
+    EventMiscFlagsReady = 11
 };
 
 /**

diff --git a/bindings/ios/MEGAGlobalDelegate.h b/bindings/ios/MEGAGlobalDelegate.h
@@ -20,6 +20,8 @@
  */
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  * @brief Protocol to get information about global events.
  *
@@ -182,3 +184,5 @@
 - (void)onEvent:(MEGASdk *)api event:(MEGAEvent *)event;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/bindings/ios/MEGALoggerDelegate.h b/bindings/ios/MEGALoggerDelegate.h
@@ -20,6 +20,7 @@
  */
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * @brief Protocol to receive information about SDK logs
@@ -59,3 +60,5 @@
 - (void)logWithTime:(NSString*)time logLevel:(NSInteger)logLevel source:(NSString *)source message:(NSString *)message;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/bindings/ios/MEGARequestDelegate.h b/bindings/ios/MEGARequestDelegate.h
@@ -22,6 +22,8 @@
 #import "MEGARequest.h"
 #import "MEGAError.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class MEGASdk;
 
 /**
@@ -88,3 +90,4 @@
 
 @end
 
+NS_ASSUME_NONNULL_END
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 */; };
+		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 */; };
 		B698890D2198CCE300D0EE89 /* MEGAFileInputStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = B698890B2198CCE300D0EE89 /* MEGAFileInputStream.mm */; };
@@ -306,6 +307,9 @@
 		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>"; };
 		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>"; };
+		A8FD7335230AC42B0070A5E8 /* MEGACancelToken+init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MEGACancelToken+init.h"; sourceTree = "<group>"; };
 		A8FD7B611E93B3ED0031FC50 /* osxutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osxutils.h; path = osx/osxutils.h; sourceTree = "<group>"; };
 		A8FD7B631E93B40E0031FC50 /* osxutils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = osxutils.mm; path = ../../src/osx/osxutils.mm; sourceTree = "<group>"; };
 		B622FC762174261F00CF707C /* MEGABackgroundMediaUpload+init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MEGABackgroundMediaUpload+init.h"; sourceTree = "<group>"; };
@@ -495,6 +499,8 @@
 				5B1D7CE121F1E07200B0215E /* MEGARecentActionBucket.mm */,
 				B6A6CB642170125A009032C9 /* MEGABackgroundMediaUpload.h */,
 				B6A6CB652170125A009032C9 /* MEGABackgroundMediaUpload.mm */,
+				A8FD7332230ABA400070A5E8 /* MEGACancelToken.h */,
+				A8FD7333230ABA400070A5E8 /* MEGACancelToken.mm */,
 			);
 			name = bindings;
 			sourceTree = "<group>";
@@ -654,6 +660,7 @@
 				A808E4862158DAC400BDCE82 /* MEGATimeZoneDetails+init.h */,
 				5B0670CD21F5BABD00AD9F99 /* MEGARecentActionBucket+init.h */,
 				B622FC762174261F00CF707C /* MEGABackgroundMediaUpload+init.h */,
+				A8FD7335230AC42B0070A5E8 /* MEGACancelToken+init.h */,
 			);
 			path = Private;
 			sourceTree = "<group>";
@@ -805,6 +812,7 @@
 				940BEFBA19ED92C2007E7FA2 /* command.cpp in Sources */,
 				940BEFD019ED92C2007E7FA2 /* transfer.cpp in Sources */,
 				5B72A14D20D3B3FB007FE4FD /* mega_ccronexpr.cpp in Sources */,
+				A8FD7334230ABA400070A5E8 /* MEGACancelToken.mm in Sources */,
 				41AD7A7E1A1E10F900D66856 /* DelegateMEGALoggerListener.mm in Sources */,
 				41A990731A5D305700B2094A /* mega_utf8proc.cpp in Sources */,
 				A81790101EFACE6400110E91 /* MEGAHandleList.mm in Sources */,