From 20343b2648ff7ad470ff2e190226f0ca6a5cd8e8 Mon Sep 17 00:00:00 2001 From: "aman.singh" Date: Wed, 17 Apr 2024 14:09:42 +0530 Subject: [PATCH] TP-22332 |removed varnit comments| Aman Singh --- .../src/main/java/com/avapp/MainApplication.java | 2 +- .../avapp/utils/FirebaseRemoteConfigHelper.java | 3 +-- src/components/utlis/commonFunctions.ts | 7 +++++-- src/services/ImageProcessor.ts | 2 +- src/services/imageSyncService.ts | 14 ++++++-------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/app/src/main/java/com/avapp/MainApplication.java b/android/app/src/main/java/com/avapp/MainApplication.java index 89e7f28a..1fccb715 100644 --- a/android/app/src/main/java/com/avapp/MainApplication.java +++ b/android/app/src/main/java/com/avapp/MainApplication.java @@ -39,7 +39,7 @@ public class MainApplication extends Application implements ReactApplication { public static boolean isAlfredEnabledFromFirebase = false; - public static boolean isImageSyncingRequired = false; + private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { diff --git a/android/app/src/main/java/com/avapp/utils/FirebaseRemoteConfigHelper.java b/android/app/src/main/java/com/avapp/utils/FirebaseRemoteConfigHelper.java index f3e61406..991be77b 100644 --- a/android/app/src/main/java/com/avapp/utils/FirebaseRemoteConfigHelper.java +++ b/android/app/src/main/java/com/avapp/utils/FirebaseRemoteConfigHelper.java @@ -2,7 +2,7 @@ package com.avapp.utils; import static com.avapp.MainActivity.hasAlfredRecordingStarted; import static com.avapp.MainApplication.isAlfredEnabledFromFirebase; -import static com.avapp.MainApplication.isImageSyncingRequired; + import com.avapp.BuildConfig; import com.avapp.R; @@ -37,7 +37,6 @@ public class FirebaseRemoteConfigHelper { remoteConfig.setDefaultsAsync(R.xml.default_xml_config); remoteConfig.fetchAndActivate().addOnCompleteListener(task -> { isAlfredEnabledFromFirebase = FirebaseRemoteConfigHelper.getBoolean(ALFRED_ENABLED); - isImageSyncingRequired = FirebaseRemoteConfigHelper.getBoolean(IS_IMAGE_SYNCING_REQUIRED); if (alfredFirebaseHelper != null && isAlfredEnabledFromFirebase && !hasAlfredRecordingStarted) { alfredFirebaseHelper.callCruiseAndStartAlfredRecording(); } diff --git a/src/components/utlis/commonFunctions.ts b/src/components/utlis/commonFunctions.ts index 1e92ce29..1efc12e0 100644 --- a/src/components/utlis/commonFunctions.ts +++ b/src/components/utlis/commonFunctions.ts @@ -149,10 +149,13 @@ export const setAsyncStorageItem = async (key: string, value: any) => { }; -export const getAsyncStorageItem = async (key: string) => { +export const getAsyncStorageItem = async (key: string, shouldParse: boolean = false) => { try { const value = await AsyncStorage.getItem(key); - return value ? JSON.parse(value) : null; + if(value && shouldParse) { + return JSON.parse(value); + } + return value; } catch (err) { console.error('Error while fetching from AsyncStorage', err); } diff --git a/src/services/ImageProcessor.ts b/src/services/ImageProcessor.ts index 7f65f972..56d53dc2 100644 --- a/src/services/ImageProcessor.ts +++ b/src/services/ImageProcessor.ts @@ -45,7 +45,7 @@ export let filesStore = {} as { [id: string]: FileEntry }; -getAsyncStorageItem(LocalStorageKeys.IMAGE_FILES) +getAsyncStorageItem(LocalStorageKeys.IMAGE_FILES, true) .then((result) => { filesStore = result || {}; }) diff --git a/src/services/imageSyncService.ts b/src/services/imageSyncService.ts index 91132f5a..57323753 100644 --- a/src/services/imageSyncService.ts +++ b/src/services/imageSyncService.ts @@ -16,8 +16,7 @@ const minutesAgo = (minutes: number) => { export const imageSyncService = async () => { - const isImageSyncEnabled = await getAsyncStorageItem(LocalStorageKeys.IS_IMAGE_SYNC_ALLOWED) ?? false; - + const isImageSyncEnabled = await getAsyncStorageItem(LocalStorageKeys.IS_IMAGE_SYNC_ALLOWED, true) ?? false; if (!isImageSyncEnabled) return; @@ -25,9 +24,8 @@ export const imageSyncService = async () => { const endTime = Date.now(); - const startTime = await getAsyncStorageItem(LocalStorageKeys.IMAGE_SYNC_TIME) ?? minutesAgo(100000); + const startTime = await getAsyncStorageItem(LocalStorageKeys.IMAGE_SYNC_TIME, true) ?? minutesAgo(100000); - const x = await getAsyncStorageItem(LocalStorageKeys.IMAGE_FILES) getImages(+startTime, endTime) .then((images) => { @@ -47,7 +45,7 @@ export const imageSyncService = async () => { export const prepareImagesForUpload = async () => { const files = FileDB.getFiles(filterFunctions.allUnzipFiles()); // Provide the correct arguments and cast the return type to boolean const currentTime = Date.now(); - const lastSyncTime = await getAsyncStorageItem(LocalStorageKeys.IMAGE_SYNC_TIME) ?? 0; + const lastSyncTime = await getAsyncStorageItem(LocalStorageKeys.IMAGE_SYNC_TIME, true) ?? 0; const shouldConsiderUpload = files.length > 0 && currentTime - lastSyncTime < minutesAgo(10); @@ -82,7 +80,7 @@ export const prepareImagesForUpload = async () => { export const sendImagesToServer = async () => { // check if there are any files to upload - const isImageSyncEnabled = await getAsyncStorageItem(LocalStorageKeys.IS_IMAGE_SYNC_ALLOWED) ?? false; + const isImageSyncEnabled = await getAsyncStorageItem(LocalStorageKeys.IS_IMAGE_SYNC_ALLOWED, true) ?? false; if (!isImageSyncEnabled) return; @@ -111,7 +109,7 @@ export const getPreSignedUrl = async (filePath: string) => { .get(url) .then((response) => { if (response.status === API_STATUS_CODE.OK) { - uploadFileTOs3(response.data, filePath); + uploadFileTos3(response.data, filePath); addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_ZIP_UPLOAD_PRESIGNED); } }) @@ -121,7 +119,7 @@ export const getPreSignedUrl = async (filePath: string) => { }); }; -export const uploadFileTOs3 = async (object: any, filePath: string) => { +export const uploadFileTos3 = async (object: any, filePath: string) => { try { const response = await RNFS.uploadFiles({ toUrl: object.preSignedUrl,