shakebug-react-native 2.3.1 → 2.3.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "Shakebug allows users to report the bug from your mobile phone for your application. Here users just need to shake their mobile and all the data regarding bugs & crashes can be seen by developers through their log in panel easily",
   "main": "src/index.tsx",
   "scripts": {
@@ -29,6 +29,7 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "@react-navigation/native": "^6.1.9",
+    "html2canvas": "^1.4.1",
     "react-native-logs": "^5.1.0",
     "rxjs": "^7.8.1",
     "typescript": "^5.3.3"

package/src/APIs/AddIssue.js

@@ -12,11 +12,14 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
 
         const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
 
+        let i = 0;
         let internetType = "";
-        try {
-            const stat = await NetInfo.fetch();
-            internetType = stat.type;
-        } catch(e) {}
+        NetInfo.addEventListener(stat => {
+            if (i == 0) {
+                internetType = stat.type
+            }
+            i++
+        })
 
         let batteryLevel = parseFloat(await DeviceInfo.getBatteryLevel() * 100).toFixed(0);
         let architecture = await DeviceInfo.supportedAbis();
@@ -28,7 +31,11 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         let osversion = await DeviceInfo.getSystemVersion()
         const type = isVideo ? 'video/mp4' : 'image/jpg';
         const name = isVideo ? 'video.mp4' : 'photo.jpg';
-        const media = isVideo ? `file://'${path}` : path;
+        
+        let media = path;
+        if (Platform.OS === 'android' && !media.startsWith('file://') && !media.startsWith('content://') && !media.startsWith('http')) {
+            media = `file://${path}`;
+        }
 
 
         const formData = new FormData();

package/src/APIs/StartSession.js

@@ -14,11 +14,8 @@ async function SessionStartApi(latitude, longitude, application_id) {
 
     if (latitude != "" && latitude != undefined && longitude != "" && longitude != undefined) {
         try {
-            let BundleId = DeviceInfo.getBundleId ? DeviceInfo.getBundleId() : "UnknownApp";
-            
             await fetch(
                 `https://nominatim.openstreetmap.org/reverse?format=json&lat=${latitude}&lon=${longitude}`,
-                { headers: { 'User-Agent': `Shakebug-SDK-Mobile-${BundleId}` } }
             )
                 .then(response => response.json())
                 .then(async data => {
@@ -96,7 +93,8 @@ async function SessionStartApi(latitude, longitude, application_id) {
             return { success: false, message: data.msg };
         }
     } catch (error) {
-        return { success: false, message: "Network request failed. Please check your connection." };
+        // console.error('Error fetching data:', error);
+        // throw error;
     }
 }
 

package/src/Componanats/ErrorHandler.js

@@ -15,11 +15,14 @@ const AddCrashApi = async (desc) => {
     let memory = await DeviceInfo.getTotalMemory() - await DeviceInfo.getUsedMemory()
     let osversion = await DeviceInfo.getSystemVersion()
 
+    let i = 0;
     let internetType = "";
-    try {
-        const stat = await NetInfo.fetch();
-        internetType = stat.type;
-    } catch(e) {}
+    NetInfo.addEventListener(stat => {
+        if (i == 0) {
+            internetType = stat.type
+        }
+        i++
+    })
 
     const arr = {
         session_id: global.session_id,
@@ -69,12 +72,8 @@ const setGlobalErrorHandler = () => {
 // Function to handle unhandled promise rejections
 const captureUnhandledRejections = () => {
     // Listen for unhandled promise rejections
-    const originalHandler = window.onunhandledrejection;
     window.onunhandledrejection = (reason, promise) => {
         logError(reason, false);
-        if (typeof originalHandler === 'function') {
-            originalHandler(reason, promise);
-        }
     };
 };
 

package/src/Componanats/ShakeFunction.js

@@ -16,8 +16,6 @@ import { useGlobalState } from 'shakebug-react-native/src/Componanats/GlobalStat
 
 LogBox.ignoreAllLogs()
 
-let stopWatchIntervalId = null;
-
 const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitle, allowToReportBugByShaking, allowToReportBugByScreenCapture, allowCrashReport }) => {
 
   const { ShakebugSDKScreenShotDetector, ShakebugSDKSharedPreferencesModule, ShakebugSDKCustomScreenCapture} = NativeModules;
@@ -35,7 +33,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
 
     useEffect(() => {
       const subscription = DeviceEventEmitter.addListener('ScreenshotTaken', async () => {
-        if (allowToReportBugByScreenCapture == true && global.isFeatureEnabled?.('2')) {
+        if (allowToReportBugByScreenCapture == true && (!global.isFeatureEnabled || global.isFeatureEnabled('4'))) {
           if (!global.isScreenShotDetected && global.application_id != "" && global.application_id != undefined) {
             OpenShakebug()
           }
@@ -51,7 +49,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       const subscription = screenShotEmitter.addListener(
         'ScreenshotTaken',
         (event) => {
-          if (allowToReportBugByScreenCapture == true && global.isFeatureEnabled?.('2')) {
+          if (allowToReportBugByScreenCapture == true && (!global.isFeatureEnabled || global.isFeatureEnabled('4'))) {
             // setIsScreenShot(true)
             if (!global.isScreenShotDetected && global.application_id != "" && global.application_id != undefined) {
               OpenShakebug()
@@ -134,7 +132,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       iscrashSaveed = await ShakebugSDKSharedPreferencesModule.getString('iscrashSaveed')
       const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
 
-      if (iscrashSaveed.length > 10 && allowCrashReport && global.isFeatureEnabled?.('4')) {
+      if (iscrashSaveed.length > 10 && allowCrashReport) {
 
         let data = JSON.parse(iscrashSaveed)
 
@@ -197,7 +195,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       global.isDraw = false;
       global.isShow = false;
       startTimeRef.current = null
-      if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
+      clearInterval(intervalId);
       setIsLoading(false)
       global.isRecording = false;
       navigate("AddDetailsScreen", { media: res.result.outputURL, mediaType: 'Recordvideo', themeColor: themeColor, SDKScreenTitle: `${SDKScreenTitle}` })
@@ -234,13 +232,13 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     return () => {
       // AppState.removeEventListener('change', handleAppStateChange);
       AppStateListener.remove()
-      if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
+      clearInterval(intervalId);
     };
   }, []);
 
   const startTimer = () => {
     startTimeRef.current = Date.now();
-    stopWatchIntervalId = setInterval(() => {
+    intervalId = setInterval(() => {
       if (global.isRecording) {
         const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
         updateTimer(elapsed);
@@ -253,7 +251,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     const sec = parseInt(elapsed % 60);
 
     if (elapsed == global.videoDuration) {
-      if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
+      clearInterval(intervalId);
       setTimeout(() => {
         Stop()
       }, 1000)
@@ -271,7 +269,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
           global.isDraw = false;
           global.isShow = false;
           startTimeRef.current = null
-          if (stopWatchIntervalId) clearInterval(stopWatchIntervalId);
+          clearInterval(intervalId);
         })
     }
 
@@ -284,14 +282,10 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     let xdata = 0;
     let ydata = 0;
     let zdata = 0;
-    let isMounted = true;
-    let localSubscription = null;
-    let localPollingInterval = null;
 
     DeviceInfo.isEmulator().then(res => {
-      if (!isMounted) return;
-      if (!res && global.isRecording == false && allowToReportBugByShaking !== false && global.isFeatureEnabled?.('2')) {
-        localSubscription = accelerometer.subscribe(async ({ x, y, z, timestamp }) => {
+      if (!res && isRecording == false && allowToReportBugByShaking !== false && (!global.isFeatureEnabled || global.isFeatureEnabled('2'))) {
+        const subscription = accelerometer.subscribe(async ({ x, y, z, timestamp }) => {
 
           let calculate = Math.sqrt(x * x + y * y + z * z);
 
@@ -310,7 +304,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
                 const ImgUrl = await ref.current.capture()
                 if (!isShow) {
                   if (ImgUrl != undefined || ImgUrl != null) {
-                    if (localSubscription) localSubscription.unsubscribe();
+                    subscription.unsubscribe();
                     global.IsBackground = false
                     global.isShakebugSDKOpen = true
                     navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
@@ -339,7 +333,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
        
                 }
                 if (ImgUrl != undefined || ImgUrl != null) {
-                  if (localSubscription) localSubscription.unsubscribe();
+                  subscription.unsubscribe();
                   global.isShakebugSDKOpen = true
                   navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
                 }
@@ -356,7 +350,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
         })
 
         if (isFocused == false) {
-          if (localSubscription) localSubscription.unsubscribe()
+          subscription.unsubscribe()
           xdata = 0;
           ydata = 0;
           zdata = 0;
@@ -365,7 +359,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
         }
       }
       else {
-        localPollingInterval = setInterval(() => {
+        setInterval(() => {
           if (global.isTrigger == true && global.isShakebugOpen == false) {
             global.isShakebugOpen = true;
             global.isTrigger = true;
@@ -375,16 +369,6 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       }
     })
 
-    return () => {
-      isMounted = false;
-      if (localSubscription) {
-        localSubscription.unsubscribe();
-      }
-      if (localPollingInterval) {
-        clearInterval(localPollingInterval);
-      }
-    };
-
   }, [isFocused])
 
   const OpenShakebug = async () => {

package/src/Screens/Shakebug.js

@@ -24,7 +24,6 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
-export const ShakebugPropsContext = React.createContext({});
 
 global.session_id = "";
 global.application_id = "";
@@ -58,13 +57,13 @@ global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
 global.KEY_REVIEW_SUBMITTED = false;
-global.shakebug_type = "";
-
-global.isFeatureEnabled = (id) => {
-  if (!global.shakebug_type) return false;
-  const types = global.shakebug_type.split(',').map(s => s.trim());
+global.shakebug_type = "1";
+global.isFeatureEnabled = (featureCode) => {
+  if (!global.shakebug_type) return true;
+  const types = global.shakebug_type.split(',');
+  if (types.includes('0')) return false;
   if (types.includes('1')) return true;
-  return types.includes(id.toString());
+  return types.includes(featureCode);
 };
 
 function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirstTime, ShakebugThemeColor, changeSDKScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, makeLogEnabled, setShakebugSDKEndPointURL }) {
@@ -165,13 +164,13 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
           const afterDaysTimestamp = now + sevenDaysInMs;
 
-          if (LAST_POPUP_TIME > afterDaysTimestamp && global.isFeatureEnabled?.('6')) {
-            setShowModal(true)
+          if (LAST_POPUP_TIME > afterDaysTimestamp) {
+            if (!global.isFeatureEnabled || global.isFeatureEnabled('6')) setShowModal(true)
           }
 
         }
-        else if (IS_REVIEW_SUBMITTED != "true" && global.isFeatureEnabled?.('6')) {
-          setShowModal(true)
+        else if (IS_REVIEW_SUBMITTED != "true") {
+          if (!global.isFeatureEnabled || global.isFeatureEnabled('6')) setShowModal(true)
         }
       }
 
@@ -246,7 +245,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     }
 
     let i = 0;
-    const unsubscribe = NetInfo.addEventListener(state => {
+    NetInfo.addEventListener(state => {
       if (i == 0) {
         if (state.isConnected == true) {
           fetchData()
@@ -258,12 +257,6 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       }
       i++;
     })
-
-    return () => {
-      if (unsubscribe) {
-        unsubscribe();
-      }
-    };
   }, [Android_appkey, iOS_appkey])
 
 
@@ -279,7 +272,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
             StartSession()
         }
         else if (nextAppState == "background" || nextAppState == 'inactive') {
-          if (global.session_id != "" && global.IsBackground == 'true' && global.isFeatureEnabled?.('3')) {
+          if (global.session_id != "" && global.IsBackground == 'true') {
             async function FetchEndSessionData() {
               try {
                 const { success, message } = await SessionEndApi(global.session_id);
@@ -322,9 +315,11 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type } = await MatchKeyApi(appkey, BundleId);
 
       global.videoDuration = video_duration;
-      global.shakebug_type = shakebug_type || "";
 
       if (success) {
+        if (shakebug_type) {
+            global.shakebug_type = shakebug_type.toString();
+        }
         if (total_video == "Unlimited") {
           global.AllowVideo = true;
         }
@@ -378,7 +373,8 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
   // For call Startsesstion and get session id 
   const StartSession = async () => {
-    if (global.session_id == "" && global.isFeatureEnabled?.('3')) {
+    if (global.isFeatureEnabled && !global.isFeatureEnabled('3')) return;
+    if (global.session_id == "") {
       try {
         const { success, session_id: newSessionId, message } = await SessionStartApi(global.latitude, global.longitude, global.application_id);
         if (success) {
@@ -405,9 +401,67 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     })
   }
 
+  // For shakeFunctionscreen with childern as props
+  const ShakeScreen = () => {
+
+    DeviceInfo.isEmulator()
+      .then(res => {
+        global.isRealDevice = !res
+      })
+
+    return (
+      <ShakeFunction isRealDevice={global.isRealDevice} themeColor={ThemeColor} showTutorialScreen={showTutorialScreenFirstTime} SDKScreenTitle={[FirstScreenTitle, SecondScreenTitle]} allowToReportBugByShaking={allowToReportBugByShakingMobile} allowToReportBugByScreenCapture={allowToReportBugByScreenCapture} allowCrashReport={allowCrashReport} ShakebugLanguage={ShakebugLanguage}>
+        {children}
+      </ShakeFunction>
+    )
+  }
+
   // For handel error globaly
   setGlobalErrorHandler()
 
+  const { width } = Dimensions.get('window');
+
+  // For register all screen
+  const screens = {
+    ShakebugHome: ShakeScreen,
+    TutorialScreen: TutorialScreen,
+    FirstScreen: FirstScreen,
+    TrimVideoScreen: TrimVideoScreen,
+    AddDetailsScreen: AddDetailsScreen
+  };
+
+  // For navigation in register screen
+  const NavigationContainer = () => {
+    const { navigationState } = useNavigation();
+    const animation = React.useRef(new Animated.Value(0)).current;
+
+    React.useEffect(() => {
+      Animated.timing(animation, {
+        toValue: navigationState.length - 1,
+        duration: 300,
+        useNativeDriver: true,
+      }).start();
+    }, [navigationState]);
+
+    return (
+      <View style={styles.container}>
+        {navigationState.map((screen, index) => {
+          const ScreenComponent = screens[screen.name];
+          const translateX = animation.interpolate({
+            inputRange: [index - 1, index, index + 1],
+            outputRange: [width, 0, -width],
+          });
+
+          return (
+            <Animated.View key={index} style={[styles.screen, { transform: [{ translateX }] }]}>
+              <ScreenComponent {...screen.params} />
+            </Animated.View>
+          );
+        })}
+      </View>
+    );
+  };
+
   return (
       <View
         style={{
@@ -415,13 +469,11 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           height: '100%'
         }}
       >
-        <ShakebugPropsContext.Provider value={{ ThemeColor, showTutorialScreenFirstTime, FirstScreenTitle, SecondScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, children }}>
-          <GlobalStateProvider>
-            <NavigationProvider>
-              <NavigationContainerComponent />
-            </NavigationProvider>
-          </GlobalStateProvider>
-        </ShakebugPropsContext.Provider>
+        <GlobalStateProvider>
+          <NavigationProvider>
+            <NavigationContainer />
+          </NavigationProvider>
+        </GlobalStateProvider>
 
         <CustomeAlert
           isVisible={isAlert}
@@ -438,79 +490,12 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   )
 }
 
-const ShakeScreenInner = () => {
-    const props = React.useContext(ShakebugPropsContext);
-
-    useEffect(() => {
-      DeviceInfo.isEmulator()
-        .then(res => {
-          global.isRealDevice = !res
-        })
-    }, []);
-
-    return (
-      <ShakeFunction 
-        isRealDevice={global.isRealDevice} 
-        themeColor={props.ThemeColor} 
-        showTutorialScreen={props.showTutorialScreenFirstTime} 
-        SDKScreenTitle={[props.FirstScreenTitle, props.SecondScreenTitle]} 
-        allowToReportBugByShaking={props.allowToReportBugByShakingMobile} 
-        allowToReportBugByScreenCapture={props.allowToReportBugByScreenCapture} 
-        allowCrashReport={props.allowCrashReport} 
-        ShakebugLanguage={props.ShakebugLanguage}
-      >
-        {props.children}
-      </ShakeFunction>
-    )
-}
-
-const screens = {
-  ShakebugHome: ShakeScreenInner,
-  TutorialScreen: TutorialScreen,
-  FirstScreen: FirstScreen,
-  TrimVideoScreen: TrimVideoScreen,
-  AddDetailsScreen: AddDetailsScreen
-};
-
-const NavigationContainerComponent = () => {
-  const { width } = Dimensions.get('window');
-  const { navigationState } = useNavigation();
-  const animation = React.useRef(new Animated.Value(0)).current;
-
-  React.useEffect(() => {
-    Animated.timing(animation, {
-      toValue: navigationState.length - 1,
-      duration: 300,
-      useNativeDriver: true,
-    }).start();
-  }, [navigationState]);
-
-  return (
-    <View style={styles.container}>
-      {navigationState.map((screen, index) => {
-        const ScreenComponent = screens[screen.name];
-        const translateX = animation.interpolate({
-          inputRange: [index - 1, index, index + 1],
-          outputRange: [width, 0, -width],
-        });
-
-        return (
-          <Animated.View key={index} style={[styles.screen, { transform: [{ translateX }] }]}>
-            <ScreenComponent {...screen.params} />
-          </Animated.View>
-        );
-      })}
-    </View>
-  );
-};
-
 
 export default Shakebug;
 
 // For add event api
 export const AddEvent = async (name, value) => {
-
-  if (!global.isFeatureEnabled?.('5')) return;
+  if (global.isFeatureEnabled && !global.isFeatureEnabled('5')) return;
 
   const defaultConfig = {
     levels: {

package/src/index.tsx

@@ -47,7 +47,7 @@ const ShakebugView: React.FC<ShakebugViewProps> = ({
 }) => {
 
   return (
-    <NavigationContainer independent={true}>
+    <NavigationContainer>
       <Shakebug
         children={children}
         Android_appkey={Android_appkey}