- Timestamp:
- 02/03/20 14:12:59 (4 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java
r1506 r1508 35 35 import org.expeditee.items.Line; 36 36 import org.expeditee.items.Text; 37 import org.expeditee.settings.UserSettings; 37 38 import org.expeditee.settings.identity.secrets.KeyList; 38 39 import org.expeditee.stats.SessionStats; … … 50 51 protected static final String TERMINATOR_WITH_CONTINUATION = TERMINATOR + "..."; 51 52 53 /** 54 * @return the labelnone 55 */ 56 public static String getLabelNone() { 57 return labelNone; 58 } 59 52 60 public EncryptedExpWriter(String encryptionLabel) { 53 61 label = encryptionLabel; … … 93 101 if (_writer == null) { return; } 94 102 103 if (UserSettings.UserName.get().equals(frame.getOwner())) { 104 updateHetrogeneousOwnerLabels(frame); 105 } 95 106 preOutputFrame(); 96 107 writeHeader(frame); … … 261 272 } 262 273 274 private void updateHetrogeneousOwnerLabels(Frame toUpdate) { 275 toUpdate.clearHetrogeneousFrameOwnerLabels(); 276 Text[] userLabels = KeyList.UserLabels.get(); 277 for (Text userLabel: userLabels) { 278 toUpdate.addToHetrogeneousFrameOwnerLabels(userLabel.getText()); 279 } 280 } 281 263 282 private static byte[] EncryptSymmetric(byte[] toEncrypt, SecretKey key) { 264 283 try { … … 276 295 } 277 296 } 278 279 /**280 * @return the labelnone281 */282 public static String getLabelNone() {283 return labelNone;284 }285 297 } -
trunk/src/org/expeditee/gui/AttributeUtils.java
r1506 r1508 213 213 Frame.class.getMethod("setEncryptionPermission", pEncPermission)); 214 214 _FrameAttrib.put("HetrogeneousEncryptionLabels", Frame.class.getMethod("getHetrogeneousFrameOwnerLabels"), 215 Frame.class.getMethod("addToHetrogeneousFrameOwnerLabels", pString));215 null); 216 216 217 217 // aliases for Standard frame attribute settings -
trunk/src/org/expeditee/gui/Frame.java
r1507 r1508 3008 3008 } 3009 3009 3010 public void setFrameEncryptionLabelOnLoad(String label) { 3011 _encryptionLabel = label; 3012 } 3013 3010 3014 public void setFrameEncryptionLabel(String label) { 3011 if (label == null ) {3012 _encryptionLabel = null;3015 if (label == null || label.equals(EncryptedExpWriter.getLabelNone())) { 3016 _encryptionLabel = label; 3013 3017 return; 3014 3018 } … … 3080 3084 } 3081 3085 3082 public void addToHetrogeneousFrameOwnerLabels(String label) { 3083 if (!UserSettings.UserName.get().equals(this.getOwner())) { 3084 MessageBay.displayMessage("Only the owner of a frame is able to add hetrogeneous owner encryption labels."); 3085 return; 3086 } 3087 3086 public void addToHetrogeneousFrameOwnerLabels(String label) { 3088 3087 if (_hetrogeneousEncryptionLabels == null) { 3089 3088 _hetrogeneousEncryptionLabels = new ArrayList<String>(); … … 3094 3093 _hetrogeneousEncryptionLabels.add(label); 3095 3094 } 3095 } 3096 3097 public void clearHetrogeneousFrameOwnerLabels() { 3098 if (_hetrogeneousEncryptionLabels != null) { 3099 _hetrogeneousEncryptionLabels.clear(); 3100 } 3101 } 3102 3103 public void setHomogeneousEncryptionLabelOnLoad(String label) { 3104 this.setChanged(true); 3105 _homogeneousEncryptionLabel = label; 3096 3106 } 3097 3107 … … 3145 3155 if (getGroupFrame() != null) { 3146 3156 Collection<Text> textItems = getGroupFrame().getTextItems(); 3157 String membersTag = "@members: "; 3147 3158 Stream<Text> memberLists = textItems.stream().filter(t -> 3148 3159 t.getText().toLowerCase().startsWith("@owner: ") || 3149 t.getText().toLowerCase().startsWith( "@members: "));3160 t.getText().toLowerCase().startsWith(membersTag)); 3150 3161 for(Text t: memberLists.collect(Collectors.toList())) { 3151 3162 if (t.getText().toLowerCase().startsWith("@owner: ")) { 3152 3163 members.add(t.getText().substring(8)); 3153 } else if (t.getText().toLowerCase().startsWith("@members: ")) { 3154 //10 3155 String[] split = t.getText().substring(10).split(","); 3164 } else if (t.getText().toLowerCase().startsWith(membersTag)) { 3165 String[] split = t.getText().substring(membersTag.length()).split(","); 3156 3166 for (String m: split) { 3157 3167 members.add(m.trim()); -
trunk/src/org/expeditee/gui/FrameUtils.java
r1504 r1508 499 499 groupFrame = toDisplay.getGroupFrame(); 500 500 if (groupFrame == null) { 501 MessageBay.displayMessage("WARNING: There is no corrosponding " + group + "1 for the specified group " + group + ". Group permissions will not apply."); 501 String msg = "This frame specifies the group " + group + " of which you are not a member."; 502 MessageBay.displayMessage(msg); 502 503 } 503 504 } -
trunk/src/org/expeditee/io/DefaultFrameReader.java
r1506 r1508 100 100 101 101 // Encryption frame tags 102 _FrameTags.put('K', Frame.class.getMethod("setFrameEncryptionLabel ", pString));102 _FrameTags.put('K', Frame.class.getMethod("setFrameEncryptionLabelOnLoad", pString)); 103 103 _FrameTags.put('E', Frame.class.getMethod("setFrameEncryptionPermission", pEncPermission)); 104 _FrameTags.put('k', Frame.class.getMethod("setHomogeneousEncryptionLabel ", pString));104 _FrameTags.put('k', Frame.class.getMethod("setHomogeneousEncryptionLabelOnLoad", pString)); 105 105 _FrameTags.put('e', Frame.class.getMethod("setEncryptionPermission", pEncPermission)); 106 106 _FrameTags.put('a', Frame.class.getMethod("addToHetrogeneousFrameOwnerLabels", pString));
Note:
See TracChangeset
for help on using the changeset viewer.