diff --git a/jslib b/jslib index 06682e2672..e5d060c80b 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 06682e267259dcc4ddbf813550451ea620ad9b98 +Subproject commit e5d060c80b6c6ca4f863534ec73ed410bb30a21e diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html index 045bac46c2..214560b4a1 100644 --- a/src/app/tools/import.component.html +++ b/src/app/tools/import.component.html @@ -136,6 +136,10 @@ Using the SplashID Safe desktop application, click on the SplashID blue lock logo in the top right corner. Navigate to "Export" → "Export as CSV" and save the CSV file. + + Using the PassKeep mobile app, navigate to "Backup/Restore". Locate the "CSV Backup/Restore" section and click "Backup to + CSV" to save the CSV file. +
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts index 460b8105f3..2e57150d22 100644 --- a/src/app/tools/import.component.ts +++ b/src/app/tools/import.component.ts @@ -40,6 +40,7 @@ import { MSecureCsvImporter } from 'jslib/importers/msecureCsvImporter'; import { OnePassword1PifImporter } from 'jslib/importers/onepassword1PifImporter'; import { OnePasswordWinCsvImporter } from 'jslib/importers/onepasswordWinCsvImporter'; import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter'; +import { PassKeepCsvImporter } from 'jslib/importers/passkeepCsvImporter'; import { PasswordBossJsonImporter } from 'jslib/importers/passwordBossJsonImporter'; import { PasswordDragonXmlImporter } from 'jslib/importers/passwordDragonXmlImporter'; import { PasswordSafeXmlImporter } from 'jslib/importers/passwordSafeXmlImporter'; @@ -292,6 +293,8 @@ export class ImportComponent implements OnInit { return new ZohoVaultCsvImporter(); case 'splashidcsv': return new SplashIdCsvImporter(); + case 'passkeepcsv': + return new PassKeepCsvImporter(); default: return null; }