From 1cd3762b0d7707f4dd665c00ff4d83db6172b4a7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 25 May 2015 12:51:33 -0400
Subject: [PATCH] Start integrating the Mailvelope browser extension via its API.
---
program/js/app.js | 261 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 246 insertions(+), 15 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index c11ae77..4cb6153 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -376,6 +376,8 @@
this.http_post(postact, postdata);
}
+ this.check_mailvelope(this.env.action);
+
// detect browser capabilities
if (!this.is_framed() && !this.env.extwin)
this.browser_capabilities_check();
@@ -3255,6 +3257,227 @@
this.set_alttext('delete', label);
};
+ // Initialize input element for list page jump
+ this.init_pagejumper = function(element)
+ {
+ $(element).addClass('rcpagejumper')
+ .on('focus', function(e) {
+ // create and display popup with page selection
+ var i, html = '';
+
+ for (i = 1; i <= ref.env.pagecount; i++)
+ html += '<li>' + i + '</li>';
+
+ html = '<ul class="toolbarmenu">' + html + '</ul>';
+
+ if (!ref.pagejump) {
+ ref.pagejump = $('<div id="pagejump-selector" class="popupmenu"></div>')
+ .appendTo(document.body)
+ .on('click', 'li', function() {
+ if (!ref.busy)
+ $(element).val($(this).text()).change();
+ });
+ }
+
+ if (ref.pagejump.data('count') != i)
+ ref.pagejump.html(html);
+
+ ref.pagejump.attr('rel', '#' + this.id).data('count', i);
+
+ // display page selector
+ ref.show_menu('pagejump-selector', true, e);
+ $(this).keydown();
+ })
+ // keyboard navigation
+ .on('keydown keyup click', function(e) {
+ var current, selector = $('#pagejump-selector'),
+ ul = $('ul', selector),
+ list = $('li', ul),
+ height = ul.height(),
+ p = parseInt(this.value);
+
+ if (e.which != 27 && e.which != 9 && e.which != 13 && !selector.is(':visible'))
+ return ref.show_menu('pagejump-selector', true, e);
+
+ if (e.type == 'keydown') {
+ // arrow-down
+ if (e.which == 40) {
+ if (list.length > p)
+ this.value = (p += 1);
+ }
+ // arrow-up
+ else if (e.which == 38) {
+ if (p > 1 && list.length > p - 1)
+ this.value = (p -= 1);
+ }
+ // enter
+ else if (e.which == 13) {
+ return $(this).change();
+ }
+ // esc, tab
+ else if (e.which == 27 || e.which == 9) {
+ return $(element).val(ref.env.current_page);
+ }
+ }
+
+ $('li.selected', ul).removeClass('selected');
+
+ if ((current = $(list[p - 1])).length) {
+ current.addClass('selected');
+ $('#pagejump-selector').scrollTop(((ul.height() / list.length) * (p - 1)) - selector.height() / 2);
+ }
+ })
+ .on('change', function(e) {
+ // go to specified page
+ var p = parseInt(this.value);
+ if (p && p != ref.env.current_page && !ref.busy) {
+ ref.hide_menu('pagejump-selector');
+ ref.list_page(p);
+ }
+ });
+ };
+
+ // Update page-jumper state on list updates
+ this.update_pagejumper = function()
+ {
+ $('input.rcpagejumper').val(this.env.current_page).prop('disabled', this.env.pagecount < 2);
+ };
+
+ // check for mailvelope API
+ this.check_mailvelope = function(action)
+ {
+ if (typeof window.mailvelope !== 'undefined') {
+ this.mailvelope_init(action);
+ }
+ else {
+ $(window).on('mailvelope', function() {
+ ref.mailvelope_init(action);
+ });
+ }
+ };
+
+ //
+ this.mailvelope_init = function(action)
+ {
+ if (this.env.browser_capabilities)
+ this.env.browser_capabilities['pgpmime'] = 1;
+
+ var keyring = this.get_local_storage_prefix();
+
+ mailvelope.getKeyring(keyring).then(function(kr) {
+ ref.mailvelope_keyring = kr;
+ }, function(err) {
+ // attempt to create a new keyring for this app/user
+ mailvelope.createKeyring(keyring).then(function(kr) {
+ ref.mailvelope_keyring = kr;
+ keyring = keyring.identifier;
+ }, function(err) {
+ console.error(err)
+ });
+ });
+
+ if (action == 'show' || action == 'preview') {
+ // decrypt text body
+ if (this.env.is_pgp_content && window.mailvelope) {
+ var data = $(this.env.is_pgp_content).text();
+ ref.mailvelope_display_container(this.env.is_pgp_content, data, keyring);
+ }
+ // load pgp/mime message and pass it to the mailvelope display container
+ else if (this.env.pgp_mime_part && window.mailvelope) {
+ var msgid = this.display_message(this.get_label('loadingdata'), 'loading'),
+ selector = this.env.pgp_mime_container;
+
+ $.ajax({
+ type: 'GET',
+ url: this.url('get', { '_mbox': this.env.mailbox, '_uid': this.env.uid, '_part': this.env.pgp_mime_part }),
+ error: function(o, status, err) {
+ ref.hide_message(msgkey);
+ ref.http_error(o, status, err, lock);
+ },
+ success: function(data) {
+ ref.mailvelope_display_container(selector, data, keyring, msgid);
+ }
+ });
+ }
+ }
+ else if (action == 'compose' && window.mailvelope) {
+ this.enable_command('compose-encrypted', true);
+ }
+ };
+
+ // handler for the 'compose-encrypt' command
+ this.compose_encrypted = function(props)
+ {
+ var container = $('#' + this.env.composebody).parent();
+ mailvelope.createEditorContainer('#' + container.attr('id'), keyring).then(function(editor) {
+ ref.mailvelope_editor = editor;
+ container.addClass('mailvelope');
+ $('#' + ref.env.composebody).hide();
+ });
+ };
+
+ // callback to replace the message body with the full armored
+ this.mailvelope_submit_messageform = function(draft, saveonly)
+ {
+ // get recipients
+ var recipients = [];
+ $.each(['to', 'cc', 'bcc'], function(i,field) {
+ var pos, rcpt, val = $.trim($('[name="_' + field + '"]').val());
+ while (val.length && rcube_check_email(val, true)) {
+ rcpt = RegExp.$2
+ recipients.push(rcpt);
+ val = val.substr(val.indexOf(rcpt) + rcpt.length + 1).replace(/^\s*,\s*/, '');
+ console.log('*', val)
+ }
+ });
+
+ // check if we have keys for all recipients
+ var isvalid = recipients.length > 0;
+ ref.mailvelope_keyring.validKeyForAddress(recipients).then(function(status) {
+ $.each(status, function(k,v) {
+ console.log('validate', k, v)
+ if (!v) {
+ isvalid = false;
+ alert("No key found for "+k)
+ }
+ });
+
+ if (!isvalid) {
+ if (!recipients.length)
+ alert(ref.get_label('norecipientwarning'));
+ return false;
+ }
+
+ ref.mailvelope_editor.encrypt(recipients).then(function(armored) {
+ console.log('encrypted message', armored);
+ var form = this.gui_objects.messageform;
+
+ // all checks passed, send message
+ // var msgid = ref.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage')
+
+ }, function(err) {
+ console.log(err)
+ });
+ });
+
+ return false;
+ };
+
+ // wrapper for the mailvelope.createDisplayContainer API call
+ this.mailvelope_display_container = function(selector, data, keyring, msgid)
+ {
+ mailvelope.createDisplayContainer(selector, data, keyring, {}).then(function() {
+ $(selector).addClass('mailvelope').find('.message-part, .part-notice').hide();
+ ref.hide_message(msgid);
+ setTimeout(function() { $(window).resize(); }, 10);
+ }, function(err) {
+ console.error(err)
+ ref.hide_message(msgid);
+ ref.display_message('Message decryption failed: ' + err.message, 'error')
+ });
+ };
+
+
/*********************************************************/
/********* mailbox folders methods *********/
/*********************************************************/
@@ -3524,6 +3747,10 @@
}
}]
);
+ }
+
+ if (this.mailvelope_editor) {
+ return this.mailvelope_submit_messageform(draft, saveonly);
}
// all checks passed, send message
@@ -6673,6 +6900,8 @@
{
this.enable_command('nextpage', 'lastpage', this.env.pagecount > this.env.current_page);
this.enable_command('previouspage', 'firstpage', this.env.current_page > 1);
+
+ this.update_pagejumper();
};
// mark a mailbox as selected and set environment variable
@@ -7500,34 +7729,36 @@
this.env.qsearch = null;
case 'list':
if (this.task == 'mail') {
- var is_multifolder = this.is_multifolder_listing();
+ var is_multifolder = this.is_multifolder_listing(),
+ list = this.message_list,
+ uid = this.env.list_uid;
+
this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
this.enable_command('expunge', this.env.exists && !is_multifolder);
this.enable_command('purge', this.purge_mailbox_test() && !is_multifolder);
this.enable_command('import-messages', !is_multifolder);
this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);
- if (this.message_list) {
- var list = this.message_list, uid = this.env.list_uid;
-
- // highlight message row when we're back from message page
- if (uid) {
- if (!list.rows[uid])
- uid += '-' + this.env.mailbox;
- if (list.rows[uid]) {
- list.select(uid);
- }
- delete this.env.list_uid;
- }
-
+ if (list) {
if (response.action == 'list' || response.action == 'search') {
+ // highlight message row when we're back from message page
+ if (uid) {
+ if (!list.rows[uid])
+ uid += '-' + this.env.mailbox;
+ if (list.rows[uid]) {
+ list.select(uid);
+ }
+ delete this.env.list_uid;
+ }
+
this.enable_command('set-listmode', this.env.threads && !is_multifolder);
if (list.rowcount > 0)
list.focus();
this.msglist_select(list);
}
- this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:list.rowcount });
+ if (response.action != 'getunread')
+ this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:list.rowcount });
}
}
else if (this.task == 'addressbook') {
--
Gitblit v1.9.1