Change 2FA recovery code filename, and only append time to that file if saving fails on android

Author: chuckdries

src/libs/localFileCreate/index.native.ts

@@ -8,10 +8,10 @@ import type LocalFileCreate from './types';
  * @param textContent content of the file
  * @returns path, filename and size of the newly created file
  */
-const localFileCreate: LocalFileCreate = (fileName, textContent) => {
+const localFileCreate: LocalFileCreate = (fileName, textContent, appendTimestamp = true) => {
     const {fileExtension} = splitExtensionFromFileName(fileName);
     const fileNameWithExtension = fileExtension ? fileName : `${fileName}.txt`;
-    const newFileName = appendTimeToFileName(fileNameWithExtension);
+    const newFileName = appendTimestamp ? appendTimeToFileName(fileNameWithExtension) : fileNameWithExtension;
     const dir = RNFetchBlob.fs.dirs.DocumentDir;
     const path = `${dir}/${newFileName}`;
 

src/libs/localFileCreate/index.ts

@@ -7,10 +7,10 @@ import type LocalFileCreate from './types';
  * @param textContent content of the file
  * @returns path, filename and size of the newly created file
  */
-const localFileCreate: LocalFileCreate = (fileName, textContent) => {
+const localFileCreate: LocalFileCreate = (fileName, textContent, appendTimestamp = true) => {
     const {fileExtension} = splitExtensionFromFileName(fileName);
     const fileNameWithExtension = fileExtension ? fileName : `${fileName}.txt`;
-    const newFileName = appendTimeToFileName(fileNameWithExtension);
+    const newFileName = appendTimestamp ? appendTimeToFileName(fileNameWithExtension) : fileNameWithExtension;
     const blob = new Blob([textContent], {type: getMimeType(fileExtension)});
     const url = URL.createObjectURL(blob);
 

src/libs/localFileCreate/types.ts

@@ -1,3 +1,3 @@
-type LocalFileCreate = (fileName: string, textContent: string) => Promise<{path: string; newFileName: string; size: number}>;
+type LocalFileCreate = (fileName: string, textContent: string, appendTimestamp?: boolean) => Promise<{path: string; newFileName: string; size: number}>;
 
 export default LocalFileCreate;

src/libs/localFileDownload/index.android.ts

@@ -1,5 +1,5 @@
 import RNFetchBlob from 'react-native-blob-util';
-import {getMimeType, showGeneralErrorAlert, showSuccessAlert, splitExtensionFromFileName} from '@libs/fileDownload/FileUtils';
+import {appendTimeToFileName, getMimeType, showGeneralErrorAlert, showSuccessAlert, splitExtensionFromFileName} from '@libs/fileDownload/FileUtils';
 import localFileCreate from '@libs/localFileCreate';
 import type LocalFileDownload from './types';
 
@@ -8,18 +8,22 @@ import type LocalFileDownload from './types';
  * and textContent, so we're able to copy it to the Android public download dir.
  * After the file is copied, it is removed from the internal dir.
  */
-const localFileDownload: LocalFileDownload = (fileName, textContent, translate, successMessage) => {
-    localFileCreate(fileName, textContent).then(({path, newFileName}) => {
+const localFileDownload: LocalFileDownload = (fileName, textContent, translate, successMessage, shouldShowSuccessAlert, appendTimestamp = true) => {
+    localFileCreate(fileName, textContent, appendTimestamp).then(({path, newFileName}) => {
         const {fileExtension} = splitExtensionFromFileName(newFileName);
-        RNFetchBlob.MediaCollection.copyToMediaStore(
-            {
-                name: newFileName,
-                parentFolder: '', // subdirectory in the Media Store, empty goes to 'Downloads'
-                mimeType: getMimeType(fileExtension),
-            },
-            'Download',
-            path,
-        )
+        const mimeType = getMimeType(fileExtension);
+        const tryMediaStore = (name: string) =>
+            RNFetchBlob.MediaCollection.copyToMediaStore(
+                {
+                    name,
+                    parentFolder: '', // subdirectory in the Media Store, empty goes to 'Downloads'
+                    mimeType,
+                },
+                'Download',
+                path,
+            );
+        tryMediaStore(newFileName)
+            .catch(() => tryMediaStore(appendTimeToFileName(newFileName)))
             .then(() => {
                 showSuccessAlert(translate, successMessage);
             })

src/libs/localFileDownload/index.ios.ts

@@ -9,8 +9,8 @@ import type LocalFileDownload from './types';
  * and textContent, so we're able to share it using iOS' share API.
  * After the file is shared, it is removed from the internal dir.
  */
-const localFileDownload: LocalFileDownload = (fileName, textContent, translate, successMessage, shouldShowSuccessAlert) => {
-    localFileCreate(fileName, textContent).then(({path, newFileName}) => {
+const localFileDownload: LocalFileDownload = (fileName, textContent, translate, successMessage, shouldShowSuccessAlert, appendTimestamp = true) => {
+    localFileCreate(fileName, textContent, appendTimestamp).then(({path, newFileName}) => {
         Share.share({url: path, title: newFileName}).finally(() => {
             RNFetchBlob.fs.unlink(path);
             if (shouldShowSuccessAlert) {

src/libs/localFileDownload/index.ts

@@ -7,8 +7,8 @@ import type LocalFileDownload from './types';
  * creates a temporary anchor, just to programmatically click it, so the file
  * is downloaded by the browser.
  */
-const localFileDownload: LocalFileDownload = (fileName, textContent, translate, successMessage, shouldShowSuccessAlert) => {
-    localFileCreate(fileName, textContent).then(({path, newFileName}) => {
+const localFileDownload: LocalFileDownload = (fileName, textContent, translate, successMessage, shouldShowSuccessAlert, appendTimestamp = true) => {
+    localFileCreate(fileName, textContent, appendTimestamp).then(({path, newFileName}) => {
         const link = document.createElement('a');
         link.download = newFileName;
         link.href = path;

src/libs/localFileDownload/types.ts

@@ -1,5 +1,5 @@
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
-type LocalFileDownload = (fileName: string, textContent: string, translate: LocalizedTranslate, successMessage?: string, shouldShowSuccessAlert?: boolean) => void;
+type LocalFileDownload = (fileName: string, textContent: string, translate: LocalizedTranslate, successMessage?: string, shouldShowSuccessAlert?: boolean, appendTimestamp?: boolean) => void;
 
 export default LocalFileDownload;

src/pages/settings/Security/TwoFactorAuth/CopyCodesPage.tsx

@@ -147,7 +147,7 @@ function CopyCodesPage({route}: TwoFactorAuthPageProps) {
                                             text={translate('common.download')}
                                             icon={icons.Download}
                                             onPress={() => {
-                                                localFileDownload('two-factor-auth-codes', account?.recoveryCodes ?? '', translate);
+                                                localFileDownload('DO-NOT-DELETE_Expensify-2FA-RecoveryCodes.txt', account?.recoveryCodes ?? '', translate, undefined, undefined, false);
                                                 setError('');
                                                 setCodesAreCopied();
                                                 announceStatus(translate('fileDownload.success.title'));