Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Settings -> OpenPGP to show available features

Browse source
This commit is contained in:
the-djmaze 2022-01-24 16:47:53 +01:00
parent ce971de919
commit 8635771537
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/Settings/User/OpenPgp.js
View file

@ -11,6 +11,9 @@ import { AddOpenPgpKeyPopupView } from 'View/Popup/AddOpenPgpKey';
import { NewOpenPgpKeyPopupView } from 'View/Popup/NewOpenPgpKey'; import { NewOpenPgpKeyPopupView } from 'View/Popup/NewOpenPgpKey';
import { ViewOpenPgpKeyPopupView } from 'View/Popup/ViewOpenPgpKey'; import { ViewOpenPgpKeyPopupView } from 'View/Popup/ViewOpenPgpKey';
import { Capa } from 'Common/Enums';
import { Settings } from 'Common/Globals';
export class OpenPgpUserSettings /*extends AbstractViewSettings*/ { export class OpenPgpUserSettings /*extends AbstractViewSettings*/ {
constructor() { constructor() {
this.gnupgkeys = PgpUserStore.gnupgKeys; this.gnupgkeys = PgpUserStore.gnupgKeys;
@ -19,8 +22,10 @@ export class OpenPgpUserSettings /*extends AbstractViewSettings*/ {
this.openpgpkeysPrivate = PgpUserStore.openpgpPrivateKeys; this.openpgpkeysPrivate = PgpUserStore.openpgpPrivateKeys;
this.openPgpKeyForDeletion = ko.observable(null).deleteAccessHelper(); this.openPgpKeyForDeletion = ko.observable(null).deleteAccessHelper();
this.canOpenPGP = !!PgpUserStore.openpgpKeyring; // this.canOpenPGP = !!PgpUserStore.openpgpKeyring;
// this.canOpenPGP = Settings.capa(Capa.OpenPGP); this.canOpenPGP = Settings.capa(Capa.OpenPGP);
// this.canGnuPG = !!PgpUserStore.gnupgKeyring;
this.canGnuPG = Settings.capa(Capa.GnuPG);
this.canMailvelope = !!window.mailvelope; this.canMailvelope = !!window.mailvelope;
this.allowDraftAutosave = SettingsUserStore.allowDraftAutosave; this.allowDraftAutosave = SettingsUserStore.allowDraftAutosave;

2
dev/Stores/User/Pgp.js
View file

@ -168,7 +168,7 @@ export const PgpUserStore = new class {
* @returns {boolean} * @returns {boolean}
*/ */
isSupported() { isSupported() {
return !!(window.openpgp || window.mailvelope); return !!(window.openpgp || window.mailvelope || Settings.capa(Capa.GnuPG));
} }
gnupgImportKey(key, callback) { gnupgImportKey(key, callback) {

12
snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
View file

@ -3,7 +3,7 @@
<i class="icon-list-add"></i> <i class="icon-list-add"></i>
<span data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span> <span data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span>
</button> </button>
<!-- ko if: canOpenPGP --> <!-- ko if: canOpenPGP || canGnuPG -->
&nbsp;&nbsp; &nbsp;&nbsp;
<div style="display: inline-block" data-i18n="[title]SETTINGS_OPEN_PGP/GENERATE_ONLY_HTTPS"> <div style="display: inline-block" data-i18n="[title]SETTINGS_OPEN_PGP/GENERATE_ONLY_HTTPS">
<button class="btn" data-bind="click: generateOpenPgpKey"> <button class="btn" data-bind="click: generateOpenPgpKey">
@ -26,7 +26,8 @@
</div> </div>
<br /> <br />
<h1>GnuPG</h1> <!-- ko if: canGnuPG -->
<div class="legend">GnuPG</div>
<table class="table table-hover list-table"> <table class="table table-hover list-table">
<tbody data-bind="foreach: gnupgkeys, i18nUpdate: gnupgkeys"> <tbody data-bind="foreach: gnupgkeys, i18nUpdate: gnupgkeys">
<tr class="open-pgp-key-item"> <tr class="open-pgp-key-item">
@ -42,8 +43,10 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /ko -->
<h1>OpenPGP.js</h1> <!-- ko if: canOpenPGP -->
<div class="legend">OpenPGP.js</div>
<table class="table table-hover list-table"> <table class="table table-hover list-table">
<tbody data-bind="foreach: openpgpkeysPrivate, i18nUpdate: openpgpkeysPrivate"> <tbody data-bind="foreach: openpgpkeysPrivate, i18nUpdate: openpgpkeysPrivate">
<tr class="open-pgp-key-item"> <tr class="open-pgp-key-item">
@ -83,8 +86,9 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /ko -->
<!-- ko if: canMailvelope --> <!-- ko if: canMailvelope -->
<h1>Mailvelope</h1> <div class="legend">Mailvelope</div>
<div id="mailvelope-settings" style="height:40em"></div> <div id="mailvelope-settings" style="height:40em"></div>
<!-- /ko --> <!-- /ko -->