6.3.0

AppsFlyerSDK · May 27, 2021 · 7495e1b · 7495e1b
2 parents a5100fe + eb34a11
commit 7495e1b
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -36,8 +36,8 @@ You can read more [here](https://support.appsflyer.com/hc/en-us/articles/2070320
 
 ### <a id="plugin-build-for"> This plugin is built for
 
-- iOS AppsFlyerSDK **v6.2.6**
-- Android AppsFlyerSDK **v6.2.0**
+- iOS AppsFlyerSDK **v6.3.0**
+- Android AppsFlyerSDK **v6.3.0**
 
 ### <a id="breakingChanges"> ❗v6 Breaking Changes
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,4 +1,11 @@
 # Release Notes
+### 6.3.0
+Release date: *2021-May-27*
+
+**Overview and Highlights:**
+- Cordova > update to native sdk 6.3.0
+- Cordova (Ios) >> deep linking listeners 
+
 ### 6.2.60
 Release date: *2021-April-27*
 

diff --git a/docs/Guides.md b/docs/Guides.md
@@ -265,10 +265,10 @@ In both cases, you need to add this code before the `@end` tag:<br>
 // Open URI-scheme for iOS 8 and below
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString*)sourceApplication annotation:(id)annotation {
     // version >= 6.2.30
-    [[AppsFlyerAttribution shared] handleOpenURL:url sourceApplication:sourceApplication annotation:annotation];
+    [[AppsFlyerAttribution shared] handleOpenUrl:url sourceApplication:sourceApplication annotation:annotation];
 
     // version < 6.2.30
-    [[AppsFlyerLib shared] handleOpenURL:url sourceApplication:sourceApplication withAnnotation:annotation];
+    [[AppsFlyerLib shared] handleOpenUrl:url sourceApplication:sourceApplication withAnnotation:annotation];
     return YES;
 }
 // Open Universal Links

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-appsflyer-sdk",
-  "version": "6.2.60",
+  "version": "6.3.0",
   "description": "Cordova AppsFlyer SDK Plugin",
   "cordova": {
     "id": "cordova-plugin-appsflyer-sdk",

diff --git a/plugin.xml b/plugin.xml
@@ -21,7 +21,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-appsflyer-sdk"
-        version="6.2.60">
+        version="6.3.0">
     <name>AppsFlyer</name>
     <description>Cordova Plugin AppsFlyer</description>
     <license>Apache 2.0</license>
@@ -92,7 +92,7 @@
             <config>
             </config>
             <pods use-frameworks="true">
-                <pod name="AppsFlyerFramework" spec="6.2.6"/>
+                <pod name="AppsFlyerFramework" spec="6.3.0"/>
             </pods>
         </podspec>
     </platform>

diff --git a/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java b/src/android/com/appsflyer/cordova/plugin/AppsFlyerPlugin.java
@@ -34,7 +34,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import static com.appsflyer.cordova.plugin.AppsFlyerConstants.*;
@@ -44,10 +44,8 @@ public class AppsFlyerPlugin extends CordovaPlugin {
     private CallbackContext mConversionListener = null;
     private CallbackContext mAttributionDataListener = null;
     private CallbackContext mDeepLinkListener = null;
-    //    private Map<String, String> mAttributionData = null;
     private CallbackContext mInviteListener = null;
     private Uri intentURI = null;
-    //    private Uri newIntentURI = null;
     private Activity c;
 
     @Override
@@ -122,7 +120,7 @@ public boolean execute(final String action, JSONArray args, CallbackContext call
             return setHost(args);
         } else if ("addPushNotificationDeepLinkPath".equals(action)) {
             return addPushNotificationDeepLinkPath(args);
-        }else if ("setResolveDeepLinkURLs".equals(action)) {
+        } else if ("setResolveDeepLinkURLs".equals(action)) {
             return setResolveDeepLinkURLs(args);
         }
 
@@ -142,28 +140,6 @@ private boolean registerDeepLink(CallbackContext callbackContext) {
         return true;
     }
 
-
-    /**
-     * check if the app was launched from deep link after init()
-     */
-    private void trackAppLaunch() {
-        c = this.cordova.getActivity();
-        intentURI = cordova.getActivity().getIntent().getData();
-        if (intentURI != null) {
-            cordova.getThreadPool().execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        AppsFlyerLib.getInstance().performOnAppAttribution(cordova.getContext(), new URI(intentURI.toString()));
-                    } catch (URISyntaxException e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-        AppsFlyerLib.getInstance().logEvent(c, null, null);
-    }
-
     /**
      * Get the deeplink data
      *
@@ -194,6 +170,7 @@ private boolean initSdk(final JSONArray args, final CallbackContext callbackCont
 
         AppsFlyerProperties.getInstance().set(AppsFlyerProperties.LAUNCH_PROTECT_ENABLED, false);
         AppsFlyerLib instance = AppsFlyerLib.getInstance();
+        c = this.cordova.getActivity();
 
         try {
             final JSONObject options = args.getJSONObject(0);
@@ -234,14 +211,10 @@ private boolean initSdk(final JSONArray args, final CallbackContext callbackCont
             } else {
                 //callbackContext.success(SUCCESS);
             }
-
             instance.init(devKey, gcdListener, cordova.getActivity());
 
-            trackAppLaunch();
-
-
             if (mConversionListener == null) {
-                instance.start(c.getApplication(), devKey, new AppsFlyerRequestListener() {
+                instance.start(c, devKey, new AppsFlyerRequestListener() {
                     @Override
                     public void onSuccess() {
                         callbackContext.success(SUCCESS);
@@ -253,11 +226,10 @@ public void onError(int i, String s) {
                     }
                 });
             } else {
-                instance.start(c.getApplicationContext());
+                instance.start(c);
             }
 
-
-            instance.start(c.getApplicationContext());
+            instance.start(c);
 
             if (gcdListener != null) {
                 sendPluginNoResult(callbackContext);
@@ -290,7 +262,10 @@ public void onDeepLinking(@NonNull DeepLinkResult deepLinkResult) {
                         deepLinkObj.put("data", dlError.toString());
                     } else {
                         deepLinkObj.put("status", AF_SUCCESS);
-                        deepLinkObj.put("data", deepLinkResult.getDeepLink().toString());
+                        if (deepLinkResult.getStatus() == DeepLinkResult.Status.FOUND) {
+                            deepLinkObj.put("data", deepLinkResult.getDeepLink().getClickEvent());
+                            deepLinkObj.put("isDeferred", deepLinkResult.getDeepLink().isDeferred());
+                        }
                     }
                     sendEvent(deepLinkObj);
                 } catch (Exception e) {
@@ -395,9 +370,8 @@ private void sendEvent(JSONObject params) {
                         || params.optString("type") == AF_ON_INSTALL_CONVERSION_FAILURE)
                         && mConversionListener != null) {
             PluginResult result = new PluginResult(PluginResult.Status.OK, jsonStr);
-            result.setKeepCallback(false);
+            result.setKeepCallback(true);
             mConversionListener.sendPluginResult(result);
-            mConversionListener = null;
         } else if (
                 params.optString("type") == AF_DEEP_LINK
                         && mDeepLinkListener != null) {

diff --git a/src/android/cordovaAF.gradle b/src/android/cordovaAF.gradle
@@ -4,6 +4,6 @@ repositories {
 
 dependencies {
 	implementation 'com.android.installreferrer:installreferrer:2.1'
-	implementation 'com.appsflyer:af-android-sdk:6.2.0@aar'
+	implementation 'com.appsflyer:af-android-sdk:6.3.0@aar'
 	implementation 'com.android.support:support-annotations:28.0.0'
 }
diff --git a/src/ios/AppsFlyerPlugin.m b/src/ios/AppsFlyerPlugin.m
@@ -825,23 +825,3 @@ - (void)disableSKAD:(CDVInvokedUrlCommand *)command
 }
 
 @end
-
-
-// Universal Links Support - AppDelegate interface:
-@interface AppDelegate (AppsFlyerPlugin)
-
-- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;
-
-@end
-
-// Universal Links Support - AppDelegate implementation:
-@implementation AppDelegate (AppsFlyerPlugin)
-
-// Depricated: swizzeled method see AppsFlyerX+AppController.m
-// - (BOOL) application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *_Nullable))restorationHandler
-// {
-//     [[AppsFlyerLib shared] continueUserActivity:userActivity restorationHandler:restorationHandler];
-//     return YES;
-// }
-
-@end
diff --git a/src/ios/AppsFlyerX+AppController.h b/src/ios/AppsFlyerX+AppController.h
@@ -7,5 +7,10 @@
 
 @interface AppDelegate (AppsFlyerX)
 
-@end
+-(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options;
+
+-(BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler;
 
+-(BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation;
+
+@end
diff --git a/src/ios/AppsFlyerX+AppController.m b/src/ios/AppsFlyerX+AppController.m
@@ -6,50 +6,22 @@
 #import <Foundation/Foundation.h>
 #import "AppsFlyerX+AppController.h"
 #import <objc/runtime.h>
-#import "AppsFlyerLib.h"
+#import "AppsFlyerAttribution.h"
 
 @implementation AppDelegate (AppsFlyerX)
 
-static BOOL isOriginalImpementationExist;
-
-+ (void)load {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        Class class = [self class];
-
-        SEL originalSelector = @selector(application: continueUserActivity: restorationHandler:);
-        SEL swizzledSelector = @selector(x_application: continueUserActivity: restorationHandler:);
-
-        Method originalMethod = class_getInstanceMethod(class, originalSelector);
-        Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
-
-        isOriginalImpementationExist = [class instancesRespondToSelector:originalSelector];
-
-        BOOL didAddMethod =
-        class_addMethod(class,
-                        originalSelector,
-                        method_getImplementation(swizzledMethod),
-                        method_getTypeEncoding(swizzledMethod));
-
-        if (didAddMethod) {
-            class_replaceMethod(class,
-                                swizzledSelector,
-                                method_getImplementation(originalMethod),
-                                method_getTypeEncoding(originalMethod));
-        } else {
-            method_exchangeImplementations(originalMethod, swizzledMethod);
-        }
-    });
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options{
+    [[AppsFlyerAttribution shared] handleOpenUrl:url options:options];
+    return YES;
 }
 
-#pragma mark - Method Swizzling
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler{
+    [[AppsFlyerAttribution shared] continueUserActivity:userActivity restorationHandler:restorationHandler];
+    return YES;
+}
 
-- (BOOL)x_application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler {
-    [[AppsFlyerLib shared] continueUserActivity:userActivity restorationHandler:restorationHandler];
-
-    if (isOriginalImpementationExist) {
-        [self x_application:application continueUserActivity:userActivity restorationHandler:restorationHandler];
-    }
+-(BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation{
+    [[AppsFlyerAttribution shared] handleOpenUrl:url sourceApplication:sourceApplication annotation:annotation];
     return YES;
 }