Merge pull request #1910 from meganz/release/v3.6.9

Release/v3.6.9
meganz · Apr 8, 2020 · 349f72b · 349f72b
2 parents a4f78fb + 0984c49
commit 349f72b
Show file tree

Hide file tree

Showing 221 changed files with 11,750 additions and 1,438 deletions.
diff --git a/bindings/ios/MEGASdk.h b/bindings/ios/MEGASdk.h
diff --git a/bindings/ios/MEGASdk.mm b/bindings/ios/MEGASdk.mm
@@ -630,13 +630,6 @@ - (void)resetCredentialsOfUser:(MEGAUser *)user {
 
 #pragma mark - Create account and confirm account Requests
 
-- (void)createAccountWithEmail:(NSString *)email password:(NSString *)password name:(NSString *)name {
-    self.megaApi->createAccount((email != nil) ? [email UTF8String] : NULL, (password != nil) ? [password UTF8String] : NULL, (name != nil) ? [name UTF8String] : NULL);
-}
-
-- (void)createAccountWithEmail:(NSString *)email password:(NSString *)password name:(NSString *)name delegate:(id<MEGARequestDelegate>)delegate {
-    self.megaApi->createAccount((email != nil) ? [email UTF8String] : NULL, (password != nil) ? [password UTF8String] : NULL, (name != nil) ? [name UTF8String] : NULL, [self createDelegateMEGARequestListener:delegate singleListener:YES]);
-}
 
 - (void)createAccountWithEmail:(NSString *)email password:(NSString *)password firstname:(NSString *)firstname lastname:(NSString *)lastname {
     self.megaApi->createAccount((email != nil) ? [email UTF8String] : NULL, (password != nil) ? [password UTF8String] : NULL, (firstname != nil) ? [firstname UTF8String] : NULL, (lastname != nil) ? [lastname UTF8String] : NULL);
@@ -646,6 +639,14 @@ - (void)createAccountWithEmail:(NSString *)email password:(NSString *)password f
     self.megaApi->createAccount((email != nil) ? [email UTF8String] : NULL, (password != nil) ? [password UTF8String] : NULL, (firstname != nil) ? [firstname UTF8String] : NULL, (lastname != nil) ? [lastname UTF8String] : NULL, [self createDelegateMEGARequestListener:delegate singleListener:YES]);
 }
 
+- (void)createAccountWithEmail:(NSString *)email password:(NSString *)password firstname:(NSString *)firstname lastname:(NSString *)lastname lastPublicHandle:(uint64_t)lastPublicHandle lastPublicHandleType:(AffiliateType)lastPublicHandleType lastAccessTimestamp:(uint64_t)lastAccessTimestamp {
+    self.megaApi->createAccount(email.UTF8String, password.UTF8String, firstname.UTF8String, lastname.UTF8String, lastPublicHandle, (int)lastPublicHandleType, lastAccessTimestamp);
+}
+
+- (void)createAccountWithEmail:(NSString *)email password:(NSString *)password firstname:(NSString *)firstname lastname:(NSString *)lastname lastPublicHandle:(uint64_t)lastPublicHandle lastPublicHandleType:(AffiliateType)lastPublicHandleType lastAccessTimestamp:(uint64_t)lastAccessTimestamp delegate:(id<MEGARequestDelegate>)delegate {
+    self.megaApi->createAccount(email.UTF8String, password.UTF8String, firstname.UTF8String, lastname.UTF8String, lastPublicHandle, (int)lastPublicHandleType, lastAccessTimestamp, [self createDelegateMEGARequestListener:delegate singleListener:YES]);
+}
+
 - (void)resumeCreateAccountWithSessionId:(NSString *)sessionId delegate:(id<MEGARequestDelegate>)delegate {
     self.megaApi->resumeCreateAccount((sessionId != nil) ? [sessionId UTF8String] : NULL, [self createDelegateMEGARequestListener:delegate singleListener:YES]);
 }
@@ -865,6 +866,14 @@ - (void)moveNode:(MEGANode *)node newParent:(MEGANode *)newParent {
     self.megaApi->moveNode((node != nil) ? [node getCPtr] : NULL, (newParent != nil) ? [newParent getCPtr] : NULL);
 }
 
+- (void)moveNode:(MEGANode *)node newParent:(MEGANode *)newParent newName:(NSString *)newName delegate:(id<MEGARequestDelegate>)delegate {
+    self.megaApi->moveNode((node != nil) ? [node getCPtr] : NULL, (newParent != nil) ? [newParent getCPtr] : NULL, newName.UTF8String, [self createDelegateMEGARequestListener:delegate singleListener:YES]);
+}
+
+- (void)moveNode:(MEGANode *)node newParent:(MEGANode *)newParent newName:(NSString *)newName {
+    self.megaApi->moveNode((node != nil) ? [node getCPtr] : NULL, (newParent != nil) ? [newParent getCPtr] : NULL, newName.UTF8String);
+}
+
 - (void)copyNode:(MEGANode *)node newParent:(MEGANode *)newParent delegate:(id<MEGARequestDelegate>)delegate {
     self.megaApi->copyNode((node != nil) ? [node getCPtr] : NULL, (newParent != nil) ? [newParent getCPtr] : NULL, [self createDelegateMEGARequestListener:delegate singleListener:YES]);
 }

diff --git a/bindings/java/nz/mega/sdk/MegaApiJava.java b/bindings/java/nz/mega/sdk/MegaApiJava.java
diff --git a/bindings/qt/QTMegaEvent.h b/bindings/qt/QTMegaEvent.h
@@ -1,5 +1,4 @@
-#ifndef QTMEGAEVENT_H
-#define QTMEGAEVENT_H
+#pragma once
 
 #include <megaapi.h>
 #include <QEvent>
@@ -81,5 +80,3 @@ class QTMegaEvent: public QEvent
 };
 
 }
