rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show alert when importing a zip file as a backup (#720)

Browse Source 
* fix: show alert when importing a zip file as a backup

* Update app/assets/javascripts/strings.ts

Co-authored-by: Mo <mo@standardnotes.org>

Co-authored-by: Johnny Almonte <johnny243@users.noreply.github.com>
Co-authored-by: Mo <mo@standardnotes.org>
This commit is contained in:
Johnny A
2021-11-05 11:31:23 -04:00
committed by GitHub
parent 2fdb748bab
commit 261bb65a85
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/preferences/panes/security-segments/DataBackups.tsx
View File

@@ -3,6 +3,7 @@ import { alertDialog } from '@Services/alertService';
import { import {
STRING_IMPORT_SUCCESS, STRING_IMPORT_SUCCESS,
STRING_INVALID_IMPORT_FILE, STRING_INVALID_IMPORT_FILE,
STRING_IMPORTING_ZIP_FILE,
STRING_UNSUPPORTED_BACKUP_FILE_VERSION, STRING_UNSUPPORTED_BACKUP_FILE_VERSION,
StringImportError StringImportError
} from '@/strings'; } from '@/strings';
@@ -36,6 +37,11 @@ export const DataBackups = observer(({
}; };
const readFile = async (file: File): Promise<any> => { const readFile = async (file: File): Promise<any> => {
if (file.type === 'application/zip') {
application.alertService.alert(STRING_IMPORTING_ZIP_FILE);
return;
}
return new Promise((resolve) => { return new Promise((resolve) => {
const reader = new FileReader(); const reader = new FileReader();
reader.onload = (e) => { reader.onload = (e) => {

2
app/assets/javascripts/strings.ts
View File

@@ -80,6 +80,8 @@ export const STRING_GENERATING_LOGIN_KEYS = 'Generating Login Keys...';
export const STRING_GENERATING_REGISTER_KEYS = 'Generating Account Keys...'; export const STRING_GENERATING_REGISTER_KEYS = 'Generating Account Keys...';
export const STRING_INVALID_IMPORT_FILE = export const STRING_INVALID_IMPORT_FILE =
'Unable to open file. Ensure it is a proper JSON file and try again.'; 'Unable to open file. Ensure it is a proper JSON file and try again.';
export const STRING_IMPORTING_ZIP_FILE =
'The file you selected is not a valid backup file. Please extract the contents of the zip file, then upload the contained .txt file.';
export function StringImportError(errorCount: number) { export function StringImportError(errorCount: number) {
return `Import complete. ${errorCount} items were not imported because there was an error decrypting them. Make sure the password is correct and try again.`; return `Import complete. ${errorCount} items were not imported because there was an error decrypting them. Make sure the password is correct and try again.`;
} }