Changeset 1390 for trunk

Timestamp:

05/28/19 13:47:52 (5 years ago)

Author:

bln4

Message:

Added setting for the default encryption permission. When not specifying the group or other levels of permission (eg EncPermission: 4) then you get the default.

Location:

trunk/src/org/expeditee

Files:

• encryption/items/EncryptionPermissionTriple.java (modified) (2 diffs)
• settings/encryption (added)
• settings/encryption/EncryptionDefaults.java (added)

trunk/src/org/expeditee/encryption/items/EncryptionPermissionTriple.java

@@ -4 +4 @@
 
 import org.expeditee.settings.UserSettings;
+import org.expeditee.settings.encryption.EncryptionDefaults;
 
 public class EncryptionPermissionTriple {
@@ -64 +65 @@
         
         public static EncryptionPermissionTriple convertString(String permissionCode) {
-                return new EncryptionPermissionTriple(permissionCode, UserAppliedEncryptionPermission.none);
+                UserAppliedEncryptionPermission defaultPermission = UserAppliedEncryptionPermission.values()[EncryptionDefaults.DefaultEncryptionPermission.get()];
+                return new EncryptionPermissionTriple(permissionCode, defaultPermission);
         }