Changeset 1387 for trunk

Timestamp:

05/28/19 11:15:25 (5 years ago)

Author:

bln4

Message:

When sharing contact details. If we can detect that the recipient is present on the same filesystem as the sender (due to the presence of a resources-recipient directory) then instead of providing directions, just copy the credentials-sender directory.

Location:

trunk/src/org/expeditee/auth

Files:

• Actions.java (modified) (4 diffs)
• account/Contacts.java (added)

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

@@ -1 +1 @@
 package org.expeditee.auth;
 
-import java.awt.Desktop;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -44 +40 @@
 import org.expeditee.auth.account.Authenticate;
 import org.expeditee.auth.account.Authenticate.AuthenticationResult;
+import org.expeditee.auth.account.Contacts;
 import org.expeditee.auth.account.Create;
 import org.expeditee.auth.account.Create.CreateResult;
@@ -208 +205 @@
         }
         public static String AuthDistributeContactDetails(String username) {
-                StringBuilder sb = new StringBuilder();
-                String nl = System.getProperty("line.separator");
-                String me = UserSettings.UserName.get();
-                Path profilePath = Paths.get(FrameIO.PROFILE_PATH).resolve(me);
-                try {
-                        Desktop.getDesktop().open(profilePath.toFile());
-                        sb.append("1. We have opened your profile directory for you.  Tab to it and right click on the " + me + "-credentials directory." + nl);
-                } catch (IOException e) {
-                        sb.append("1. Open your profile directory (" + profilePath + ") and right click on the " + me + "-credentials directory." + nl);
-                }
-                
-                sb.append("2. Click on 'Share with Google Drive'." + nl);
-                sb.append("3. Enter " + username + "'s in the text box." + nl);
-                sb.append("4. Click on the button to the right of the text box in order to set the share to 'View Only'." + nl);
-                sb.append("5. Optionally add a note for " + username + " to read.  Click the send button.");
-                
-                return sb.toString();
+                return Contacts.distributeContactDetails(username);
         }
         public static void AuthAddContactDetails() {
@@ -230 +211 @@
         }
         public static String AuthAddContactDetails(String username) {
-                StringBuilder sb = new StringBuilder();
-                String nl = System.getProperty("line.separator");
-                String me = UserSettings.UserName.get();
-                String driveSharedWithMeString = "https://drive.google.com/drive/shared-with-me";
-                try {
-                        URI driveSharedWithMeURL = new URL(driveSharedWithMeString).toURI();
-                        Desktop.getDesktop().browse(driveSharedWithMeURL);
-                        sb.append("1. We have opened Google Drive to the 'Shared With Me' page in your browser.  Right click on " + username + "-credentials and click on 'Add To My Drive'." + nl);
-                } catch (IOException | URISyntaxException e) {
-                        sb.append("1. Open your web browser to " + driveSharedWithMeString + ".  Right click on " + username + "-credentials and click on 'Add To My Drive'." + nl);
-                }
-                
-                sb.append("2. Click organise and navigate the dialog to resources-" + me + "/contacts and click the 'Move Here' button to relocate your copy of " + username + "'s credentials folder.");
-                
-                return sb.toString();
+                return Contacts.addContactDetails(username);
         }
         //      End Making Contacts Actions