shakebug-react-native 2.0.0 → 2.2.0

package/src/Screens/AddDetailsScreen.js

@@ -21,8 +21,7 @@ LogBox.ignoreLogs([
     'Non-serializable values were found in the navigation state',
 ]);
 
-const { ShakebugSDKCreateThumbnail } = NativeModules;
-
+const { CreateThumbnail } = NativeModules;
 
 const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScreenTitle }) => {
 
@@ -91,17 +90,23 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     const generateThumbnail = async () => {
         if (type != "img") {
             try {
-                const response = await ShakebugSDKCreateThumbnail.create({
+
+                const { create: createThumbnail } = CreateThumbnail;
+
+                const thumbnail = await createThumbnail({
                     url: `file://${path}`,
                     timeStamp: 10000,
-                });
-                if (response.path != "") {
-                    setPoster(response.path)
+                })
+
+                if (thumbnail) {
+                    setPoster(thumbnail?.path)
                     setIsLoading(false)
                 }
             } catch (error) {
-                throw new Error(error.message);
+                console.log(error);
+
                 setIsLoading(false)
+                throw new Error(error.message);
             }
         }
     };
@@ -276,12 +281,11 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     UpdateStatusBar = () => {
-        console.log("here");
         StatusBar.setHidden(false)
     }
 
     return (
-        <SafeAreaView style={{ width: "100%", height: Dimensions.get('window').height, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
+        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>
@@ -418,7 +422,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                             </View>
 
                             <View style={{ alignItems: 'flex-end', marginHorizontal: 15, marginTop: '1%' }}>
-                                <Text style={{ fontSize: 12, color: "gray", fontWeight: '300' }}>© <Text>ShakeBug v2.0</Text></Text>
+                                <Text style={{ fontSize: 12, color: "gray", fontWeight: '300' }}>© <Text>ShakeBug v{global.sdk_version}</Text></Text>
                             </View>
 
                         </View>

package/src/Screens/FirstScreen.js

@@ -1,7 +1,7 @@
 import { Alert, Image, ImageBackground, Linking, PermissionsAndroid, Platform, SafeAreaView, StatusBar, Text, TouchableOpacity, View, TextInput, Keyboard, PanResponder, Animated, StyleSheet, KeyboardAvoidingView, BackHandler, Dimensions, Modal } from 'react-native'
 import React, { useEffect, useRef, useState } from 'react'
 import { ClearCanvas, RNDrawingView } from './StrockView.js';
-import ViewShot from '../../ScreenShot/src/index.js';
+import ViewShot from 'react-native-view-shot';
 import { launchImageLibrary } from '../../ImageOrVedioPicker/src/index';
 import { logger, consoleTransport } from "react-native-logs";
 import { NativeModules } from 'react-native';
@@ -310,7 +310,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-    <SafeAreaView style={{ width: "100%", height: Dimensions.get('window').height, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
+    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
       <StatusBar backgroundColor={ThemeColor} />
 
       <View style={{ width: "100%", height: "100%", backgroundColor: "#e4fdfd" }}>

package/src/Screens/Shakebug.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Platform, Alert, AppState, NativeModules, View, StyleSheet, Animated, Dimensions, SafeAreaView } from 'react-native';
+import { Platform, Alert, AppState, NativeModules, View, StyleSheet, Animated, Dimensions, SafeAreaView, Modal } from 'react-native';
 import ShakeFunction from '../Componanats/ShakeFunction';
 import FirstScreen from './FirstScreen';
 import AddDetailsScreen from './AddDetailsScreen';
@@ -19,6 +19,7 @@ import { NavigationProvider, useNavigation } from '../Componanats/NavigationCont
 import { Localization } from '../Componanats/localization';
 import { GlobalStateProvider, useGlobalState } from '../Componanats/GlobalStateContext';
 import CustomeAlert from 'shakebug-react-native/src/Componanats/CustomAlert';
+import ReviewModal from 'shakebug-react-native/src/Componanats/ReviewModal';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
@@ -50,20 +51,27 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
+global.sdk_version = "2.2.0";
+global.app_lunch_count = 0;
+global.POPUP_LAUNCH_THRESHOLD = 3;
+global.POPUP_COOLDOWN_DAYS = 2;
+global.KEY_REVIEW_SUBMITTED = false;
 
 function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirstTime, ShakebugThemeColor, changeSDKScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, makeLogEnabled, setShakebugSDKEndPointURL }) {
 
+  const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
   const ThemeColor = ShakebugThemeColor ? ShakebugThemeColor : "#1dd3e3";
   const FirstScreenTitle = changeSDKScreenTitle ? changeSDKScreenTitle[0] != "" ? changeSDKScreenTitle[0] : Localization[ShakebugLanguage].FirstScreenTitle : Localization[ShakebugLanguage].FirstScreenTitle;
   const SecondScreenTitle = changeSDKScreenTitle ? changeSDKScreenTitle[1] != "" ? changeSDKScreenTitle[1] : Localization[ShakebugLanguage].SecondScreenTitle : Localization[ShakebugLanguage].SecondScreenTitle;
   const [isAlert, setIsAlert] = useState(false)
   const [isAlertText, setAlertText] = useState("")
+  const [showModal, setShowModal] = useState(false);
   global.ShakebugLanguage = ShakebugLanguage;
   global.makeLogEnabled = makeLogEnabled;
-  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.3/webservice.php/";
+  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.4/webservice.php/";
   global.ShakebugSDKEndPointURLheaderKey = setShakebugSDKEndPointURL[1].length > 0 ? setShakebugSDKEndPointURL[1] : "MarchShake2022";
 
-  const { ShakebugSDKSharedPreferencesModule } = NativeModules;
 
   // DefaulfConfig for log
   const defaultConfig = {
@@ -114,6 +122,49 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   // For check mau limit, valid appkey and call MatchKeyFunc
   useEffect(() => {
     async function fetchData() {
+
+      const KEY_APP_LAUNCH_COUNT = await ShakebugSDKSharedPreferencesModule.getString("KEY_APP_LAUNCH_COUNT") ? parseInt(await ShakebugSDKSharedPreferencesModule.getString("KEY_APP_LAUNCH_COUNT")) : 0;
+      const LAST_POPUP_TIME = await ShakebugSDKSharedPreferencesModule.getString("LAST_POPUP_TIME") ? parseInt(await ShakebugSDKSharedPreferencesModule.getString("LAST_POPUP_TIME")) : null;
+      const IS_REVIEW_SUBMITTED = await ShakebugSDKSharedPreferencesModule.getString("IS_REVIEW_SUBMITTED") || "false";
+
+      const SDK_VERSION = await ShakebugSDKSharedPreferencesModule.getString("SDK_VERSION")
+
+      ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", (KEY_APP_LAUNCH_COUNT + 1).toString())
+
+      if (SDK_VERSION) {
+        if (SDK_VERSION != global.sdk_version) {
+          ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", 0)
+          ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", null)
+          ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
+          ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
+        }
+      }
+      else {
+        ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", 0)
+        ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", null)
+        ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
+        ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
+      }
+
+      global.app_lunch_count = (KEY_APP_LAUNCH_COUNT + 1);
+
+      if (global.app_lunch_count >= POPUP_LAUNCH_THRESHOLD) {
+        if (LAST_POPUP_TIME && IS_REVIEW_SUBMITTED == "true") {
+          const now = Date.now(); // current timestamp in milliseconds
+          const sevenDaysInMs = global.POPUP_COOLDOWN_DAYS * 24 * 60 * 60 * 1000; // 7 days in milliseconds
+
+          const after7DaysTimestamp = now + sevenDaysInMs;
+
+          if (LAST_POPUP_TIME > after7DaysTimestamp) {
+            setShowModal(true)
+          }
+
+        }
+        else if (IS_REVIEW_SUBMITTED == "true") {
+          setShowModal(true)
+        }
+      }
+
       if (Android_appkey != undefined || iOS_appkey != undefined) {
         if (Platform.OS == 'android') {
           if (Android_appkey.trim().length > 0) {
@@ -172,10 +223,14 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       }
       else {
         if (Platform.OS == 'android') {
-          console.log("Please provide Android_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
+          log.warn("Please provide Android_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
         }
         else if (Platform.OS == 'ios') {
-          console.log("Please provide iOS_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
+          log.warn("Please provide iOS_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
         }
       }
     }
@@ -407,7 +462,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
         </NavigationProvider>
       </GlobalStateProvider>
 
-      <CustomeAlert 
+      <CustomeAlert
         isVisible={isAlert}
         text={isAlertText}
         color={ThemeColor}
@@ -416,6 +471,8 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           setIsAlert(false)
         }}
       />
+
+      <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
     </View>
   )
 }

package/src/Screens/TrimVideoScreen.js

@@ -1,6 +1,6 @@
-import { NativeEventEmitter, NativeModules, SafeAreaView, StatusBar } from 'react-native'
+import { NativeEventEmitter, NativeModules, Platform, SafeAreaView, StatusBar } from 'react-native'
 import React, { useEffect, useState } from 'react'
-import { showEditor } from '../../trimVideo/src/index';
+import { showEditor } from 'react-native-video-trim';
 import { useNavigation } from '../Componanats/NavigationContext';
 import { Localization } from '../Componanats/localization';
 
@@ -12,10 +12,15 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
 
   const { goToScreenAtIndex, navigate, goBack } = useNavigation();
 
+
   // For display video trimmer
   useEffect(() => {
     StatusBar.setHidden(true)
-    showEditor(video, {
+
+    const uri = video; // your path
+    const trimmedUri = uri.replace('file://', '');
+
+    showEditor(Platform.OS == 'android' ? trimmedUri : video, {
       saveButtonText: Localization[global.ShakebugLanguage].Choose,
       cancelButtonText: Localization[global.ShakebugLanguage].Cancel,
       trimmingText: Localization[global.ShakebugLanguage].TrimmingText,
@@ -32,8 +37,9 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
       saveDialogCancelText: Localization[global.ShakebugLanguage].No,
       saveDialogConfirmText: Localization[global.ShakebugLanguage].Yes
     });
-    const eventEmitter = new NativeEventEmitter(NativeModules.ShakebugSDKVideoTrim);
-    const subscription = eventEmitter.addListener('ShakebugSDKVideoTrim', (event) => {
+
+    const eventEmitter = new NativeEventEmitter(NativeModules.VideoTrim);
+    const subscription = eventEmitter.addListener('VideoTrim', (event) => {
       switch (event.name) {
         case 'onShow': {
           break;
@@ -50,7 +56,7 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
           navigate("AddDetailsScreen", { media: `${event.outputPath}`, mediaType: 'video', themeColor: themeColor, SDKScreenTitle: SDKScreenTitle, updateParent: updateParent });
           return;
         }
-        case 'onCancelTrimming': {
+        case 'onCancel': {
           UpdateStatusBar()
           if (Type == "video") {
             goToScreenAtIndex(1)
@@ -62,7 +68,7 @@ const TrimVideoScreen = ({ video, themeColor, SDKScreenTitle, Type, UpdateStatus
             goToScreenAtIndex(3)
           }
           return;
-          // break;
+          break;
         }
         case 'onError': {
           break;

package/src/index.tsx

@@ -4,6 +4,7 @@ import { NavigationContainer, findFocusedRoute } from '@react-navigation/native'
 import { getLocales } from '../GetLocals/src';
 import { NativeModules, Text, View, findNodeHandle } from 'react-native';
 import { useGlobalState } from './Componanats/GlobalStateContext'
+import { CustomUserIdApi } from './APIs/CustomUserId'
 
 let Languages = ['ENGLISH', 'HINDI', 'GUJARATI', 'ARABIC', 'CHINESE', 'DUTCH', 'FRENCH', 'GERMAN', 'GREEK', 'INDONESIAN', 'ITALIAN', 'JAPANESE', 'KOREAN', 'RUSSIAN', 'SPANISH', 'TURKISH', 'UKRAINIAN', 'MARATHI', 'TAMIL', 'TELUGU']
 let LanguageCodes = ['en', 'hi', 'gu', 'ar', 'zh', 'nl', 'fr', 'de', 'el', 'id', 'it', 'ja', 'ko', 'ru', 'es', 'tr', 'uk', 'mr', 'ta', 'te']
@@ -41,7 +42,7 @@ const ShakebugView: React.FC<ShakebugViewProps> = ({
   allowCrashReport = true,
   makeLogEnabled = false,
   ShakebugLanguage = LocalLanguage != -1 ? Languages[LocalLanguage] : "ENGLISH",
-  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.3/webservice.php/", "MarchShake2022", ""]
+  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.4/webservice.php/", "MarchShake2022", ""]
 }) => {
 
   return (
@@ -55,7 +56,7 @@ const ShakebugView: React.FC<ShakebugViewProps> = ({
         changeSDKScreenTitle={changeSDKScreenTitle}
         allowToReportBugByScreenCapture={allowToReportBugByScreenCapture}
         allowToReportBugByShakingMobile={allowToReportBugByShakingMobile}
-        allowCrashReport={allowCrashReport}
+        allowCrashReport={__DEV__ ? false : allowCrashReport}
         makeLogEnabled={makeLogEnabled}
         ShakebugLanguage={Languages.includes(ShakebugLanguage) ? ShakebugLanguage : LocalLanguage != -1 ? Languages[LocalLanguage] : "ENGLISH"}
         setShakebugSDKEndPointURL={setShakebugSDKEndPointURL}
@@ -76,8 +77,7 @@ export const triggerBugReporting = (): void => {
   global.isTrigger = true;
 }
 
-
-export const ShakebugSdkProtectedView = ( {children}) => {
+export const ShakebugSdkProtectedView = ({ children }) => {
 
   const { isRecordingStart, isScreenShot } = useGlobalState();
   if (isRecordingStart == true || isScreenShot == true) {
@@ -115,3 +115,7 @@ export const ShakebugSdkProtectedView = ( {children}) => {
 export const IsShakebugSDKOpen = () => {
   return global.isShakebugSDKOpen;
 }
+
+export const addCustomUser = (id, name, email, country, other, applicationsid) => {
+  CustomUserIdApi(id, name, email, country, other, applicationsid)
+}

package/android/src/main/java/com/shakebug/ShakebugSDKScreenShotModule.java

@@ -1,196 +0,0 @@
-
-package com.shakebug;
-
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import android.util.DisplayMetrics;
-import android.util.Log;
-
-import com.facebook.react.bridge.GuardedAsyncTask;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.UIManagerModule;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-import com.shakebug.ViewShot.Formats;
-import com.shakebug.ViewShot.Results;
-
-public class ShakebugSDKScreenShotModule extends ReactContextBaseJavaModule {
-
-    public static final String RNVIEW_SHOT = "ShakebugSDKRNViewShot";
-
-    private final ReactApplicationContext reactContext;
-
-    private final Executor executor = Executors.newCachedThreadPool();
-
-    public ShakebugSDKScreenShotModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
-
-    @Override
-    public String getName() {
-        return RNVIEW_SHOT;
-    }
-
-    @Override
-    public Map<String, Object> getConstants() {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void onCatalystInstanceDestroy() {
-        super.onCatalystInstanceDestroy();
-        new CleanTask(getReactApplicationContext()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
-    @ReactMethod
-    public void releaseCapture(String uri) {
-        final String path = Uri.parse(uri).getPath();
-        if (path == null) return;
-        File file = new File(path);
-        if (!file.exists()) return;
-        File parent = file.getParentFile();
-        if (parent.equals(reactContext.getExternalCacheDir()) || parent.equals(reactContext.getCacheDir())) {
-            file.delete();
-        }
-    }
-
-    @ReactMethod
-    public void captureRef(int tag, ReadableMap options, Promise promise) {
-        final ReactApplicationContext context = getReactApplicationContext();
-        final DisplayMetrics dm = context.getResources().getDisplayMetrics();
-
-        final String extension = options.getString("format");
-        final int imageFormat = "jpg".equals(extension)
-                ? Formats.JPEG
-                : "webm".equals(extension)
-                ? Formats.WEBP
-                : "raw".equals(extension)
-                ? Formats.RAW
-                : Formats.PNG;
-
-        final double quality = options.getDouble("quality");
-        final Integer scaleWidth = options.hasKey("width") ? options.getInt("width") : null;
-        final Integer scaleHeight = options.hasKey("height") ? options.getInt("height") : null;
-        final String resultStreamFormat = options.getString("result");
-        final String fileName = options.hasKey("fileName") ? options.getString("fileName") : null;
-        final Boolean snapshotContentContainer = options.getBoolean("snapshotContentContainer");
-        final boolean handleGLSurfaceView = options.hasKey("handleGLSurfaceViewOnAndroid") && options.getBoolean("handleGLSurfaceViewOnAndroid");
-
-        try {
-            File outputFile = null;
-            if (Results.TEMP_FILE.equals(resultStreamFormat)) {
-                outputFile = createTempFile(getReactApplicationContext(), extension, fileName);
-            }
-
-            final Activity activity = getCurrentActivity();
-            final UIManagerModule uiManager = this.reactContext.getNativeModule(UIManagerModule.class);
-
-            uiManager.addUIBlock(new ViewShot(
-                    tag, extension, imageFormat, quality,
-                    scaleWidth, scaleHeight, outputFile, resultStreamFormat,
-                    snapshotContentContainer, reactContext, activity, handleGLSurfaceView, promise, executor)
-            );
-        } catch (final Throwable ex) {
-            Log.e(RNVIEW_SHOT, "Failed to snapshot view tag " + tag, ex);
-            promise.reject(ViewShot.ERROR_UNABLE_TO_SNAPSHOT, "Failed to snapshot view tag " + tag);
-        }
-    }
-
-    @ReactMethod
-    public void captureScreen(ReadableMap options, Promise promise) {
-        captureRef(-1, options, promise);
-    }
-
-    private static final String TEMP_FILE_PREFIX = "ReactNative-snapshot-image";
-
-    /**
-     * Asynchronous task that cleans up cache dirs (internal and, if available, external) of cropped
-     * image files. This is run when the catalyst instance is being destroyed (i.e. app is shutting
-     * down) and when the module is instantiated, to handle the case where the app crashed.
-     */
-    private static class CleanTask extends GuardedAsyncTask<Void, Void> implements FilenameFilter {
-        private final File cacheDir;
-        private final File externalCacheDir;
-
-        private CleanTask(ReactContext context) {
-            super(context);
-
-            cacheDir = context.getCacheDir();
-            externalCacheDir = context.getExternalCacheDir();
-        }
-
-        @Override
-        protected void doInBackgroundGuarded(Void... params) {
-            if (null != cacheDir) {
-                cleanDirectory(cacheDir);
-            }
-
-            if (externalCacheDir != null) {
-                cleanDirectory(externalCacheDir);
-            }
-        }
-
-        @Override
-        public final boolean accept(File dir, String filename) {
-            return filename.startsWith(TEMP_FILE_PREFIX);
-        }
-
-        private void cleanDirectory(@NonNull final File directory) {
-            final File[] toDelete = directory.listFiles(this);
-
-            if (toDelete != null) {
-                for (File file : toDelete) {
-                    if (file.delete()) {
-                        Log.d(RNVIEW_SHOT, "deleted file: " + file.getAbsolutePath());
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Create a temporary file in the cache directory on either internal or external storage,
-     * whichever is available and has more free space.
-     */
-    @NonNull
-    private File createTempFile(@NonNull final Context context, @NonNull final String ext, String fileName) throws IOException {
-        final File externalCacheDir = context.getExternalCacheDir();
-        final File internalCacheDir = context.getCacheDir();
-        final File cacheDir;
-
-        if (externalCacheDir == null && internalCacheDir == null) {
-            throw new IOException("No cache directory available");
-        }
-
-        if (externalCacheDir == null) {
-            cacheDir = internalCacheDir;
-        } else if (internalCacheDir == null) {
-            cacheDir = externalCacheDir;
-        } else {
-            cacheDir = externalCacheDir.getFreeSpace() > internalCacheDir.getFreeSpace() ?
-                    externalCacheDir : internalCacheDir;
-        }
-
-        final String suffix = "." + ext;
-        if (fileName != null) {
-            return File.createTempFile(fileName, suffix, cacheDir);
-        }
-        return File.createTempFile(TEMP_FILE_PREFIX, suffix, cacheDir);
-    }
-}