Changeset 1243 for trunk/src/org/expeditee/auth/EncryptedExpReader.java

Timestamp:

03/15/19 16:51:32 (5 years ago)

Author:

bln4

Message:

Alterations to how mail works to work better in a cloud environment.
General code tidying and updating to work with larger changes happening to Expeditee.

File:

• trunk/src/org/expeditee/auth/EncryptedExpReader.java (modified) (4 diffs)

trunk/src/org/expeditee/auth/EncryptedExpReader.java

@@ -23 +23 @@
 import org.expeditee.io.ExpReader;
 import org.expeditee.items.Text;
-import org.expeditee.settings.auth.secrets.KeyList;
+import org.expeditee.settings.identity.secrets.KeyList;
 import org.ngikm.cryptography.CryptographyConstants;
 
@@ -31 +31 @@
         static final String ENCRYPTED_EXP_FLAG = "EncryptedExp";
         private SecretKey personalKey;
-        //private List<SecretKey> multiKey;
         private boolean accessDenied = false;
-        //private boolean usePersonalKey;
 
         public EncryptedExpReader(final String frameName) throws UnsupportedEncodingException {
@@ -49 +47 @@
                 try {
                         BufferedReader reader = new EncryptedLineReader(new BufferedReader(new FileReader(fullpath)));
-                        //if (usePersonalKey) {
-                        //      reader = new EncryptedProfileLineReader(new BufferedReader(new FileReader(fullpath)));
-                        //} else {
-                        //      reader = new EncryptedLineReader(new BufferedReader(new FileReader(fullpath)));
-                        //}
                         String next = "";
                         // First read the header lines until we get the version number
@@ -76 +69 @@
                 Reader in = new InputStreamReader(new FileInputStream(fullPath), "UTF-8");
                 return readFrame(new EncryptedLineReader(in));
-                //if (usePersonalKey) {
-                //      return readFrame(new EncryptedProfileLineReader(new BufferedReader(in)));
-                //} else {
-                //      return readFrame(new EncryptedLineReader(new BufferedReader(in)));
-                //}
         }