-
-#endif // QTMEGAEVENT_H
diff --git a/bindings/qt/QTMegaGlobalListener.h b/bindings/qt/QTMegaGlobalListener.h
@@ -1,5 +1,4 @@
-#ifndef QTMEGAGLOBALLISTENER_H
-#define QTMEGAGLOBALLISTENER_H
+#pragma once
 
 #include <QObject>
 #include "megaapi.h"
@@ -28,5 +27,3 @@ class QTMegaGlobalListener : public QObject, public MegaGlobalListener
     MegaGlobalListener *listener;
 };
 }
-
-#endif // QTMEGAGLOBALLISTENER_H
diff --git a/bindings/qt/QTMegaListener.h b/bindings/qt/QTMegaListener.h
@@ -1,5 +1,4 @@
-#ifndef QTMEGALISTENER_H
-#define QTMEGALISTENER_H
+#pragma once
 
 #include <QObject>
 #include "megaapi.h"
@@ -42,5 +41,3 @@ class QTMegaListener : public QObject, public MegaListener
 	MegaListener *listener;
 };
 }
-
-#endif // QTMEGALISTENER_H
diff --git a/bindings/qt/QTMegaRequestListener.h b/bindings/qt/QTMegaRequestListener.h
@@ -1,5 +1,4 @@
-#ifndef QTMEGAREQUESTLISTENER_H
-#define QTMEGAREQUESTLISTENER_H
+#pragma once
 
 #include <QObject>
 #include "megaapi.h"
@@ -27,5 +26,3 @@ class QTMegaRequestListener : public QObject, public MegaRequestListener
     MegaApi *megaApi;
 };
 }
-
-#endif // QTMEGAREQUESTLISTENER_H
diff --git a/bindings/qt/QTMegaSyncListener.h b/bindings/qt/QTMegaSyncListener.h
@@ -1,5 +1,4 @@
-#ifndef QTMEGALISTENER_H
-#define QTMEGALISTENER_H
+#pragma once
 
 #ifdef ENABLE_SYNC
 
@@ -28,5 +27,3 @@ class QTMegaSyncListener : public QObject, public MegaSyncListener
 }
 
 #endif //ENABLE_SYNC
-
-#endif // QTMEGALISTENER_H
diff --git a/bindings/qt/QTMegaTransferListener.h b/bindings/qt/QTMegaTransferListener.h
@@ -1,5 +1,4 @@
-#ifndef QTMEGATRANSFERLISTENER_H
-#define QTMEGATRANSFERLISTENER_H
+#pragma once
 
 #include <QObject>
 #include <megaapi.h>
@@ -27,5 +26,3 @@ class QTMegaTransferListener : public QObject, public MegaTransferListener
 	MegaTransferListener *listener;
 };
 }
-
-#endif // QTMEGATRANSFERLISTENER_H