fix: potential crash fixes

lrtlt · Oct 11, 2024 · 319a0f8 · 319a0f8
1 parent d33a699
commit 319a0f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/app/components/videoComponent/TheoMediaPlayer.tsx b/app/components/videoComponent/TheoMediaPlayer.tsx
@@ -54,14 +54,12 @@ interface Props {
   onEnded?: () => void;
 }
 
-const license = Platform.select({
-  android:
-    'sZP7IYe6T6Pe3uPKTuX136ztIuhtFSacIQC-ClhoTOziTuR_3D4e3uetIS06FOPlUY3zWokgbgjNIOf9fKCi0L0cTSRtFDCkIlR-3Q363ZzrTuarFS0L0SA1ISerIl3K0mfVfK4_bQgZCYxNWoryIQXzImf90SbiTSf_3Lfi0u5i0Oi6Io4pIYP1UQgqWgjeCYxgflEc3lbk0SCk3SbcTS5tFOPeWok1dDrLYtA1Ioh6TgV6v6fVfKcqCoXVdQjLUOfVfGxEIDjiWQXrIYfpCoj-fgzVfKxqWDXNWG3ybojkbK3gflNWf6E6FOPVWo31WQ1qbta6FOPzdQ4qbQc1sD4ZFK3qWmPUFOPLIQ-LflNWfK1zWDikf6i6CDrebKjNIOfVfKXpIwPqdDxzU6fVfKINbK4zU6fVfKgqbZfVfGxNsK4pf6i6UwIqbZfVfGUgCKjLfgzVfG3gWKxydDkibK4LbogqW6f9UwPkImi6IK41Uw4ZIY06Tg-Uya',
-  ios: 'sZP7IYe6T6Pe3uPKTuX136ztIuhtFSacIQC-ClhoTOziTuR_3D4e3uetIS06FOPlUY3zWokgbgjNIOf9fKCi0L0cTSRtFDCkIlR-3Q363ZzrTuarFS0L0SA1ISerIl3K0mfVfK4_bQgZCYxNWoryIQXzImf90SbiTSf_3Lfi0u5i0Oi6Io4pIYP1UQgqWgjeCYxgflEc3lbk0SCk3SbcTS5tFOPeWok1dDrLYtA1Ioh6TgV6v6fVfKcqCoXVdQjLUOfVfGxEIDjiWQXrIYfpCoj-fgzVfKxqWDXNWG3ybojkbK3gflNWf6E6FOPVWo31WQ1qbta6FOPzdQ4qbQc1sD4ZFK3qWmPUFOPLIQ-LflNWfK1zWDikf6i6CDrebKjNIOfVfKXpIwPqdDxzU6fVfKINbK4zU6fVfKgqbZfVfGxNsK4pf6i6UwIqbZfVfGUgCKjLfgzVfG3gWKxydDkibK4LbogqW6f9UwPkImi6IK41Uw4ZIY06Tg-Uya',
-});
-
 const config: PlayerConfiguration = {
-  license,
+  license: Platform.select({
+    android:
+      'sZP7IYe6T6Pe3uPKTuX136ztIuhtFSacIQC-ClhoTOziTuR_3D4e3uetIS06FOPlUY3zWokgbgjNIOf9fKCi0L0cTSRtFDCkIlR-3Q363ZzrTuarFS0L0SA1ISerIl3K0mfVfK4_bQgZCYxNWoryIQXzImf90SbiTSf_3Lfi0u5i0Oi6Io4pIYP1UQgqWgjeCYxgflEc3lbk0SCk3SbcTS5tFOPeWok1dDrLYtA1Ioh6TgV6v6fVfKcqCoXVdQjLUOfVfGxEIDjiWQXrIYfpCoj-fgzVfKxqWDXNWG3ybojkbK3gflNWf6E6FOPVWo31WQ1qbta6FOPzdQ4qbQc1sD4ZFK3qWmPUFOPLIQ-LflNWfK1zWDikf6i6CDrebKjNIOfVfKXpIwPqdDxzU6fVfKINbK4zU6fVfKgqbZfVfGxNsK4pf6i6UwIqbZfVfGUgCKjLfgzVfG3gWKxydDkibK4LbogqW6f9UwPkImi6IK41Uw4ZIY06Tg-Uya',
+    ios: 'sZP7IYe6T6Pe3uPKTuX136ztIuhtFSacIQC-ClhoTOziTuR_3D4e3uetIS06FOPlUY3zWokgbgjNIOf9fKCi0L0cTSRtFDCkIlR-3Q363ZzrTuarFS0L0SA1ISerIl3K0mfVfK4_bQgZCYxNWoryIQXzImf90SbiTSf_3Lfi0u5i0Oi6Io4pIYP1UQgqWgjeCYxgflEc3lbk0SCk3SbcTS5tFOPeWok1dDrLYtA1Ioh6TgV6v6fVfKcqCoXVdQjLUOfVfGxEIDjiWQXrIYfpCoj-fgzVfKxqWDXNWG3ybojkbK3gflNWf6E6FOPVWo31WQ1qbta6FOPzdQ4qbQc1sD4ZFK3qWmPUFOPLIQ-LflNWfK1zWDikf6i6CDrebKjNIOfVfKXpIwPqdDxzU6fVfKINbK4zU6fVfKgqbZfVfGxNsK4pf6i6UwIqbZfVfGUgCKjLfgzVfG3gWKxydDkibK4LbogqW6f9UwPkImi6IK41Uw4ZIY06Tg-Uya',
+  }),
   chromeless: true,
 };
 

diff --git a/app/screens/verticalVideos/VerticalVideosScreen.tsx b/app/screens/verticalVideos/VerticalVideosScreen.tsx
@@ -9,6 +9,7 @@ import {MainStackParamList} from '../../navigation/MainStack';
 import InfinitePager from 'react-native-infinite-pager';
 import {pageInterpolatorTurnIn} from './pageInterpolator';
 import VerticalVideoWrapper from './VerticalVideoWrapper';
+import {ScreenError} from '../../components';
 
 type ScreenRouteProp = RouteProp<MainStackParamList, 'VideoList'>;
 type ScreenNavigationProp = StackNavigationProp<MainStackParamList, 'VideoList'>;
@@ -21,7 +22,7 @@ type Props = {
 const HEADER_BACKGROUND_COLOR = '#000000';
 
 const VerticalVideoScreen: React.FC<React.PropsWithChildren<Props>> = ({navigation, route}) => {
-  const {colors} = useTheme();
+  const {colors, strings} = useTheme();
   const {articles, initialIndex, title} = route.params;
 
   useEffect(() => {
@@ -51,7 +52,12 @@ const VerticalVideoScreen: React.FC<React.PropsWithChildren<Props>> = ({navigati
         initialIndex={initialIndex}
         renderPage={(props) => {
           let validIndex = ((props.index % articles.length) + articles.length) % articles.length;
-          return <VerticalVideoWrapper id={articles[validIndex].id} isActive={props.isActive} />;
+          if (!articles[validIndex]) {
+            console.error('Invalid index', validIndex);
+            return <ScreenError text={strings.articleError} />;
+          } else {
+            return <VerticalVideoWrapper id={articles[validIndex].id} isActive={props.isActive} />;
+          }
         }}
       />
     </SafeAreaView>

diff --git a/index.js b/index.js
@@ -1,5 +1,7 @@
 // Setup RN Gesture handler
 import 'react-native-gesture-handler';
+//Might help with crash https://github.com/jpudysz/react-native-unistyles/issues/151
+import 'react-native-unistyles';
 
 import {setupGemius} from './app/util/useGemiusSetup';
 setupGemius();