Merge pull request #1961 from meganz/release/v3.7.0

Release/v3.7.0

bindings/ios/MEGASdk.h

@@ -1562,7 +1562,7 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
 - (void)fastSendSignupLinkWithEmail:(NSString *)email base64pwkey:(NSString *)base64pwkey name:(NSString *)name __attribute__((deprecated("This function only works using the old registration method and will be removed soon. Please use [MEGASdk sendSignupLinkWithEmail:name:password:] instead.")));
 
 /**
- * @brief Get information about a confirmation link.
+ * @brief Get information about a confirmation link or a new signup link.
  *
  * The associated request type with this request is MEGARequestTypeQuerySignUpLink.
  * Valid data in the MEGARequest object received on all callbacks:
@@ -1572,14 +1572,28 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * is MEGAErrorTypeApiOk:
  * - [MEGARequest email] - Return the email associated with the confirmation link.
  * - [MEGARequest name] - Returns the name associated with the confirmation link.
+ * - [MEGARequest flag] - Returns true if the account was automatically confirmed, otherwise false
+ 
+ * If [MEGARequest flag] returns YES, the account was automatically confirmed and it's not needed
+ * to call [MEGASdk confirmAccountWithLink:password:delegate]. If it returns NO, it's needed to call [MEGASdk confirmAccountWithLink:password:delegate]
+ * as usual. New accounts (V2, starting from April 2018) do not require a confirmation with the password,
+ * but old confirmation links (V1) require it, so it's needed to check that parameter in onRequestFinish
+ * to know how to proceed.
+ *
+ * If already logged-in into a different account, you will get the error code MEGAErrorTypeApiEAccess
+ * in onRequestFinish.
+ * If logged-in into the account that is attempted to confirm and the account is already confirmed, you
+ * will get the error code MEGAErrorTypeApiEExpired in onRequestFinish.
+ * In both cases, the [MEGARequest email] will return the email of the account that was attempted
+ * to confirm, and the [MEGARequest name] will return the name.
  *
  * @param link Confirmation link
  * @param delegate Delegate to track this request
  */
 - (void)querySignupLink:(NSString *)link delegate:(id<MEGARequestDelegate>)delegate;
 
 /**
- * @brief Get information about a confirmation link.
+ * @brief Get information about a confirmation link or a new signup link.
  *
  * The associated request type with this request is MEGARequestTypeQuerySignUpLink.
  * Valid data in the MEGARequest object received on all callbacks:
@@ -1589,6 +1603,20 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * is MEGAErrorTypeApiOk:
  * - [MEGARequest email] - Return the email associated with the confirmation link.
  * - [MEGARequest name] - Returns the name associated with the confirmation link.
+ * - [MEGARequest flag] - Returns true if the account was automatically confirmed, otherwise false
+ 
+ * If [MEGARequest flag] returns YES, the account was automatically confirmed and it's not needed
+ * to call [MEGASdk confirmAccountWithLink:password:delegate]. If it returns NO, it's needed to call [MEGASdk confirmAccountWithLink:password:delegate]
+ * as usual. New accounts (V2, starting from April 2018) do not require a confirmation with the password,
+ * but old confirmation links (V1) require it, so it's needed to check that parameter in onRequestFinish
+ * to know how to proceed.
+ *
+ * If already logged-in into a different account, you will get the error code MEGAErrorTypeApiEAccess
+ * in onRequestFinish.
+ * If logged-in into the account that is attempted to confirm and the account is already confirmed, you
+ * will get the error code MEGAErrorTypeApiEExpired in onRequestFinish.
+ * In both cases, the [MEGARequest email] will return the email of the account that was attempted
+ * to confirm, and the [MEGARequest name] will return the name.
  *
  * @param link Confirmation link.
  */
@@ -1607,6 +1635,18 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * - [MEGARequest email] - Email of the account
  * - [MEGARequest name] - Name of the user
  *
+ * As a result of a successfull confirmation, the app will receive the callback
+ * [MEGADelegate onEvent: event:] and [MEGAGlobalDelegate onEvent: event:] with an event of type
+ * EventAccountConfirmation. You can check the email used to confirm
+ * the account by checking [MEGAEvent text]. @see [MEGADelegate onEvent: event:].
+ *
+ * If already logged-in into a different account, you will get the error code MEGAErrorTypeApiEAccess
+ * in onRequestFinish.
+ * If logged-in into the account that is attempted to confirm and the account is already confirmed, you
+ * will get the error code MEGAErrorTypeApiEExpired in onRequestFinish.
+ * In both cases, the [MEGARequest email] will return the email of the account that was attempted
+ * to confirm, and the [MEGARequest name] will return the name.
+ *
  * @param link Confirmation link.
  * @param password Password for the account.
  * @param delegate Delegate to track this request.
