Merge branch 'video-generator-updates' into testing

quran · Sep 11, 2024 · 0b6f87a · 0b6f87a
2 parents 0626c25 + d6658dc
commit 0b6f87a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/pages/media/index.tsx b/src/pages/media/index.tsx
@@ -34,7 +34,7 @@ import { getMushafId } from '@/utils/api';
 import { makeChapterAudioDataUrl, makeVersesUrl } from '@/utils/apiPaths';
 import { areArraysEqual } from '@/utils/array';
 import { getAllChaptersData, getChapterData } from '@/utils/chapter';
-import { isAppleWebKit, isSafari } from '@/utils/device-detector';
+import { isChromeIOS, isSafari } from '@/utils/device-detector';
 import { getLanguageAlternates, toLocalizedNumber } from '@/utils/locale';
 import {
   DEFAULT_API_PARAMS,
@@ -285,8 +285,7 @@ const MediaMaker: NextPage<MediaMaker> = ({
     chapterEnglishName,
   ]);
 
-  const method = isAppleWebKit() ? 'base64' : 'blob-url';
-
+  const method = isChromeIOS() ? 'base64' : 'blob-url';
   useEffect(() => {
     setVideoFileReady(false);
     // {@see https://www.remotion.dev/docs/troubleshooting/player-flicker#option-6-prefetching-as-base64-to-avoid-network-request-and-local-http-server}

diff --git a/src/utils/device-detector.ts b/src/utils/device-detector.ts
@@ -15,22 +15,11 @@ export const isAppleDevice = () => {
   return isOSX || isMacOs();
 };
 
-export const isAppleWebKit = () => {
-  if (!isClient) {
-    return false;
-  }
-
-  const { userAgent } = navigator;
-  return /AppleWebKit/.test(userAgent) && /Mobile/.test(userAgent);
-};
-
 export const isFirefox = () => {
   if (!isClient) {
     return false;
   }
-
-  const { userAgent } = navigator;
-  return userAgent.toLowerCase().includes('firefox');
+  return navigator.userAgent.toLowerCase().includes('firefox');
 };
 
 export const isSafari = () => {
@@ -43,3 +32,10 @@ export const isSafari = () => {
   const chrome = userAgent.toLowerCase().includes('chrome');
   return safari && !chrome;
 };
+
+export const isChromeIOS = () => {
+  if (!isClient) {
+    return false;
+  }
+  return navigator.userAgent.match('CriOS');
+};