From d274a83c242df8d4096c5bdc49421bf1eae64a22 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 17 Jul 2018 10:08:38 -0400
Subject: [PATCH] clipperz html 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 d677bad76a..4be7c6aa4c 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d677bad76a5e2d95691ffcf164e11094b1d01ee4
+Subproject commit 4be7c6aa4cf08171fecec26476a3ea045ada1124
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index dbc75e3d75..1cb1b4d1ee 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -103,6 +103,10 @@
             Using the True Key desktop application, click the gear icon (top right) and then navigate to "App Settings". Click the "Export"
             button, enter your password and save the CSV file.
         </ng-container>
+        <ng-container *ngIf="format === 'clipperzhtml'">
+            Log into the Clipperz web application (clipperz.is/app). Click the hamburger menu icon in the top right to expand the navigation
+            bar. Navigate to "Data" &rarr; "Export". Click the "download HTML+JSON" button to save the HTML 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 1b0c5e5f92..3c2510b43c 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -25,6 +25,7 @@ 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 { ClipperzHtmlImporter } from 'jslib/importers/clipperzHtmlImporter';
 import { DashlaneCsvImporter } from 'jslib/importers/dashlaneCsvImporter';
 import { EnpassCsvImporter } from 'jslib/importers/enpassCsvImporter';
 import { FirefoxCsvImporter } from 'jslib/importers/firefoxCsvImporter';
@@ -272,6 +273,8 @@ export class ImportComponent implements OnInit {
                 return new StickyPasswordXmlImporter();
             case 'truekeycsv':
                 return new TrueKeyCsvImporter();
+            case 'clipperzhtml':
+                return new ClipperzHtmlImporter();
             default:
                 return null;
         }