@@ -1626,6 +1666,18 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * - [MEGARequest email] - Email of the account
  * - [MEGARequest name] - Name of the user
  *
+ * As a result of a successfull confirmation, the app will receive the callback
+ * [MEGADelegate onEvent: event:] and [MEGAGlobalDelegate onEvent: event:] with an event of type
+ * EventAccountConfirmation. You can check the email used to confirm
+ * the account by checking [MEGAEvent text]. @see [MEGADelegate onEvent: event:].
+ *
+ * If already logged-in into a different account, you will get the error code MEGAErrorTypeApiEAccess
+ * in onRequestFinish.
+ * If logged-in into the account that is attempted to confirm and the account is already confirmed, you
+ * will get the error code MEGAErrorTypeApiEExpired in onRequestFinish.
+ * In both cases, the [MEGARequest email] will return the email of the account that was attempted
+ * to confirm, and the [MEGARequest name] will return the name.
+ *
  * @param link Confirmation link.
  * @param password Password for the account.
  */
@@ -4738,6 +4790,8 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * The associated request type with this request is MEGARequestTypeSetAttrUser
  * Valid data in the MEGARequest object received on callbacks:
  * - [MEGARequest paramType] - Returns the attribute type MEGAUserAttributeMyChatFilesFolder
+ * - [MEGARequest megaStringDictionary] - Returns a megaStringDictionary.
+ * The key "h" in the map contains the nodehandle specified as parameter encoded in B64
  *
  * @param handle Handle of the node to be used as target folder
  * @param delegate MEGARequestDelegate to track this request
@@ -4750,6 +4804,8 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * The associated request type with this request is MEGARequestTypeSetAttrUser
  * Valid data in the MEGARequest object received on callbacks:
  * - [MEGARequest paramType] - Returns the attribute type MEGAUserAttributeMyChatFilesFolder
+ * - [MEGARequest megaStringDictionary] - Returns a megaStringDictionary.
+ * The key "h" in the map contains the nodehandle specified as parameter encoded in B64
  *
  * @param handle Handle of the node to be used as target folder
  */
@@ -4789,6 +4845,8 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * The associated request type with this request is MEGARequestTypeSetAttrUser
  * Valid data in the MEGARequest object received on callbacks:
  * - [MEGARequest paramType] - Returns the attribute type MEGAUserAttributeCameraUploadsFolder
+ * - [MEGARequest megaStringDictionary] - Returns a megaStringDictionary.
+ * The key "h" in the map contains the nodehandle specified as parameter encoded in B64
  *
  * @param handle Handle of the node to be used as target folder
  * @param delegate MEGARequestDelegate to track this request
