Added option to attach key to email in Security Settings

mailpile · Oct 19, 2014 · 9215380 · 9215380
1 parent 3313958
commit 9215380
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/static/default/html/jsapi/setup/security.js b/static/default/html/jsapi/setup/security.js
@@ -14,7 +14,8 @@ var SecurityModel = Backbone.Model.extend({
       'encrypt_misc': true,
       'encrypt_vcards': true,
       'index_encrypted': true,
-      'obfuscate_index': true
+      'obfuscate_index': true,
+      'gpg_email_key': false
     },
     paranoid: {
       'encrypt_events': true,
@@ -23,7 +24,8 @@ var SecurityModel = Backbone.Model.extend({
       'encrypt_misc': true,
       'encrypt_vcards': true,
       'index_encrypted': false,
-      'obfuscate_index': true
+      'obfuscate_index': true,
+      'gpg_email_key': true
     },
     above: {
       'encrypt_events': false,
@@ -32,7 +34,8 @@ var SecurityModel = Backbone.Model.extend({
       'encrypt_misc': true,
       'encrypt_vcards': true,
       'index_encrypted': false,
-      'obfuscate_index': true
+      'obfuscate_index': true,
+      'gpg_email_key': true
     },
     concerned: {
       'encrypt_events': false,
@@ -41,7 +44,8 @@ var SecurityModel = Backbone.Model.extend({
       'encrypt_misc': true,
       'encrypt_vcards': true,
       'index_encrypted': false,
-      'obfuscate_index': true
+      'obfuscate_index': true,
+      'gpg_email_key': true
     },
     normal: {
       'encrypt_events': false,
@@ -50,7 +54,8 @@ var SecurityModel = Backbone.Model.extend({
       'encrypt_misc': false,
       'encrypt_vcards': false,
       'index_encrypted': false,
-      'obfuscate_index': true
+      'obfuscate_index': true,
+      'gpg_email_key': true
     }
   }
 });

diff --git a/static/default/html/setup/security.html b/static/default/html/setup/security.html
@@ -39,6 +39,13 @@ <h2 class="text-center"><span class="icon-privacy"></span> {{_("Security Setting
         <input type="checkbox" name="encrypt_misc" <% if (encrypt_misc) { %>checked value="true"<% } %>>
         {{_("Encrypt various other things")}}
       </label>
+    </fieldset>
+    <fieldset>
+      <h4 class="half-bottom">{{_("Encryption Keys")}}</h4>
+      <label>
+        <input type="checkbox" name="gpg_email_key">
+        Attach public key to outgoing emails
+      </label>
 <!-- FIXME: Commented out settings not supported by backend 
       <label>
         <input type="checkbox" name="use_tor" checked="">
@@ -48,10 +55,6 @@ <h2 class="text-center"><span class="icon-privacy"></span> {{_("Security Setting
         <input type="checkbox" name="upload_keyservers">
         Upload your public encryption key to keyservers for better discovery
       </label>
-      <label>
-        <input type="checkbox" name="email_key">
-        Attach public key to outgoing emails
-      </label>
       <label>
         <input type="checkbox" name="use_gravatar">
         Download contact pictures via Gravatar (over HTTPS)