Merge pull request #37220 from Expensify/puneetlath-cherry-pick-stagi…

…ng-37163-1

🍒 Cherry pick PR #37163 to staging 🍒

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001044318
-        versionName "1.4.43-18"
+        versionCode 1001044319
+        versionName "1.4.43-19"
     }
 
     flavorDimensions "default"

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.43.18</string>
+	<string>1.4.43.19</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.43.18</string>
+	<string>1.4.43.19</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.43</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.43.18</string>
+	<string>1.4.43.19</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.43-18",
+  "version": "1.4.43-19",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/VideoPlayerContexts/VideoPopoverMenuContext.js

@@ -3,15 +3,15 @@ import React, {useCallback, useContext, useMemo, useState} from 'react';
 import _ from 'underscore';
 import * as Expensicons from '@components/Icon/Expensicons';
 import useLocalize from '@hooks/useLocalize';
+import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
 import fileDownload from '@libs/fileDownload';
-import * as Url from '@libs/Url';
 import CONST from '@src/CONST';
 import {usePlaybackContext} from './PlaybackContext';
 
 const VideoPopoverMenuContext = React.createContext(null);
 
 function VideoPopoverMenuContextProvider({children}) {
-    const {currentVideoPlayerRef} = usePlaybackContext();
+    const {currentVideoPlayerRef, currentlyPlayingURL} = usePlaybackContext();
     const {translate} = useLocalize();
     const [currentPlaybackSpeed, setCurrentPlaybackSpeed] = useState(CONST.VIDEO_PLAYER.PLAYBACK_SPEEDS[2]);
 
@@ -24,11 +24,9 @@ function VideoPopoverMenuContextProvider({children}) {
     );
 
     const downloadAttachment = useCallback(() => {
-        currentVideoPlayerRef.current.getStatusAsync().then((status) => {
-            const sourceURI = `/${Url.getPathFromURL(status.uri)}`;
-            fileDownload(sourceURI);
-        });
-    }, [currentVideoPlayerRef]);
+        const sourceURI = currentlyPlayingURL.startsWith('blob:') || currentlyPlayingURL.startsWith('file:') ? currentlyPlayingURL : addEncryptedAuthTokenToURL(currentlyPlayingURL);
+        fileDownload(sourceURI);
+    }, [currentlyPlayingURL]);
 
     const menuItems = useMemo(
         () => [

src/libs/fileDownload/FileUtils.ts

@@ -80,14 +80,14 @@ function showCameraPermissionsAlert() {
  * Extracts a filename from a given URL and sanitizes it for file system usage.
  *
  * This function takes a URL as input and performs the following operations:
- * 1. Extracts the last segment of the URL, which could be a file name, a path segment,
- *    or a query string parameter.
+ * 1. Extracts the last segment of the URL.
  * 2. Decodes the extracted segment from URL encoding to a plain string for better readability.
  * 3. Replaces any characters in the decoded string that are illegal in file names
  *    with underscores.
  */
 function getFileName(url: string): string {
-    const fileName = url.split(/[#?/]/).pop() ?? '';
+    const fileName = url.split('/').pop()?.split('?')[0].split('#')[0] ?? '';
+
     if (!fileName) {
         Log.warn('[FileUtils] Could not get attachment name', {url});
     }
@@ -111,7 +111,7 @@ function getFileType(fileUrl: string): string | undefined {
         return;
     }
 
-    const fileName = fileUrl.split('/').pop()?.split('?')[0].split('#')[0];
+    const fileName = getFileName(fileUrl);
 
     if (!fileName) {
         return;