apps-sdk 1.0.88 → 1.0.90

package/package.json

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

package/src/libraries/AdJust.js

@@ -8,10 +8,11 @@ import Networking from './Networking';
 class AdJust {
     sdkVersion = null;
     attribution = {};
-    initialize() {
+    async initialize() {
         const adjustEnvironment = config.ADJUST.ENVIRONMENT === 'SANDBOX' ? AdjustConfig.EnvironmentSandbox : AdjustConfig.EnvironmentProduction;
         const adjustLogLevel = config.ADJUST.LOG_LEVEL === 'VERBOSE' ? AdjustConfig.LogLevelVerbose : AdjustConfig.LogLevelSuppress;
-        console.log("Initializing AdJust. Environment: " + adjustEnvironment + ", Log level: " + adjustLogLevel);
+        await storage.setTrackingPermissionFromStorage()
+        console.log("Initializing AdJust. Environment: " + adjustEnvironment + ", Log level: " + adjustLogLevel + ", config.TRACKING_ACTIVE: " + config.TRACKING_ACTIVE);
         try {
             const adjustConfig = new AdjustConfig(config.ADJUST.ADJUST_TOKEN, adjustEnvironment);
             adjustConfig.setLogLevel(adjustLogLevel);

package/src/libraries/Networking.js

@@ -6,6 +6,7 @@ import AdJust from './AdJust';
 import CryptoES from "crypto-es";
 import semver from 'semver';
 import Constants from 'expo-constants';
+import { Platform } from 'react-native';
 
 class Networking {
     constructor() {
@@ -209,8 +210,8 @@ class Networking {
     }
 
     sendEvent = async (eventType, eventKeyword, eventData={}) => {
-        if (config.TRACKING_ACTIVE === false) {
-            console.log('Event not sent, tracking is denied: ', eventType, eventKeyword);
+        if (config.TRACKING_ACTIVE === false && Platform.OS === 'ios') {
+            console.log('Event not sent, tracking is denied (iOS): ', eventType, eventKeyword);
             console.log('Tracking answered: ', config.TRACKING_ANSWERED);
             if (!config.TRACKING_ANSWERED) {
                 this.addPendingEvent({eventType, eventKeyword, eventData});

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);
 
@@ -272,6 +278,17 @@ class Storage {
         config.TRACKING_ACTIVE = value;
         this.storeData('TRACKING_PERMISSION', value ? 'granted' : 'denied');
     }
+
+    async setTrackingPermissionFromStorage() {
+        this.getData('TRACKING_PERMISSION').then(value => {
+            console.log('Setting tracking permission from storage:', (value === 'granted'));
+            if (value === 'granted') {
+                config.TRACKING_ACTIVE = true;
+            } else {
+                config.TRACKING_ACTIVE = false;
+            }
+        });
+    }
 }
 
 export default new Storage();

package/types/index.d.ts

@@ -97,6 +97,7 @@ declare module 'apps-sdk' {
         handleDownloadImageToGallery(imageURI: string): Promise<string>;
         handleRequestGalleryPermission(): Promise<string>;
         setTrackingPermissionGranted(value: boolean): void;
+        setTrackingPermissionFromStorage(): Promise<void>;
         removeAllKeys(): Promise<void>;
         deleteTempFiles(): Promise<void>;
     }
@@ -134,7 +135,7 @@ declare module 'apps-sdk' {
     export class AdJust {
         sdkVersion: string | null;
         attribution: object;
-        initialize(): void;
+        initialize(): Promise<void>;
         updateAttributionInfo(): void;
         getAttributionData(): Promise<any>;
         sendAttributionData(attribution: any): Promise<void>;