From 255886df532df804c8afb58caff947309e7998aa Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 11 Jul 2018 00:03:40 -0400
Subject: [PATCH] add more importers

---
 jslib                               |  2 +-
 src/app/tools/import.component.html | 22 ++++++++++++++++++++++
 src/app/tools/import.component.ts   | 17 +++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 678b191a32..4ba55c8c8b 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 678b191a32b053e38cc46e7c1b10aaa171d13201
+Subproject commit 4ba55c8c8bf12385502c1db4c9ba28c33792e433
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index a0f9d53647..532b4a7613 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -45,6 +45,28 @@
         <ng-container *ngIf="format === 'keepass2xml'">
             Using the KeePass 2 desktop application, navigate to "File" &rarr; "Export" and select the "KeePass XML (2.x)" option.
         </ng-container>
+        <ng-container *ngIf="format === 'upmcsv'">
+            Using the Universal Password Manager desktop application, navigate to "Database" &rarr; "Export" and save the CSV file.
+        </ng-container>
+        <ng-container *ngIf="format === 'saferpasscsv'">
+            Using the SaferPass browser extension, click the hamburger icon in the top left corner and navigate to "Settings". Click
+            the "Export accounts" button to save the CSV file.
+        </ng-container>
+        <ng-container *ngIf="format === 'meldiumcsv'">
+            Using the Meldium web vault, navigate to "Settings". Locate the "Export data" function and click "Show me my data" to save
+            the CSV file.
+        </ng-container>
+        <ng-container *ngIf="format === 'chromecsv' || format === 'operacsv' || format === 'vivaldicsv'">
+            <span *ngIf="format !== 'chromecsv'">
+                The process is exactly the same as importing from Google Chrome.
+            </span>
+            See detailed instructions on our help site at
+            <a target="_blank" href="https://help.bitwarden.com/article/import-from-chrome/">https://help.bitwarden.com/article/import-from-chrome/</a>
+        </ng-container>
+        <ng-container *ngIf="format === 'firefoxcsv'">
+            Use the
+            <a target="_blank" href="https://github.com/kspearrin/ff-password-exporter/blob/master/README.md#ff-password-exporter">FF Password Exporter</a> application to export your passwords to a CSV file.
+        </ng-container>
     </app-callout>
     <div class="row">
         <div class="col-6">
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index e387a12de4..62dbf41bb5 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -24,12 +24,17 @@ import { CipherView } from 'jslib/models/view/cipherView';
 import { AviraCsvImporter } from 'jslib/importers/aviraCsvImporter';
 import { BitwardenCsvImporter } from 'jslib/importers/bitwardenCsvImporter';
 import { BlurCsvImporter } from 'jslib/importers/blurCsvImporter';
+import { ChromeCsvImporter } from 'jslib/importers/chromeCsvImporter';
+import { FirefoxCsvImporter } from 'jslib/importers/firefoxCsvImporter';
 import { Importer } from 'jslib/importers/importer';
 import { KeePass2XmlImporter } from 'jslib/importers/keepass2XmlImporter';
 import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
 import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter';
+import { MeldiumCsvImporter } from 'jslib/importers/meldiumCsvImporter';
 import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
 import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
+import { SaferPassCsvImporter } from 'jslib/importers/saferpassCsvImport';
+import { UpmCsvImporter } from 'jslib/importers/upmCsvImporter';
 
 @Component({
     selector: 'app-import',
@@ -225,6 +230,18 @@ export class ImportComponent implements OnInit {
                 return new PadlockCsvImporter();
             case 'keepass2xml':
                 return new KeePass2XmlImporter();
+            case 'chromecsv':
+            case 'operacsv':
+            case 'vivaldicsv':
+                return new ChromeCsvImporter();
+            case 'firefoxcsv':
+                return new FirefoxCsvImporter();
+            case 'upmcsv':
+                return new UpmCsvImporter();
+            case 'saferpasscsv':
+                return new SaferPassCsvImporter();
+            case 'meldiumcsv':
+                return new MeldiumCsvImporter();
             default:
                 return null;
         }