feat: Use BRAND_NAME in filename for backup and call report (#8367)

wireapp · Mar 16, 2020 · 041ffb9 · 041ffb9
1 parent 1253a7e
commit 041ffb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/script/view_model/content/HistoryExportViewModel.js b/src/script/view_model/content/HistoryExportViewModel.js
@@ -27,6 +27,7 @@ import {EventName} from '../../tracking/EventName';
 import {ContentViewModel} from '../ContentViewModel';
 
 import 'Components/loadingBar';
+import {Config} from '../../Config';
 
 window.z = window.z || {};
 window.z.viewModel = z.viewModel || {};
@@ -122,7 +123,8 @@ z.viewModel.content.HistoryExportViewModel = class HistoryExportViewModel {
   downloadArchiveFile() {
     const userName = this.userRepository.self().username();
     const fileExtension = HistoryExportViewModel.CONFIG.FILE_EXTENSION;
-    const filename = `Wire-${userName}-Backup_${getCurrentDate()}.${fileExtension}`;
+    const sanitizedBrandName = Config.getConfig().BRAND_NAME.replace(/[^A-Za-z0-9_]/g, '');
+    const filename = `${sanitizedBrandName}-${userName}-Backup_${getCurrentDate()}.${fileExtension}`;
 
     this.dismissExport();
     downloadBlob(this.archiveBlob(), filename, 'application/octet-stream');

diff --git a/src/script/view_model/content/PreferencesOptionsViewModel.js b/src/script/view_model/content/PreferencesOptionsViewModel.js
@@ -100,7 +100,8 @@ z.viewModel.content.PreferencesOptionsViewModel = class PreferencesOptionsViewMo
 
       const selfUserId = this.userRepository.self().id;
       const truncatedId = selfUserId.substr(0, PreferencesOptionsViewModel.CONFIG.OBFUSCATION_TRUNCATE_TO);
-      const filename = `Wire-${truncatedId}-Calling_${getCurrentDate()}.log`;
+      const sanitizedBrandName = Config.getConfig().BRAND_NAME.replace(/[^A-Za-z0-9_]/g, '');
+      const filename = `${sanitizedBrandName}-${truncatedId}-Calling_${getCurrentDate()}.log`;
 
       return downloadBlob(blob, filename);
     }