From d1c55119c076e253f78c2240523aad107d3346e2 Mon Sep 17 00:00:00 2001
From: Jakub Lehotsky <jlehotsky@protonmail.com>
Date: Thu, 20 Sep 2018 13:36:56 +0200
Subject: [PATCH] Libraries imports

---
 armor/armor.go                |  4 ++--
 armor/constants.go            | 13 ++++++-------
 crypto/signature_collector.go |  1 +
 internal/common.go            |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/armor/armor.go b/armor/armor.go
index 73ace71..678f0dd 100644
--- a/armor/armor.go
+++ b/armor/armor.go
@@ -3,13 +3,13 @@ package armor
 import (
 	"bytes"
 	"errors"
+	"gitlab.com/ProtonMail/go-pm-crypto/internal"
+	"gitlab.com/ProtonMail/go-pm-crypto/models"
 	"golang.org/x/crypto/openpgp/armor"
 	"golang.org/x/crypto/openpgp/clearsign"
 	"golang.org/x/crypto/openpgp/packet"
 	"io"
 	"io/ioutil"
-	"proton/pmcrypto/internal"
-	"proton/pmcrypto/models"
 )
 
 // ArmorKey make bytes input key to armor format
diff --git a/armor/constants.go b/armor/constants.go
index c90ffbd..191d19b 100644
--- a/armor/constants.go
+++ b/armor/constants.go
@@ -1,14 +1,13 @@
 package armor
 
 import (
-	"proton/pmcrypto/internal"
+	"gitlab.com/ProtonMail/go-pm-crypto/internal"
 )
 
 const (
-	ARMOR_HEADER_VERSION = internal.ARMOR_HEADER_VERSION
-	ARMOR_HEADER_COMMENT = internal.ARMOR_HEADER_COMMENT
-	MESSAGE_HEADER      string = "PGP MESSAGE"
-	PUBLIC_KEY_HEADER  string = "PGP PUBLIC KEY BLOCK"
-	PRIVATE_KEY_HEADER  string = "PGP PRIVATE KEY BLOCK"
+	ARMOR_HEADER_VERSION        = internal.ARMOR_HEADER_VERSION
+	ARMOR_HEADER_COMMENT        = internal.ARMOR_HEADER_COMMENT
+	MESSAGE_HEADER       string = "PGP MESSAGE"
+	PUBLIC_KEY_HEADER    string = "PGP PUBLIC KEY BLOCK"
+	PRIVATE_KEY_HEADER   string = "PGP PRIVATE KEY BLOCK"
 )
-
diff --git a/crypto/signature_collector.go b/crypto/signature_collector.go
index 3af78b8..bd1d544 100644
--- a/crypto/signature_collector.go
+++ b/crypto/signature_collector.go
@@ -62,6 +62,7 @@ func (sc *SignatureCollector) Accept(part io.Reader, header textproto.MIMEHeader
 			if err != nil {
 				return
 			}
+			// TODO: Sunny proposed to move this also to pm-mime library
 			partData, _ := ioutil.ReadAll(multiparts[1])
 			decodedPart := pmmime.DecodeContentEncoding(bytes.NewReader(partData), multipartHeaders[1].Get("Content-Transfer-Encoding"))
 			buffer, err := ioutil.ReadAll(decodedPart)
diff --git a/internal/common.go b/internal/common.go
index 3d87c85..b949f1e 100644
--- a/internal/common.go
+++ b/internal/common.go
@@ -1,11 +1,10 @@
 package internal
 
 import (
+	"gitlab.com/ProtonMail/go-pm-crypto/constants"
 	"regexp"
-	"proton/pmcrypto/constants"
 )
 
-
 func TrimNewlines(input string) string {
 	var re = regexp.MustCompile(`(?m)[ \t]*$`)
 	return re.ReplaceAllString(input, "")
@@ -19,7 +18,8 @@ const (
 	ARMOR_HEADER_VERSION = "Pmcrypto Golang 0.0.1 (" + constants.VERSION + ")"
 	ARMOR_HEADER_COMMENT = "https://protonmail.com"
 )
-var ArmorHeaders = map[string]string {
+
+var ArmorHeaders = map[string]string{
 	"Version": ARMOR_HEADER_VERSION,
 	"Comment": ARMOR_HEADER_COMMENT,
 }