From 183f5fea5c6d1c1f1f60ff4fd30c10d3ebc22de4 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 23 Jul 2018 11:23:23 -0400
Subject: [PATCH] splash id importer

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

diff --git a/jslib b/jslib
index 790e50f2b6..06682e2672 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 790e50f2b68b2ed956533f46ded6b393a5dd96b5
+Subproject commit 06682e267259dcc4ddbf813550451ea620ad9b98
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 1250163eac..045bac46c2 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -132,6 +132,10 @@
             and paste the data. Save the data from the text editor as
             <code>zoho_export.csv</code>.
         </ng-container>
+        <ng-container *ngIf="format === 'splashidcsv'">
+            Using the SplashID Safe desktop application, click on the SplashID blue lock logo in the top right corner. Navigate to "Export"
+            &rarr; "Export as CSV" and save the 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 355419220a..460b8105f3 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -46,6 +46,7 @@ import { PasswordSafeXmlImporter } from 'jslib/importers/passwordSafeXmlImporter
 import { RoboFormCsvImporter } from 'jslib/importers/roboformCsvImporter';
 import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
 import { SaferPassCsvImporter } from 'jslib/importers/saferpassCsvImport';
+import { SplashIdCsvImporter } from 'jslib/importers/splashIdCsvImporter';
 import { StickyPasswordXmlImporter } from 'jslib/importers/stickyPasswordXmlImporter';
 import { TrueKeyCsvImporter } from 'jslib/importers/truekeyCsvImporter';
 import { UpmCsvImporter } from 'jslib/importers/upmCsvImporter';
@@ -289,6 +290,8 @@ export class ImportComponent implements OnInit {
                 return new PasswordBossJsonImporter();
             case 'zohovaultcsv':
                 return new ZohoVaultCsvImporter();
+            case 'splashidcsv':
+                return new SplashIdCsvImporter();
             default:
                 return null;
         }