@@ -4801,6 +4859,8 @@ typedef NS_ENUM(NSInteger, AffiliateType) {
  * The associated request type with this request is MEGARequestTypeSetAttrUser
  * Valid data in the MEGARequest object received on callbacks:
  * - [MEGARequest paramType] - Returns the attribute type MEGAUserAttributeCameraUploadsFolder
+ * - [MEGARequest megaStringDictionary] - Returns a megaStringDictionary.
+ * The key "h" in the map contains the nodehandle specified as parameter encoded in B64
  *
  * @param handle Handle of the node to be used as target folder
  */

bindings/java/nz/mega/sdk/AndroidGfxProcessor.java

@@ -15,13 +15,14 @@
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Rect;
-import android.media.ExifInterface;
 import android.media.MediaMetadataRetriever;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 
+import androidx.exifinterface.media.ExifInterface;
+
 import static mega.privacy.android.app.utils.LogUtil.*;
 
 public class AndroidGfxProcessor extends MegaGfxProcessor {

bindings/java/nz/mega/sdk/MegaApiJava.java

@@ -5105,6 +5105,8 @@ public void isGeolocationEnabled(MegaRequestListenerInterface listener){
      * The associated request type with this request is MegaRequest::TYPE_SET_ATTR_USER
      * Valid data in the MegaRequest object received on callbacks:
      * - MegaRequest::getParamType - Returns the attribute type MegaApi::USER_ATTR_MY_CHAT_FILES_FOLDER
+     * - MegaRequest::getMegaStringMap - Returns a MegaStringMap.
+     * The key "h" in the map contains the nodehandle specified as parameter encoded in B64
      *
      * @param nodehandle MegaHandle of the node to be used as target folder
      * @param listener MegaRequestListener to track this request
@@ -5140,6 +5142,8 @@ public void getMyChatFilesFolder(MegaRequestListenerInterface listener){
      * - MegaRequest::getParamType - Returns the attribute type MegaApi::USER_ATTR_CAMERA_UPLOADS_FOLDER
      * - MegaRequest::getFlag - Returns false
      * - MegaRequest::getNodehandle - Returns the provided node handle
+     * - MegaRequest::getMegaStringMap - Returns a MegaStringMap.
+     * The key "h" in the map contains the nodehandle specified as parameter encoded in B64
      *
      * @param nodehandle MegaHandle of the node to be used as primary target folder
      * @param listener MegaRequestListener to track this request
@@ -5156,6 +5160,8 @@ public void setCameraUploadsFolder(long nodehandle, MegaRequestListenerInterface
      * - MegaRequest::getParamType - Returns the attribute type MegaApi::USER_ATTR_CAMERA_UPLOADS_FOLDER
      * - MegaRequest::getFlag - Returns true
      * - MegaRequest::getNodehandle - Returns the provided node handle
+     * - MegaRequest::getMegaStringMap - Returns a MegaStringMap.
+     * The key "sh" in the map contains the nodehandle specified as parameter encoded in B64
      *
      * @param nodehandle MegaHandle of the node to be used as secondary target folder
      * @param listener MegaRequestListener to track this request

bindings/qt/sdk.pri

@@ -232,7 +232,13 @@ CONFIG(USE_LIBRAW) {
 CONFIG(USE_PDFIUM) {
 
     vcpkg:INCLUDEPATH += $$THIRDPARTY_VCPKG_PATH/include/pdfium
-    vcpkg:LIBS += -lpdfium -llcms$$DEBUG_SUFFIX -licuuc$$DEBUG_SUFFIX_WO -licuio$$DEBUG_SUFFIX_WO -ljpeg$$DEBUG_SUFFIX_WO -lopenjp2 -lfreetype$$DEBUG_SUFFIX 
+    vcpkg:LIBS += -lpdfium -lfreetype$$DEBUG_SUFFIX -ljpeg$$DEBUG_SUFFIX_WO -lopenjp2  -llcms$$DEBUG_SUFFIX 
+
+    #make sure we get the vcpkg built icu libraries and not a system one with the same name
+    vcpkg:LIBS += -l$$THIRDPARTY_VCPKG_PATH/lib/icuuc$$DEBUG_SUFFIX_WO.lib -l$$THIRDPARTY_VCPKG_PATH/lib/icuio$$DEBUG_SUFFIX_WO.lib
+    #vcpkg:QMAKE_LFLAGS_WINDOWS += /VERBOSE
+
+    vcpkg:unix:!macx:LIBS += -lpng -lharfbuzz #freetype dependencies. ideally we could use pkg-config to get these
     # is it needed? win has it, mac does not -licuin$$DEBUG_SUFFIX_WO
     vcpkg:win32:LIBS += -lGdi32
     vcpkg:DEFINES += HAVE_PDFIUM
@@ -515,7 +521,7 @@ vcpkg {
     CONFIG(USE_CURL) {
         INCLUDEPATH += $$THIRDPARTY_VCPKG_PATH/include/openssl
         INCLUDEPATH += $$THIRDPARTY_VCPKG_PATH/include/cares
-        win32:LIBS +=  -llibcurl$$DASH_DEBUG_SUFFIX -lcares -llibeay32 -lssleay32
+        win32:LIBS +=  -llibcurl$$DASH_DEBUG_SUFFIX -lcares -llibcrypto -llibssl
         else:LIBS +=  -lcurl$$DASH_DEBUG_SUFFIX -lcares -lcrypto -lssl
     }
 

bindings/wp8/MegaSDK.cpp

@@ -124,7 +124,10 @@ MegaSDK::MegaSDK(String^ appKey, String^ userAgent, String^ basePath, MRandomNum
 
 	externalGfxProcessor = NULL;
 	if (gfxProcessor != nullptr)
+        {
 		externalGfxProcessor = new DelegateMGfxProcessor(gfxProcessor);
+                externalGfxProcessor.startProcessingThread();
+        }
 
 	megaApi = new MegaApi((appKey != nullptr) ? utf8appKey.c_str() : NULL,
 		externalGfxProcessor,