apps-sdk 1.0.87 → 1.0.89

package/config.js

@@ -54,6 +54,8 @@ export var IMAGE_COMPRESSION =  {
 
 export var TRACKING_ACTIVE = false;
 
+export var TRACKING_ANSWERED = false;
+
 export var FORCED_UPDATE = false;
 
 export const DEBUG_MODE = false;

package/package.json

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

package/src/libraries/Networking.js

@@ -11,6 +11,7 @@ class Networking {
     constructor() {
         this.ENCRYPT_KEY = null;
         this.DEFAULT_ENCRYPT_VALUE = false;
+        this.PENDING_EVENTS = [];
     }
 
     setEncryptKey(value) {
@@ -27,6 +28,7 @@ class Networking {
             let initData = await this.request(config.ENDPOINTS.CONFIG);
             if (initData) {
                 config.DEBUG_MODE && console.debug("initData", JSON.stringify(initData));
+                config.TRACKING_ANSWERED = await storage.getData('TRACKING_PERMISSION_ANSWERED');
                 this.setEndpoints(initData.data.domains);
                 this.setEvents(initData.data.attribution);
                 this.setPayWallData(initData);
@@ -209,6 +211,10 @@ class Networking {
     sendEvent = async (eventType, eventKeyword, eventData={}) => {
         if (config.TRACKING_ACTIVE === false) {
             console.log('Event not sent, tracking is denied: ', eventType, eventKeyword);
+            console.log('Tracking answered: ', config.TRACKING_ANSWERED);
+            if (!config.TRACKING_ANSWERED) {
+                this.addPendingEvent({eventType, eventKeyword, eventData});
+            }
             return;
         }
         config.DEBUG_MODE && console.debug("sendEvent", eventType, eventKeyword, eventData);
@@ -217,7 +223,6 @@ class Networking {
             let eventResponse = await this.request(config.ENDPOINTS.EVENTS_PUSH, {
                 event_name: eventKeyword,
                 event_type: eventType,
-                // action: eventKeyword,
                 appevent: eventKeyword,
                 payload: eventData,
                 ...Session.sessionData,
@@ -231,6 +236,24 @@ class Networking {
             console.log('Error al enviar evento a AdJust', error);
         }
     }
+
+    addPendingEvent(event) {
+        console.log('addPendingEvent', event);
+        this.PENDING_EVENTS.push(event);
+    }
+
+    clearPendingEvents() {
+        console.log('clearPendingEvents');
+        this.PENDING_EVENTS = [];
+    }
+
+    async sendPendingEvents() {
+        this.PENDING_EVENTS.forEach(async event => {
+            console.log('sendPendingEvents', event);
+            await this.sendEvent(event.eventType, event.eventKeyword, event.eventData);
+        });
+        this.clearPendingEvents();
+    }
 }
 
 export default new Networking();

package/src/libraries/Session.js

@@ -67,7 +67,9 @@ class Session {
         if (this.sessionData.isFirstOpen) {
             config.DEBUG_MODE && console.debug("checkFirstOpen - First Open");
             await this.sendFirstOpen();
-            await Storage.storeData("FirstOpenAlreadyExecuted", true);
+            if (config.TRACKING_ACTIVE) {
+                await Storage.storeData("FirstOpenAlreadyExecuted", true);
+            }
         } else {
             config.DEBUG_MODE && console.debug("checkFirstOpen - Not First Open");
         }

package/src/libraries/Storage.js

@@ -89,7 +89,7 @@ class Storage {
                 }
             }
             if (galleryPermission === 'granted') {
-                let fileUri = FileSystem.documentDirectory + fileName + '.jpg';
+                let fileUri = FileSystem.documentDirectory + fileName + '.png';
                 if (utils.isBase64Image(base64)) {
                     console.log('DOWNLOADIMAGE isBase64Image');
                     const data = await fetch(base64);
@@ -124,7 +124,7 @@ class Storage {
             const directoryUri = CREATIONS_DIR + '/' + fileName;
             console.log('handleDownloadImageToCreations directoryUri:', directoryUri);
             await this.createDir(directoryUri);
-            const fileUri = directoryUri + '/image.jpg';
+            const fileUri = directoryUri + '/image.png';
             console.log('handleDownloadImageToCreations fileUri:', fileUri);
             const fileData = directoryUri + '/data.json';
             console.log('handleDownloadImageToCreations fileData:', fileData);
@@ -143,7 +143,7 @@ class Storage {
             const directoryUri = TMP_DIR + '/' + fileName;
             console.log('handleDownloadImageToTMP directoryUri:', directoryUri);
             await this.createDir(directoryUri);
-            const fileUri = directoryUri + '/image.jpg';
+            const fileUri = directoryUri + '/image.png';
             console.log('handleDownloadImageToTMP fileUri:', fileUri);
             console.log('handleDownloadImageToTMP base64Image:', base64Image.substring(0, 50) + '...');
             const base64Data = base64Image.replace(/^data:image\/[a-z]+;base64,/, '');
@@ -195,10 +195,16 @@ class Storage {
 
             for (const directory of directories) {
                 const directoryUri = `${CREATIONS_DIR}/${directory}`;
-                const imageUri = `${directoryUri}/image.jpg`;
+                let imageUri = `${directoryUri}/image.png`;
                 const dataUri = `${directoryUri}/data.json`;
+                let imageData = null;
                 try {
-                    const imageData = await FileSystem.readAsStringAsync(imageUri, { encoding: FileSystem.EncodingType.Base64 });
+                    try {
+                        imageData = await FileSystem.readAsStringAsync(imageUri, { encoding: FileSystem.EncodingType.Base64 });
+                    } catch (error) {
+                        imageUri = `${directoryUri}/image.jpg`;
+                        imageData = await FileSystem.readAsStringAsync(imageUri, { encoding: FileSystem.EncodingType.Base64 });
+                    }
                     const jsonData = await FileSystem.readAsStringAsync(dataUri, { encoding: FileSystem.EncodingType.UTF8 });
                     config.DEBUG_MODE && console.debug('getCreations jsonData:', jsonData);
 
@@ -270,6 +276,7 @@ class Storage {
 
     setTrackingPermissionGranted(value) {
         config.TRACKING_ACTIVE = value;
+        this.storeData('TRACKING_PERMISSION', value ? 'granted' : 'denied');
     }
 }
 

package/src/libraries/TrackingTransparency.js

@@ -1,4 +1,4 @@
-import {getAdvertisingId, requestTrackingPermissionsAsync} from "expo-tracking-transparency";
+import {getAdvertisingId, requestTrackingPermissionsAsync, getTrackingPermissionsAsync} from "expo-tracking-transparency";
 import Storage from './Storage';
 import Networking from './Networking';
 import * as config from '../../config';
@@ -9,25 +9,33 @@ class TrackingTransparency {
         let trackingResult = 'denied';
         let trackingPermission = await Storage.getData('TRACKING_PERMISSION');
         console.log('current trackingPermission', trackingPermission);
-        if (!trackingPermission || trackingPermission !== 'granted') {
+        if (!trackingPermission) {
             const { status } = await requestTrackingPermissionsAsync();
-            console.log('Tracking Transparency permission status', status);
+            await Storage.storeData('TRACKING_PERMISSION_ANSWERED', true);
+            await Networking.sendPendingEvents();
+            config.TRACKING_ANSWERED = true;
             if (status !== 'undetermined') {
                 if (status === 'granted') {
-                    Storage.storeData('TRACKING_PERMISSION', 'granted');
-                    Networking.sendEvent('action', 'tracking_consent');
+                    trackingResult = 'granted';
+                    await Storage.storeData('TRACKING_PERMISSION', 'granted');
+                    await Networking.sendEvent('action', 'tracking_consent');
                     console.log('Tracking Transparency permission granted');
                 } else {
-                    Storage.storeData('TRACKING_PERMISSION', 'denied');
-                    Networking.sendEvent('action', 'tracking_denied');
-                    trackingResult = 'denied';
+                    await Storage.storeData('TRACKING_PERMISSION', 'denied');
+                    await Networking.sendEvent('action', 'tracking_denied');
                     console.log('Tracking Transparency permission denied');
                 }
             }
-            config.TRACKING_ACTIVE = (trackingResult === 'granted');
-            return Promise.resolve(trackingResult);
         }
-        return Promise.resolve(trackingPermission);
+        config.TRACKING_ACTIVE = (trackingResult === 'granted');
+        return trackingResult;
+    }
+
+    async getTrackingTransparencyPermission() {
+        let tracking = await getTrackingPermissionsAsync();
+        if (tracking) {
+            return tracking.status;
+        }
     }
 
     async getAdvertisingIdentifier() {

package/types/index.d.ts

@@ -73,9 +73,12 @@ declare module 'apps-sdk' {
         getEndpoints(): any;
         setEvents(events: any): void;
         sendEvent(eventType: string, eventKeyword:string, eventData?: object): Promise<void>;
-        createSubscription();
+        createSubscription(): any;
         checkConnection(): Promise<boolean>;
         setImageCompression(compression: any): void;
+        addPendingEvent(event: any): void;
+        sendPendingEvents(): Promise<void>;
+        clearPendingEvents(): void;
     }
 
     export class Storage {
@@ -148,6 +151,7 @@ declare module 'apps-sdk' {
     export class TrackingTransparency {
         requestTrackingTransparencyPermission(): Promise<string>;
         getAdvertisingIdentifier(): Promise<string>;
+        getTrackingTransparencyPermission(): Promise<string>;
     }
 
     export class AppsSDK {