Changeset 1385

Timestamp:

05/27/19 16:12:05 (5 years ago)

Author:

bln4

Message:

Added further instructions for adding contact information from another user.

Location:

trunk/src/org/expeditee

Files:

• assets/resources-public/framesets/multiuser/1.exp (modified) (17 diffs)
• auth/Actions.java (modified) (2 diffs)

trunk/src/org/expeditee/assets/resources-public/framesets/multiuser/1.exp

@@ -1 @@
-V 175
+V 192
 U authadmin
 D 04Jan2019[10:48]
-M authadmin
-d 23May2019[14:55]
+M bryce
+d 27May2019[16:05]
 B 100 100 39 100
 Z
@@ -19 +19 @@
 h 0.0
 p 40
+_sl F
 
 S T 32
@@ -33 +34 @@
 h -1.0
 p 40
+_sl F
 
 S T 38
@@ -47 +49 @@
 h -1.0
 p 40
+_sl F
 
 S T 64
@@ -61 +64 @@
 h -1.0
 p 40
+_sl F
 
 S T 57
@@ -74 +78 @@
 h -1.0
 p 40
+_sl F
 
 S T 1277
@@ -91 +96 @@
 h 1.0
 p 40
+_sl F
 
 S T 1252
@@ -108 +114 @@
 h 1.0
 p 40
+_sl F
 
 S T 1307
@@ -121 +128 @@
 h 0.0
 p 40
+_sl F
 
 S T 614
@@ -141 +149 @@
 h 1.0
 p 41
+_sl F
 
 S T 1124
@@ -161 +170 @@
 h 1.0
 p 41
+_sl F
 
 S T 519
@@ -180 +190 @@
 h 1.0
 p 41
+_sl F
 
 S T 643
@@ -200 +211 @@
 h 1.0
 p 41
+_sl F
 
 S T 1219
@@ -207 +219 @@
 K 0 0 0 100
 P 246 452
-T      Make Contact
-x F
-o authadmin
-n F
-v S
-f tr25
-t -1.0
-b 0.0
-m 0.0
-M 200
-h 1.0
-p 41
+T     Distribute My
+T    Contact Details
+X AuthDistributeContactDetails
+x F
+o authadmin
+n F
+v S
+f tr25
+t -1.0
+b 0.0
+m 0.0
+w 200
+M 200
+h 1.0
+p 41
+_sl F
 
 S T 595
@@ -238 +254 @@
 h 1.0
 p 41
+_sl F
 
 S T 1167
@@ -260 +277 @@
 h 1.0
 p 41
+_sl F
+
+S T 1319
+s 27May2019[16:05.04]
+d 0 0 0 100
+G 100 100 0 100
+K 0 0 0 100
+P 246 529
+T   Add New Contact
+X AuthAddContactDetails
+x F
+o bryce
+n F
+v S
+f tr25
+t -1.0
+b 0.0
+m 0.0
+w 200
+M 200
+h 1.0
+_sl F
 
 Z
@@ -267 +306 @@
 Z
 
-ActiveTime:01:43:43
+ActiveTime:01:54:22
 DarkTime:02:59:19
-56:52:518 752 458 kCTRL
-56:53:018 752 458 kCTRL
-56:53:051 752 458 kCTRL
-56:53:085 752 458 kCTRL
-56:53:118 752 458 kCTRL
-56:53:134 752 458 kS
+05:47:304 741 351 kCTRL
+05:47:465 741 351 kV
+05:47:863 749 347 Md
+05:47:950 749 347 Mu
+05:48:720 753 342 kSHIFT
+05:48:878 753 342 kA
+05:49:118 762 347 kC
+05:49:454 770 347 kT
+05:49:622 775 347 kI
+05:49:662 780 347 kO
+05:49:718 789 347 kN
+05:49:910 798 347 kSHIFT
+05:51:367 806 347 Md
+05:51:510 806 347 Mu
+05:52:330 385 511 Md
+05:52:446 385 511 Mu
+05:53:386 306 529 Ld
+05:53:513 306 529 Rd
+05:53:662 306 529 Lu
+05:53:687 306 529 Ru
+05:57:713 717 269 Md
+05:57:880 717 269 Rd
+05:58:758 717 269 Ru
+05:58:791 717 269 Mu
+05:59:769 306 523 Ld
+05:59:830 306 523 Lu
+06:04:976 758 396 kSHIFT
+06:05:095 758 396 kD
+06:05:304 771 396 kA
+06:05:410 779 396 kV
+06:05:449 788 396 kI
+06:05:575 793 396 kD
+06:07:207 786 398 Md
+06:07:302 786 398 Mu
+06:08:038 316 529 Ld
+06:08:174 316 529 Lu
+06:11:175 787 387 Md
+06:11:303 787 387 Mu
+06:17:623 834 392 Md
+06:17:742 834 392 Mu
+06:18:472 466 644 Md
+06:18:585 464 644 Mu
+06:22:650 443 647 Md
+06:22:807 443 647 Rd
+06:23:030 443 647 Ru
+06:23:086 443 647 Mu

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

@@ -5 +5 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -223 +227 @@
                 return sb.toString();
         }
+        public static void AuthAddContactDetails() {
+                MessageBay.displayMessage("If a user has sent their contact details to you, running this action again with their username attached to your cursor will display instructions to adding those details to your contacts directory.");
+        }
+        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();
+        }
         //      End Making Contacts Actions