apps-sdk 1.0.58 → 1.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {

package/src/libraries/AdJust.js

@@ -7,6 +7,7 @@ import Networking from './Networking';
 
 class AdJust {
     sdkVersion = null;
+    attribution = {};
     initialize() {
         const adjustEnvironment = config.ADJUST.ENVIRONMENT === 'SANDBOX' ? AdjustConfig.EnvironmentSandbox : AdjustConfig.EnvironmentProduction;
         const adjustLogLevel = config.ADJUST.LOG_LEVEL === 'VERBOSE' ? AdjustConfig.LogLevelVerbose : AdjustConfig.LogLevelSuppress;
@@ -15,16 +16,23 @@ class AdJust {
         adjustConfig.setLogLevel(adjustLogLevel);
         const self = this;
         adjustConfig.setAttributionCallbackListener(function(attribution) {
+            self.attribution = attribution;
             setTimeout(() => {
                 self.sendAttributionData(attribution);
             }, 60000);
         });
-        Adjust.create(adjustConfig);
-        this.getAttribution();
-        this.getAdid();
-        this.getIdfa();
-        this.getGoogleAdId();
-        this.getSDKVersion();
+        Adjust.create(adjustConfig)
+        this.updateAttributionInfo();
+    }
+
+    updateAttributionInfo() {
+        setTimeout(() => {
+            this.getAttribution();
+            this.getAdid();
+            this.getIdfa();
+            this.getGoogleAdId();
+            this.getSDKVersion();
+        }, 10000);
     }
 
     async getAttributionData() {
@@ -43,7 +51,7 @@ class AdJust {
         const data = {
             user_id: Session.getUserID(),
             adjust: {
-                attribution_id: Session.getAdjustAttributionID(),
+                attribution_id: Session.getAdjustAttributionID() || attribution.adid,
                 googleAdid: Session.getAdjustGoogleAdid(),
                 idfa: Session.getAdjustIDFA(),
                 sdkVersion: this.sdkVersion,
@@ -104,32 +112,45 @@ class AdJust {
 
     async getAttribution() {
         Adjust.getAttribution((attribution) => {
-            Session.setAdjustAttribution(attribution);
+            if (attribution) {
+                Session.setAdjustAttribution(attribution);
+            }
         });
     }
 
-
     async getAdid() {
         Adjust.getAdid((adid) => {
-            Session.setAdjustAttributionID(adid);
+            if (adid) {
+                Session.setAdjustAttributionID(adid);
+            }
         });
     }
 
     async getIdfa() {
         await Adjust.getIdfa((idfa) => {
-            Session.setAdjustIDFA(idfa);
+            if (typeof idfa === 'string' && idfa.length > 0 && idfa !== '00000000-0000-0000-0000-000000000000') {
+                Session.setAdjustIDFA(idfa);
+            }
         });
     }
 
     async getGoogleAdId() {
-        Adjust.getGoogleAdId((googleAdId) => {
-            Session.setAdjustGoogleAdid(googleAdId);
-        });
+        try {
+            Adjust.getGoogleAdId((googleAdId) => {
+                if (typeof googleAdId === 'string' && googleAdId.length > 0) {
+                    Session.setAdjustGoogleAdid(googleAdId);
+                }
+            });
+        } catch (error) {
+            console.log(error);
+        }
     }
 
     getSDKVersion() {
         Adjust.getSdkVersion((sdkVersion) => {
-            this.sdkVersion = sdkVersion;
+            if (typeof sdkVersion === 'string' && sdkVersion.length > 0) {
+                this.sdkVersion = sdkVersion;
+            }
         });
     }
 }

package/src/libraries/Session.js

@@ -47,7 +47,7 @@ class Session {
             },
             adjust : {
                 attribution_id: '',
-                idfa: AdJust.getIdfa(),
+                idfa: '',
                 googleAdid: '',
             },
             dev : false,
@@ -145,14 +145,16 @@ class Session {
 
     setAdjustIDFA = (idfa) => {
         this.sessionData.adjust.idfa = idfa;
+        Storage.storeData("adjustIDFA", idfa);
     }
 
     getAdjustIDFA = () => {
-        return this.sessionData.adjust.idfa;
+        return this.sessionData.adjust.idfa || '';
     }
 
     setAdjustGoogleAdid = (googleAdid) => {
         this.sessionData.adjust.googleAdid = googleAdid;
+        Storage.storeData("adjustGoogleAdid", googleAdid);
     }
 
     getAdjustGoogleAdid = () => {
@@ -161,6 +163,7 @@ class Session {
 
     setAdjustAttributionID = (attribution_id) => {
         this.sessionData.adjust.attribution_id = attribution_id;
+        Storage.storeData("adjustAttributionID", attribution_id);
     }
 
     getAdjustAttributionID = () => {
@@ -171,11 +174,10 @@ class Session {
         console.log('setAdjustAttribution', attribution);
     }
 
-
     sendFirstOpen = async () => {
         config.DEBUG_MODE && console.debug("sendFirstOpen");
         try {
-            let result = Networking.sendEvent(config.EVENT_TYPES.OTHER, 'first_open');
+            let result = await Networking.sendEvent(config.EVENT_TYPES.OTHER, 'first_open');
             config.DEBUG_MODE && console.debug("sendFirstOpen - result: ", result);
         } catch (error) {
             console.error(error);
@@ -186,7 +188,7 @@ class Session {
     checkSubscription = async () => {
         config.DEBUG_MODE && console.debug("checkSubscription");
         try {
-            let result = Networking.checkSubscription();
+            let result = await Networking.checkSubscription();
             config.DEBUG_MODE && console.debug("checkSubscription - result: ", result);
         } catch (error) {
             console.error(error);

package/types/index.d.ts

@@ -124,7 +124,9 @@ declare module 'apps-sdk' {
 
     export class AdJust {
         sdkVersion: string | null;
-        initialize(): Promise<void>;
+        attribution: object;
+        initialize(): void;
+        updateAttributionInfo(): void;
         getAttributionData(): Promise<any>;
         sendAttributionData(attribution: any): Promise<void>;
         trackEventIfExist(eventKeyword: string, eventValue?: number): void;