diff --git a/jslib b/jslib index e5d060c80b..3a34d3b174 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit e5d060c80b6c6ca4f863534ec73ed410bb30a21e +Subproject commit 3a34d3b174a1cad8eac9fe950c814336902b4cab diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html index 214560b4a1..6d3d91a42c 100644 --- a/src/app/tools/import.component.html +++ b/src/app/tools/import.component.html @@ -140,6 +140,14 @@ 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. + + Make sure you have python-keyring and python-gnomekeyring installed. Save the + GNOME Keyring Import/Export python script to your desktop as + pw_helper.py. Open terminal and run + chmod +rx Desktop/pw_helper.py and then + python Desktop/pw_helper.py export Desktop/my_passwords.json. Then upload the resulting + my_passwords.json file here to Bitwarden. +
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts index 2e57150d22..f152a810d1 100644 --- a/src/app/tools/import.component.ts +++ b/src/app/tools/import.component.ts @@ -30,6 +30,7 @@ import { ClipperzHtmlImporter } from 'jslib/importers/clipperzHtmlImporter'; import { DashlaneCsvImporter } from 'jslib/importers/dashlaneCsvImporter'; import { EnpassCsvImporter } from 'jslib/importers/enpassCsvImporter'; import { FirefoxCsvImporter } from 'jslib/importers/firefoxCsvImporter'; +import { GnomeJsonImporter } from 'jslib/importers/gnomeJsonImporter'; import { Importer } from 'jslib/importers/importer'; import { KeePass2XmlImporter } from 'jslib/importers/keepass2XmlImporter'; import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter'; @@ -295,6 +296,8 @@ export class ImportComponent implements OnInit { return new SplashIdCsvImporter(); case 'passkeepcsv': return new PassKeepCsvImporter(); + case 'gnomejson': + return new GnomeJsonImporter(); default: return null; }