Merge branch 'release/v7.9.0' into 'master'

Release 7.9.0

See merge request sdk/sdk!5774

.gitignore

@@ -92,13 +92,6 @@ doc/example/lsmega
 Debug
 Release
 /build-x??-*-mega*/
-/contrib/QtCreator/build-*
-/contrib/build-MEGAsdk-Desktop-*
-/contrib/cmake/cmake-build-*
-/contrib/build-cmake-Desktop-*
-/contrib/cmake/.idea
-/contrib/cmake/build
-/contrib/cmake/build3rdParty/build
 megaclient_statecache*
 *.autosave
 

CMakeLists.txt

@@ -1,16 +1,3 @@
-
-option(OLD_CMAKE "" OFF)
-
-if(OLD_CMAKE)
-    # This file is here in the root folder so it can be opened as a CMake project in Visual Studio, eg in order to debug a Linux build in WSL2.
-    cmake_minimum_required(VERSION 3.13)
-    project(TryWSL)
-    include(${CMAKE_CURRENT_LIST_DIR}/contrib/cmake/CMakeLists.txt)
-
-    # Do not continue with the rest of the CMake file.
-    return()
-endif()
-
 # CMakeLists.txt file to build the SDKlib library.
 #
 # It can be used to build a standalone library or to be included via add_subdirectory.

README.md

@@ -130,19 +130,6 @@ To run the example app `megacli`, go to the `examples` directory in the `build_d
 
 ## How to build the SDK library (Obsolete methods)
 
-### Build the SDK and 3rdParty Dependencies with vcpkg + cmake
-* The steps to build the SDK are already prepared in the build_from_scratch.cmake script.  It contains instructions too.
-* To get started with it, eg for windows, follow these steps:
-	* mkdir mybuild
-	* cd mybuild
-	* git clone https://github.com/meganz/sdk.git
-	* cd sdk\contrib\cmake
-	* <on Win, choose VS version by editing vcpkg_extra_triplets\xNN-windows-mega.cmake>
-	* cmake -DTRIPLET=x64-windows-mega -DEXTRA_ARGS="-DUSE_PDFIUM=0" -P build_from_scratch.cmake
-* Visual Studio solution is generated at mybuild\sdk\build-x64-windows-mega
-* That folder contains Debug and Release subfolders which contain build products
-* Similar steps work for other platforms too (Linux with triplet x64-linux-mega (including WSL), Mac with triplet x64-osx-mega or arm64-osx-mega).
-
 ### Building with POSIX Autotools  (Linux/Darwin/BSD/OSX ...)
 
 For platforms with Autotools, first set up needed libraries and then the generic way to build and install it is:

bindings/ios/MEGACancelToken.mm

@@ -42,7 +42,9 @@ - (instancetype)init {
 }
 
 - (void)dealloc {
-    delete _megaCancelToken;
+    if (_megaCancelToken) {
+        delete _megaCancelToken;
+    }
 }
 
 - (mega::MegaCancelToken *)getCPtr {
@@ -54,7 +56,9 @@ - (BOOL)isCancelled {
 }
 
 - (void)cancel {
-    self.megaCancelToken->cancel();
+    if (_megaCancelToken) {
+        self.megaCancelToken->cancel();
+    }
 }
 
 @end

bindings/ios/MEGASdk.mm

@@ -2203,6 +2203,12 @@ - (void)creditCardCancelSubscriptions:(nullable NSString *)reason delegate:(id<M
     }
 }
 
+- (void)creditCardCancelSubscriptions:(nullable NSString *)reason subscriptionId:(nullable NSString *)subscriptionId canContact:(BOOL)canContact delegate:(id<MEGARequestDelegate>)delegate {
+    if (self.megaApi) {
+        self.megaApi->creditCardCancelSubscriptions(reason.UTF8String, subscriptionId.UTF8String, canContact, [self createDelegateMEGARequestListener:delegate singleListener:YES queueType:ListenerQueueTypeCurrent]);
+    }
+}
+
 - (void)changePassword:(NSString *)oldPassword newPassword:(NSString *)newPassword delegate:(id<MEGARequestDelegate>)delegate {
     if (self.megaApi) {
         self.megaApi->changePassword(oldPassword.UTF8String, newPassword.UTF8String, [self createDelegateMEGARequestListener:delegate singleListener:YES]);

bindings/ios/include/MEGASdk.h

@@ -5645,6 +5645,17 @@ typedef NS_ENUM(NSInteger, MEGAClientType) {
  */
 - (void)creditCardCancelSubscriptions:(nullable NSString *)reason delegate:(id<MEGARequestDelegate>)delegate;
 
+/**
+ * @brief Cancel credit card subscriptions of the account
+ *
+ * The associated request type with this request is MEGARequestTypeCreditCardCancelSubscriptions
+ * @param reason Reason for the cancellation. It can be nil.
+ * @param subscriptionId The subscription ID for the cancellation. It can be nil.
+ * @param canContact Whether the user has permitted MEGA to contact them for the cancellation.
+ * @param delegate MEGARequestDelegate to track this request
+ */
+- (void)creditCardCancelSubscriptions:(nullable NSString *)reason subscriptionId:(nullable NSString *)subscriptionId canContact:(BOOL)canContact delegate:(id<MEGARequestDelegate>)delegate;
+
 /**
  * @brief Change the password of the MEGA account.
  *