Update openpgpjs library

Small changes

dev/Models/MessageModel.js

@@ -19,8 +19,12 @@ function MessageModel()
 	this.proxy = false;
 
 	this.fromEmailString = ko.observable('');
+	this.fromClearEmailString = ko.observable('');
 	this.toEmailsString = ko.observable('');
+	this.toClearEmailsString = ko.observable('');
+
 	this.senderEmailsString = ko.observable('');
+	this.senderClearEmailsString = ko.observable('');
 
 	this.emails = [];
 
@@ -165,10 +169,37 @@ MessageModel.emailsToLine = function (aEmail, bFriendlyView, bWrapWithLink)
 	return aResult.join(', ');
 };
 
+/**
+ * @static
+ * @param {Array} aEmail
+ * @return {string}
+ */
+MessageModel.emailsToLineClear = function (aEmail)
+{
+	var
+		aResult = [],
+		iIndex = 0,
+		iLen = 0
+	;
+
+	if (Utils.isNonEmptyArray(aEmail))
+	{
+		for (iIndex = 0, iLen = aEmail.length; iIndex < iLen; iIndex++)
+		{
+			if (aEmail[iIndex] && aEmail[iIndex].email && '' !== aEmail[iIndex].name)
+			{
+				aResult.push(aEmail[iIndex].email);
+			}
+		}
+	}
+
+	return aResult.join(', ');
+};
+
 /**
  * @static
  * @param {?Array} aJsonEmails
- * @return {Array}
+ * @return {Array.<EmailModel>}
  */
 MessageModel.initEmailsFromJson = function (aJsonEmails)
 {
@@ -236,8 +267,11 @@ MessageModel.prototype.clear = function ()
 	this.proxy = false;
 
 	this.fromEmailString('');
+	this.fromClearEmailString('');
 	this.toEmailsString('');
+	this.toClearEmailsString('');
 	this.senderEmailsString('');
+	this.senderClearEmailsString('');
 
 	this.emails = [];
 
@@ -298,6 +332,9 @@ MessageModel.prototype.computeSenderEmail = function ()
 
 	this.senderEmailsString(this.folderFullNameRaw === sSent || this.folderFullNameRaw === sDraft ?
 		this.toEmailsString() : this.fromEmailString());
+
+	this.senderClearEmailsString(this.folderFullNameRaw === sSent || this.folderFullNameRaw === sDraft ?
+		this.toClearEmailsString() : this.fromClearEmailString());
 };
 
 /**
@@ -342,7 +379,9 @@ MessageModel.prototype.initByJson = function (oJsonMessage)
 		this.attachmentsMainType(oJsonMessage.AttachmentsMainType);
 
 		this.fromEmailString(MessageModel.emailsToLine(this.from, true));
+		this.fromClearEmailString(MessageModel.emailsToLineClear(this.from));
 		this.toEmailsString(MessageModel.emailsToLine(this.to, true));
+		this.toClearEmailsString(MessageModel.emailsToLineClear(this.to));
 
 		this.parentUid(Utils.pInt(oJsonMessage.ParentThread));
 		this.threads(Utils.isArray(oJsonMessage.Threads) ? oJsonMessage.Threads : []);
@@ -830,7 +869,9 @@ MessageModel.prototype.populateByMessageListItem = function (oMessage)
 	this.proxy = oMessage.proxy;
 
 	this.fromEmailString(oMessage.fromEmailString());
+	this.fromClearEmailString(oMessage.fromClearEmailString());
 	this.toEmailsString(oMessage.toEmailsString());
+	this.toClearEmailsString(oMessage.toClearEmailsString());
 
 	this.emails = oMessage.emails;
 

dev/ViewModels/Popups/PopupsGenerateNewOpenPgpKeyViewModel.js

@@ -46,13 +46,12 @@ function PopupsGenerateNewOpenPgpKeyViewModel()
 		this.submitRequest(true);
 
 		_.delay(function () {
-			mKeyPair = window.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
-//			0.6.0
-//			mKeyPair = window.openpgp.generateKeyPair({
-//				'numBits': Utils.pInt(self.keyBitLength()),
-//				'userId': sUserID,
-//				'passphrase': Utils.trim(self.password())
-//			});
+//			mKeyPair = window.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
+			mKeyPair = window.openpgp.generateKeyPair({
+				'userId': sUserID,
+				'numBits': Utils.pInt(self.keyBitLength()),
+				'passphrase': Utils.trim(self.password())
+			});
 			
 			if (mKeyPair && mKeyPair.privateKeyArmored)
 			{

gulpfile.js

@@ -115,7 +115,7 @@ cfg.paths.js = {
 	openpgp: {
 		name: 'openpgp.min.js',
 		src: [
-			'vendors/openpgp/openpgp-0.5.1.min.js'
+			'vendors/openpgp/openpgp-0.7.2.min.js'
 		]
 	},
 	encrypt: {

rainloop/v/0.0.0/app/templates/Views/App/MailMessageListItem.html

@@ -28,7 +28,7 @@
 			</span>
 			<span class="replyFlag"><i class="icon-reply"></i>&nbsp;</span>
 			<span class="forwardFlag"><i class="icon-forward"></i>&nbsp;</span>
-			<span class="sender" data-bind="text: senderEmailsString"></span>
+			<span class="sender" data-bind="text: senderEmailsString, attr: {'title': senderClearEmailsString}"></span>
 			&nbsp;
 		</div>
 		<div class="attachmentParent actionHandle dragHandle">

rainloop/v/0.0.0/static/js/app.js

@@ -6910,8 +6910,12 @@ function MessageModel()
 	this.proxy = false;
 
 	this.fromEmailString = ko.observable('');
+	this.fromClearEmailString = ko.observable('');
 	this.toEmailsString = ko.observable('');
+	this.toClearEmailsString = ko.observable('');
+
 	this.senderEmailsString = ko.observable('');
+	this.senderClearEmailsString = ko.observable('');
 
 	this.emails = [];
 
@@ -7056,10 +7060,37 @@ MessageModel.emailsToLine = function (aEmail, bFriendlyView, bWrapWithLink)
 	return aResult.join(', ');
 };
 
+/**
+ * @static
+ * @param {Array} aEmail
+ * @return {string}
+ */
+MessageModel.emailsToLineClear = function (aEmail)
+{
+	var
+		aResult = [],
+		iIndex = 0,
+		iLen = 0
+	;
+
+	if (Utils.isNonEmptyArray(aEmail))
+	{
+		for (iIndex = 0, iLen = aEmail.length; iIndex < iLen; iIndex++)
+		{
+			if (aEmail[iIndex] && aEmail[iIndex].email && '' !== aEmail[iIndex].name)
+			{
+				aResult.push(aEmail[iIndex].email);
+			}
+		}
+	}
+
+	return aResult.join(', ');
+};
+
 /**
  * @static
  * @param {?Array} aJsonEmails
- * @return {Array}
+ * @return {Array.<EmailModel>}
  */
 MessageModel.initEmailsFromJson = function (aJsonEmails)
 {
@@ -7127,8 +7158,11 @@ MessageModel.prototype.clear = function ()
 	this.proxy = false;
 
 	this.fromEmailString('');
+	this.fromClearEmailString('');
 	this.toEmailsString('');
+	this.toClearEmailsString('');
 	this.senderEmailsString('');
+	this.senderClearEmailsString('');
 
 	this.emails = [];
 
@@ -7189,6 +7223,9 @@ MessageModel.prototype.computeSenderEmail = function ()
 
 	this.senderEmailsString(this.folderFullNameRaw === sSent || this.folderFullNameRaw === sDraft ?
 		this.toEmailsString() : this.fromEmailString());
+
+	this.senderClearEmailsString(this.folderFullNameRaw === sSent || this.folderFullNameRaw === sDraft ?
+		this.toClearEmailsString() : this.fromClearEmailString());
 };
 
 /**
@@ -7233,7 +7270,9 @@ MessageModel.prototype.initByJson = function (oJsonMessage)
 		this.attachmentsMainType(oJsonMessage.AttachmentsMainType);
 
 		this.fromEmailString(MessageModel.emailsToLine(this.from, true));
+		this.fromClearEmailString(MessageModel.emailsToLineClear(this.from));
 		this.toEmailsString(MessageModel.emailsToLine(this.to, true));
+		this.toClearEmailsString(MessageModel.emailsToLineClear(this.to));
 
 		this.parentUid(Utils.pInt(oJsonMessage.ParentThread));
 		this.threads(Utils.isArray(oJsonMessage.Threads) ? oJsonMessage.Threads : []);
@@ -7721,7 +7760,9 @@ MessageModel.prototype.populateByMessageListItem = function (oMessage)
 	this.proxy = oMessage.proxy;
 
 	this.fromEmailString(oMessage.fromEmailString());
+	this.fromClearEmailString(oMessage.fromClearEmailString());
 	this.toEmailsString(oMessage.toEmailsString());
+	this.toClearEmailsString(oMessage.toClearEmailsString());
 
 	this.emails = oMessage.emails;
 
@@ -11847,13 +11888,12 @@ function PopupsGenerateNewOpenPgpKeyViewModel()
 		this.submitRequest(true);
 
 		_.delay(function () {
-			mKeyPair = window.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
-//			0.6.0
-//			mKeyPair = window.openpgp.generateKeyPair({
-//				'numBits': Utils.pInt(self.keyBitLength()),
-//				'userId': sUserID,
-//				'passphrase': Utils.trim(self.password())
-//			});
+//			mKeyPair = window.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
+			mKeyPair = window.openpgp.generateKeyPair({
+				'userId': sUserID,
+				'numBits': Utils.pInt(self.keyBitLength()),
+				'passphrase': Utils.trim(self.password())
+			});
 			
 			if (mKeyPair && mKeyPair.privateKeyArmored)
 			{