Changeset 1494 for trunk

Timestamp:

12/05/19 15:40:01 (4 years ago)

Author:

bnemhaus

Message:

Preperation for David's presentation.

Location:

trunk/src/org/expeditee

Files:

• assets/resources-public/framesets/davidpresentation/1.exp (modified) (6 diffs)
• auth/Actions.java (modified) (1 diff)
• encryption/Actions.java (modified) (8 diffs)

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

@@ -1 @@
-V 12
+V 28
 U nobody
 D 19Mar2019[10:44]
-M nobody
-d 19Mar2019[11:12]
+M bryce
+d 05Dec2019[15:29]
 Z
 
-S T 3
-s 19Mar2019[10:44]
-d 0 0 100 100
-P 15 58
-T DavidPresentation
-o nobody
-v S
-f sb30
-t -1.0
-b 0.0
-m 0.0
-w 812
-h -1.0
-
-S T 79
-s 19Mar2019[10:49.33]
-P 115 129
-T DavidPresentation2
-F 2
+S P 825
+s 05Dec2019[15:37.33]
+d 70 70 0 100
+P 1137 8
+e 100 100 39 100
+o bryce
+v S
+h 2.0
+l 828 829
+c 820 821
+
+S P 826
+s 05Dec2019[15:37.33]
+d 70 70 0 100
+P 1537 8
+e 100 100 39 100
+o bryce
+v S
+h 2.0
+l 829 830
+c 820 822
+
+S P 623
+s 05Dec2019[15:17.00]
+d 0 70 0 100
+P 898 11
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 627 630
+c 619 622
+
+S P 624
+s 05Dec2019[15:17.00]
+d 0 70 0 100
+P 4 11
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 627 628
+c 619 621
+
+S T 804
+s 05Dec2019[15:36.48]
+P 1216 42
+T Debug ActionsMessage
+o bryce
+v S
+f sr20
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 606
+s 05Dec2019[15:16.25]
+P 320 48
+T Encryption and Surrogates
+o bryce
+v S
+f sr20
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 764
+s 05Dec2019[15:34.06]
+d 0 0 100 100
+P 1527 55
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 768 771
+c 760 763
+
+S P 765
+s 05Dec2019[15:34.06]
+d 0 0 100 100
+P 1146 55
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 768 769
+c 760 762
+
+S P 707
+s 05Dec2019[15:30.01]
+d 0 0 100 100
+P 380 60
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 711 714
+c 703 706
+
+S P 708
+s 05Dec2019[15:30.01]
+d 0 0 100 100
+P 15 60
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 711 712
+c 703 705
+
+S T 449
+s 05Dec2019[15:02.05]
+d 0 0 0 100
+P 1172 83
+T @SendTestMessage
+X SendTestMessage
+o bryce
 v S
 f tr18
@@ -31 +133 @@
 m 0.0
 h -1.0
+_sl F
+
+S T 689
+s 05Dec2019[15:20.44]
+P 42 89
+T @SetAsSurrogateFor
+X SetAsSurrogateFor
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 679
+s 05Dec2019[15:18.42]
+d 70 70 0 100
+P 886 91
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 683 686
+c 675 678
+
+S P 680
+s 05Dec2019[15:18.42]
+d 70 70 0 100
+P 667 91
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 683 684
+c 675 677
+
+S T 310
+s 05Dec2019[14:55.51]
+d 0 0 0 100
+P 15 102
+T @EncryptionLabel: None
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_el None
+_sl F
+
+S T 747
+s 05Dec2019[15:32.08]
+G 75 75 75 100
+K 25 25 25 100
+P 1158 112
+T Usage: 
+T    
+Note: this action is used for debugging purposes.
+T    With Text Item attached to cursor: 
+T       Attached Item is name of individual you have contact with.
+T    Left click on this action.
+T    Feedback will be shown in Message Bay.
+T    Recipient will recieve a test message.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 690
+s 05Dec2019[15:29.46]
+G 75 75 75 100
+K 25 25 25 100
+P 26 119
+T Usage: 
+T    Change arugment to be the ID of the desired primary item.
+T    (An items ID is available in its extracted properties)
+T    With Text Item attached to cursor: 
+T       Attached Item is desired surrogate.
+T    Left click on this action.
+T    Item will respect surrogate mode once placed on frame.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 662
+s 05Dec2019[15:18.36]
+d 0 0 0 100
+P 679 123
+T @EncryptionLabel: None
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 562
+s 05Dec2019[15:13.04]
+d 0 0 0 100
+P 680 161
+T @EncryptionLabel: 
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 659
+s 05Dec2019[15:18.23]
+d 0 0 0 100
+P 1061 181
+T @EncryptionLabel: None
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_el None
+_sl F
+
+S T 454
+s 05Dec2019[15:03.03]
+d 0 0 0 100
+P 1063 183
+T @EncryptionLabel: None
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_el None
+_sl F
+
+S P 681
+s 05Dec2019[15:18.42]
+d 70 70 0 100
+P 667 184
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 684 685
+c 677 676
+
+S P 682
+s 05Dec2019[15:18.42]
+d 70 70 0 100
+P 886 184
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 686 685
+c 678 676
+
+S P 739
+s 05Dec2019[15:30.31]
+P 887 193
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 743 746
+c 733 734
+
+S P 740
+s 05Dec2019[15:30.31]
+P 572 193
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 743 744
+c 733 735
+
+S T 738
+s 05Dec2019[15:30.31]
+d 0 0 0 100
+P 594 227
+T Shift + F10 to cycle surrogate mode. 
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 766
+s 05Dec2019[15:34.06]
+d 0 0 100 100
+P 1146 231
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 769 770
+c 761 762
+
+S P 767
+s 05Dec2019[15:34.06]
+d 0 0 100 100
+P 1527 231
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 770 771
+c 761 763
+
+S P 796
+s 05Dec2019[15:34.47]
+d 0 0 100 100
+P 1527 238
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 800 803
+c 790 791
+
+S P 797
+s 05Dec2019[15:34.47]
+d 0 0 100 100
+P 1147 238
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 800 801
+c 790 792
+
+S P 709
+s 05Dec2019[15:30.01]
+d 0 0 100 100
+P 15 242
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 712 713
+c 704 705
+
+S P 710
+s 05Dec2019[15:30.01]
+d 0 0 100 100
+P 380 242
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 713 714
+c 704 706
+
+S P 741
+s 05Dec2019[15:30.31]
+P 572 250
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 744 745
+c 735 736
+
+S P 742
+s 05Dec2019[15:30.31]
+P 887 250
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 745 746
+c 734 736
+
+S P 626
+s 05Dec2019[15:17.00]
+d 0 70 0 100
+P 898 263
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 630 629
+c 622 620
+
+S P 625
+s 05Dec2019[15:17.00]
+d 0 70 0 100
+P 4 263
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 628 629
+c 621 620
+
+S T 794
+s 05Dec2019[15:34.47]
+d 0 0 0 100
+P 1173 266
+T @SendTestOneOffMessage
+X SendTestOneOffMessage
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 227
+s 05Dec2019[14:11.35]
+d 0 70 0 100
+P 3 275
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 230 231
+c 222 223
+
+S P 228
+s 05Dec2019[14:11.35]
+d 0 70 0 100
+P 898 275
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 231 232
+c 222 224
+
+S T 795
+s 05Dec2019[15:34.47]
+G 75 75 75 100
+K 25 25 25 100
+P 1159 295
+T Usage: 
+T    
+Note: this action is used for debugging purposes.
+T    With Text Item attached to cursor: 
+T       Attached Item is name of individual you have contact with.
+T    Left click on this action.
+T    Feedback will be shown in Message Bay.
+T    Recipient will recieve a  one off encrypted test message.
+T    Randomly generated key will be printed to StdOut
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 201
+s 05Dec2019[14:10.58]
+P 284 308
+T Label (Secret) Creation/Manipulation
+o bryce
+v S
+f sr20
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 97
+s 05Dec2019[13:56.45]
+d 0 0 100 100
+P 459 330
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 101 104
+c 93 96
+
+S P 98
+s 05Dec2019[13:56.45]
+d 0 0 100 100
+P 12 330
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 101 102
+c 93 95
 
 S T 13
 s 19Mar2019[10:47.17]
-P 118 176
-T GenerateSecret
+P 37 354
+T @GenerateSecret
 X GenerateSecret
+o bryce
 v S
 f tr18
@@ -43 +558 @@
 m 0.0
 h -1.0
+_sl F
+
+S P 591
+s 05Dec2019[15:15.21]
+d 70 70 0 100
+P 793 363
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 595 598
+c 587 590
+
+S P 592
+s 05Dec2019[15:15.21]
+d 70 70 0 100
+P 574 363
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 595 596
+c 587 589
+
+S T 80
+s 05Dec2019[13:56.35]
+G 75 75 75 100
+K 25 25 25 100
+P 22 380
+T Usage: 
+T    With Text Item attached to cursor: 
+T       Content should be one word with no spaces.
+T       Content represents the desired label name for the generated secret.
+T       This action will overwrite any existing data.
+T    Left click on this action.
+T    Text Item will now contain a full key in its data.
+T    Resulting Text Item is now a Secret and can be placed on secrets frame.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 416
+s 05Dec2019[14:59.27]
+P 591 391
+T Label Properties
+o bryce
+v S
+f sr20
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 462
+s 05Dec2019[15:08.50]
+d 0 0 0 100
+P 590 425
+T @KeyImage: FullKey
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 798
+s 05Dec2019[15:34.47]
+d 0 0 100 100
+P 1147 436
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 801 802
+c 792 793
+
+S P 799
+s 05Dec2019[15:34.47]
+d 0 0 100 100
+P 1527 436
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 802 803
+c 791 793
+
+S P 824
+s 05Dec2019[15:37.33]
+d 70 70 0 100
+P 1137 439
+e 100 100 39 100
+o bryce
+v S
+h 2.0
+l 827 828
+c 819 821
+
+S P 823
+s 05Dec2019[15:37.33]
+d 70 70 0 100
+P 1537 439
+e 100 100 39 100
+o bryce
+v S
+h 2.0
+l 827 830
+c 819 822
+
+S P 303
+s 05Dec2019[14:54.10]
+d 100 0 0 100
+P 1674 450
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 306 307
+c 297 299
+
+S P 302
+s 05Dec2019[14:54.10]
+d 100 0 0 100
+P 1138 450
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 305 306
+c 297 298
+
+S T 464
+s 05Dec2019[15:08.59]
+d 0 0 0 100
+P 589 456
+T @KeyImage: PartialKey
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 283
+s 05Dec2019[14:53.49]
+P 1280 468
+T Deprecated Frame Encryption
+o bryce
+v S
+f sr20
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 275
+s 05Dec2019[14:53.16]
+d 0 0 100 100
+P 1667 479
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 279 282
+c 271 274
+
+S P 276
+s 05Dec2019[14:53.16]
+d 0 0 100 100
+P 1146 479
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 279 280
+c 271 273
+
+S T 605
+s 05Dec2019[15:15.44]
+d 0 0 0 100
+P 589 487
+T @KeyImage: NotAKey
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
 
 S T 20
 s 19Mar2019[10:47.38]
-P 118 213
-T Encrypt
+P 1171 506
+T @Encrypt
 X Encrypt
+o bryce
 v S
 f tr18
@@ -55 +772 @@
 m 0.0
 h -1.0
+_sl F
+
+S P 593
+s 05Dec2019[15:15.21]
+d 70 70 0 100
+P 574 506
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 596 597
+c 589 588
+
+S P 594
+s 05Dec2019[15:15.21]
+d 70 70 0 100
+P 793 506
+e 100 100 100 100
+o bryce
+v S
+h 2.0
+l 598 597
+c 590 588
+
+S P 99
+s 05Dec2019[13:56.45]
+d 0 0 100 100
+P 12 517
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 102 103
+c 95 94
+
+S P 100
+s 05Dec2019[13:56.45]
+d 0 0 100 100
+P 459 517
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 104 103
+c 96 94
+
+S P 170
+s 05Dec2019[13:58.44]
+d 0 0 100 100
+P 890 529
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 174 177
+c 166 169
+
+S P 171
+s 05Dec2019[13:58.44]
+d 0 0 100 100
+P 12 529
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 174 175
+c 166 168
+
+S T 233
+s 05Dec2019[14:52.00]
+G 75 75 75 100
+K 25 25 25 100
+P 1155 534
+T Usage: 
+T    Note: this action was used for demonstration purposes earlier in development.
+T    (It can now be considered deprecated by Encryption Label and surrogate functionality)
+T    With Text Item attached to cursor: 
+T       Data contains key data.
+T       Must be linked to frame you wish to encrypt.
+T    Left click on this action.
+T    Content on linked frame will now be encrypted.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 152
+s 05Dec2019[13:57.56]
+P 37 555
+T @SplitSecret
+X SplitSecret
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 153
+s 05Dec2019[13:58.19]
+G 75 75 75 100
+K 25 25 25 100
+P 23 583
+T Usage: 
+T    With Text Item attached to cursor: 
+T       Content matches pattern "<SecretName> <Amount of Coperation Required> <Individual Name 1> <Individual Name 2> ... <Individual Name N>"
+T       Context Example: "SecretName 3 Sandra John Billy Sally Sam Tim"
+T       Data contains key data
+T    Left click on this action.
+T    Resulting Text Item will contain shares in data.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 277
+s 05Dec2019[14:53.16]
+d 0 0 100 100
+P 1146 668
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 280 281
+c 273 272
+
+S P 278
+s 05Dec2019[14:53.16]
+d 0 0 100 100
+P 1667 668
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 282 281
+c 274 272
+
+S P 251
+s 05Dec2019[14:52.40]
+d 0 0 100 100
+P 1668 675
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 255 258
+c 247 250
+
+S P 252
+s 05Dec2019[14:52.40]
+d 0 0 100 100
+P 1146 675
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 255 256
+c 247 249
+
+S P 172
+s 05Dec2019[13:58.44]
+d 0 0 100 100
+P 12 702
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 175 176
+c 168 167
+
+S P 173
+s 05Dec2019[13:58.44]
+d 0 0 100 100
+P 890 702
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 177 176
+c 169 167
 
 S T 27
 s 19Mar2019[10:47.40]
-P 118 250
-T Decrypt
+P 1170 704
+T @Decrypt
 X Decrypt
+o bryce
 v S
 f tr18
@@ -67 +975 @@
 m 0.0
 h -1.0
-
-S T 34
-s 19Mar2019[10:47.47]
-P 118 287
-T SplitSecret
-X SplitSecret
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-h -1.0
+_sl F
+
+S P 180
+s 05Dec2019[14:07.53]
+d 0 0 100 100
+P 649 713
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 188 191
+c 195 197
+
+S P 181
+s 05Dec2019[14:07.53]
+d 0 0 100 100
+P 12 713
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 191 194
+c 197 198
+
+S T 234
+s 05Dec2019[14:52.07]
+G 75 75 75 100
+K 25 25 25 100
+P 1157 729
+T Usage: 
+T    Note: this action was used for demonstration purposes earlier in development.
+T    (It can now be considered deprecated by Encryption Label and surrogate functionality)
+T    With Text Item attached to cursor: 
+T       Data contains key data.
+T       Must be linked to frame that was previously encrypted.
+T    Left click on this action.
+T    Content on linked frame will now be decrypted.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
 
 S T 41
 s 19Mar2019[10:47.52]
-P 118 324
-T JoinSecret
+P 41 735
+T @JoinSecret
 X JoinSecret
+o bryce
 v S
 f tr18
@@ -91 +1033 @@
 m 0.0
 h -1.0
+_sl F
+
+S T 178
+s 05Dec2019[14:07.43]
+G 75 75 75 100
+K 25 25 25 100
+P 21 765
+T Usage: 
+T    With Text Item attached to cursor: 
+T       Content matches pattern "<SecretName> <Amount of Coperation Required> <Total Number of Shares>"
+T       Data contains <Amount of Coperation Required> partial keys
+T    Left click on this action.
+T    Resulting Text Item will contain joined key in data.
+o bryce
+v S
+f tr14
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 253
+s 05Dec2019[14:52.40]
+d 0 0 100 100
+P 1146 866
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 256 257
+c 249 248
+
+S P 254
+s 05Dec2019[14:52.40]
+d 0 0 100 100
+P 1668 866
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 258 257
+c 250 248
+
+S P 182
+s 05Dec2019[14:07.53]
+d 0 0 100 100
+P 12 869
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 194 185
+c 198 196
+
+S P 179
+s 05Dec2019[14:07.53]
+d 0 0 100 100
+P 649 869
+e 59 59 100 100
+o bryce
+v S
+h 2.0
+l 188 185
+c 195 196
+
+S P 300
+s 05Dec2019[14:54.10]
+d 100 0 0 100
+P 1674 873
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 307 304
+c 299 296
+
+S P 301
+s 05Dec2019[14:54.10]
+d 100 0 0 100
+P 1138 873
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 305 304
+c 298 296
+
+S P 225
+s 05Dec2019[14:11.35]
+d 0 70 0 100
+P 898 875
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 232 229
+c 224 221
+
+S P 226
+s 05Dec2019[14:11.35]
+d 0 70 0 100
+P 3 875
+e 59 100 59 100
+o bryce
+v S
+h 2.0
+l 230 229
+c 223 221
 
 Z
 
+L 828 1
+s 824 825
+
+L 829 1
+s 825 826
+
+L 830 1
+s 826 823
+
+L 627 1
+s 623 624
+
+L 630 1
+s 626 623
+
+L 628 1
+s 624 625
+
+L 768 1
+s 764 765
+
+L 771 1
+s 767 764
+
+L 769 1
+s 765 766
+
+L 711 1
+s 707 708
+
+L 714 1
+s 710 707
+
+L 712 1
+s 708 709
+
+L 683 1
+s 679 680
+
+L 686 1
+s 682 679
+
+L 684 1
+s 680 681
+
+L 685 1
+s 681 682
+
+L 743 1
+s 739 740
+
+L 746 1
+s 742 739
+
+L 744 1
+s 740 741
+
+L 770 1
+s 766 767
+
+L 800 1
+s 796 797
+
+L 803 1
+s 799 796
+
+L 801 1
+s 797 798
+
+L 713 1
+s 709 710
+
+L 745 1
+s 741 742
+
+L 629 1
+s 625 626
+
+L 230 1
+s 226 227
+
+L 231 1
+s 227 228
+
+L 232 1
+s 228 225
+
+L 101 1
+s 97 98
+
+L 104 1
+s 100 97
+
+L 102 1
+s 98 99
+
+L 595 1
+s 591 592
+
+L 598 1
+s 594 591
+
+L 596 1
+s 592 593
+
+L 802 1
+s 798 799
+
+L 827 1
+s 823 824
+
+L 306 1
+s 302 303
+
+L 307 1
+s 303 300
+
+L 305 1
+s 301 302
+
+L 279 1
+s 275 276
+
+L 282 1
+s 278 275
+
+L 280 1
+s 276 277
+
+L 597 1
+s 593 594
+
+L 103 1
+s 99 100
+
+L 174 1
+s 170 171
+
+L 177 1
+s 173 170
+
+L 175 1
+s 171 172
+
+L 281 1
+s 277 278
+
+L 255 1
+s 251 252
+
+L 258 1
+s 254 251
+
+L 256 1
+s 252 253
+
+L 176 1
+s 172 173
+
+L 188 1
+s 179 180
+
+L 191 1
+s 180 181
+
+L 194 1
+s 181 182
+
+L 257 1
+s 253 254
+
+L 185 1
+s 182 179
+
+L 304 1
+s 300 301
+
+L 229 1
+s 225 226
+
 Z
 
+C 820 3
+s 825 826
+
+C 821 2
+s 824 825
+
+C 822 2
+s 826 823
+
+C 619 3
+s 623 624
+
+C 622 2
+s 626 623
+
+C 621 2
+s 624 625
+
+C 760 3
+s 764 765
+
+C 763 2
+s 767 764
+
+C 762 2
+s 765 766
+
+C 703 3
+s 707 708
+
+C 706 2
+s 710 707
+
+C 705 2
+s 708 709
+
+C 675 3
+s 679 680
+
+C 678 2
+s 682 679
+
+C 677 2
+s 680 681
+
+C 676 3
+s 681 682
+
+C 733 3
+s 739 740
+
+C 734 2
+s 742 739
+
+C 735 2
+s 740 741
+
+C 761 3
+s 766 767
+
+C 790 3
+s 796 797
+
+C 791 2
+s 799 796
+
+C 792 2
+s 797 798
+
+C 704 3
+s 709 710
+
+C 736 3
+s 741 742
+
+C 620 3
+s 625 626
+
+C 222 3
+s 227 228
+
+C 223 2
+s 226 227
+
+C 224 2
+s 228 225
+
+C 93 3
+s 97 98
+
+C 96 2
+s 100 97
+
+C 95 2
+s 98 99
+
+C 587 3
+s 591 592
+
+C 590 2
+s 594 591
+
+C 589 2
+s 592 593
+
+C 793 3
+s 798 799
+
+C 819 3
+s 823 824
+
+C 297 3
+s 302 303
+
+C 299 2
+s 303 300
+
+C 298 2
+s 301 302
+
+C 271 3
+s 275 276
+
+C 274 2
+s 278 275
+
+C 273 2
+s 276 277
+
+C 588 3
+s 593 594
+
+C 94 3
+s 99 100
+
+C 166 3
+s 170 171
+
+C 169 2
+s 173 170
+
+C 168 2
+s 171 172
+
+C 272 3
+s 277 278
+
+C 247 3
+s 251 252
+
+C 250 2
+s 254 251
+
+C 249 2
+s 252 253
+
+C 167 3
+s 172 173
+
+C 195 2
+s 179 180
+
+C 197 3
+s 180 181
+
+C 198 2
+s 181 182
+
+C 248 3
+s 253 254
+
+C 196 3
+s 182 179
+
+C 296 3
+s 300 301
+
+C 221 3
+s 225 226
+
 Z
 
-ActiveTime:00:01:41
-DarkTime:00:17:28
-12:52:212 771 159 kF10
-12:54:285 670 186 kF11
+ActiveTime:00:12:37
+DarkTime:00:19:04
+29:46:730 1070 148 Ld
+29:46:795 1070 148 Lu
+29:53:246 1023 186 Md
+29:53:403 1023 186 Mu
+29:55:062 1441 291 Md
+29:55:187 1441 291 Mu
+29:56:221 1538 288 Md
+29:56:291 1538 288 Rd
+29:56:347 1538 288 Ru
+29:56:402 1538 288 Mu
+29:57:822 1250 94 Md
+29:57:858 1250 94 Rd
+29:57:994 1250 94 Ru
+29:58:027 1250 94 Mu
+29:58:572 1099 142 Md
+29:58:682 1099 142 Mu
+29:59:558 1094 145 Md
+29:59:659 1094 145 Mu
+30:01:067 1005 127 Rd
+30:01:147 1005 127 Ru
+30:03:005 1378 326 Md
+30:03:131 1378 326 Mu
+30:04:861 1004 323 Md
+30:04:962 1004 323 Mu
+30:05:885 1012 324 Md
+30:05:979 1012 324 Mu
+30:07:837 1280 145 kF3
+30:09:428 1288 128 kF3
+30:10:502 1286 152 Md
+30:10:595 1286 152 Mu
+30:16:702 289 85 Md
+30:16:811 289 85 Mu
+30:19:349 9 263 Md
+30:19:459 9 263 Mu
+30:21:259 4 263 Md
+30:21:442 4 263 Mu
+30:31:614 857 227 Rd
+30:31:666 857 227 Ru
+30:32:686 1240 206 Md
+30:32:850 1240 206 Mu
+30:34:150 1075 154 Md
+30:34:186 1075 154 Rd
+30:34:282 1075 154 Ru
+30:34:324 1074 154 Mu
+30:36:154 1055 203 kSHIFT
+30:36:276 1055 203 kS
+30:36:483 1064 203 kH
+30:36:571 1073 203 kI
+30:36:741 1078 203 kF
+30:36:989 1084 203 kT
+30:37:237 1094 203 kSHIFT
+30:38:044 1108 203 kF
+30:42:061 1141 203 kT
+30:42:129 1059 226 kO
+30:42:357 1159 203 kC
+30:42:605 1062 226 kY
+30:42:844 1071 226 kC
+30:42:931 1079 226 kL
+30:43:059 1084 226 kE
+30:43:283 1202 203 kS
+30:43:378 1061 226 kU
+30:43:475 1070 226 kR
+30:43:611 1076 226 kR
+30:43:714 1082 226 kO
+30:43:845 1091 226 kG
+30:43:947 1100 226 kA
+30:44:059 1108 226 kT
+30:44:155 1113 226 kE
+30:44:429 1125 226 kM
+30:44:498 1068 249 kO
+30:44:572 1077 249 kD
+30:44:724 1086 249 kE
+30:46:708 1170 226 kDELETE
+30:47:209 1170 226 kDELETE
+30:47:240 1170 226 kDELETE
+30:47:273 1170 226 kDELETE
+30:47:306 1170 226 kDELETE
+30:47:339 1170 226 kDELETE
+30:47:372 1170 226 kDELETE
+30:47:404 1170 226 kDELETE
+30:47:438 1170 226 kDELETE
+30:47:471 1170 226 kDELETE
+30:47:504 1170 226 kDELETE
+30:47:537 1170 226 kDELETE
+30:47:576 1170 226 kDELETE
+30:47:604 1170 226 kDELETE
+30:47:636 1170 226 kDELETE
+30:47:669 1170 226 kDELETE
+30:48:133 1170 226 kDELETE
+30:49:750 1154 205 Md
+30:49:860 1154 204 Mu
+30:50:573 1157 165 Md
+30:50:731 1163 168 Mu
+30:52:358 1262 227 Md
+30:52:467 1262 227 Mu
+30:52:891 1337 204 Md
+30:52:987 1337 204 Mu
+30:54:110 1335 207 Md
+30:54:227 1335 207 Mu
+30:54:531 1365 201 Md
+30:54:627 1365 201 Mu
+30:55:925 1359 201 Md
+30:56:035 1359 201 Mu
+30:58:390 1356 190 Md
+30:58:499 1356 190 Mu
+31:00:213 1282 189 kF3
+31:01:742 1327 179 Md
+31:01:835 1327 179 Mu
+31:07:814 1328 166 Md
+31:07:898 1328 166 Mu
+31:08:772 855 221 Md
+31:08:859 855 221 Mu
+31:09:323 1246 280 Md
+31:09:418 1246 280 Mu
+31:10:126 1348 156 Md
+31:10:211 1348 156 Mu
+31:14:526 878 229 Md
+31:14:603 878 229 Mu
+31:15:550 1246 278 Md
+31:15:643 1246 278 Mu
+31:19:455 864 156 Md
+31:19:547 864 156 Mu
+31:54:032 1595 392 Md
+31:54:099 1595 392 Mu
+31:54:618 1362 240 Md
+31:54:707 1362 240 Mu
+32:08:685 133 142 Rd
+32:08:755 133 142 Ru
+32:09:957 1060 308 Md
+32:10:051 1060 308 Mu
+32:12:517 967 298 kDELETE
+32:13:017 963 303 kDELETE
+32:13:049 964 303 kDELETE
+32:13:080 964 303 kDELETE
+32:13:114 964 303 kDELETE
+32:13:147 964 303 kDELETE
+32:13:180 964 303 kDELETE
+32:13:213 964 303 kDELETE
+32:13:245 964 303 kDELETE
+32:13:279 964 303 kDELETE
+32:13:311 964 303 kDELETE
+32:13:345 964 303 kDELETE
+32:13:378 964 303 kDELETE
+32:13:411 964 303 kDELETE
+32:13:444 964 303 kDELETE
+32:13:477 964 303 kDELETE
+32:13:510 964 303 kDELETE
+32:13:543 964 303 kDELETE
+32:13:576 964 303 kDELETE
+32:13:608 964 303 kDELETE
+32:13:642 964 303 kDELETE
+32:13:675 964 303 kDELETE
+32:13:708 964 303 kDELETE
+32:13:741 964 303 kDELETE
+32:13:774 964 303 kDELETE
+32:13:807 964 303 kDELETE
+32:13:839 964 303 kDELETE
+32:13:873 964 303 kDELETE
+32:13:906 964 303 kDELETE
+32:13:939 964 303 kDELETE
+32:13:972 964 303 kDELETE
+32:14:005 964 303 kDELETE
+32:14:038 964 303 kDELETE
+32:14:071 964 303 kDELETE
+32:14:104 964 303 kDELETE
+32:14:137 964 303 kDELETE
+32:14:169 964 303 kDELETE
+32:14:203 964 303 kDELETE
+32:14:236 964 303 kDELETE
+32:14:269 964 303 kDELETE
+32:14:305 964 303 kDELETE
+32:14:347 964 303 kDELETE
+32:14:375 964 303 kDELETE
+32:14:404 964 303 kDELETE
+32:14:434 964 303 kDELETE
+32:14:467 964 303 kDELETE
+32:14:499 964 303 kDELETE
+32:14:533 964 303 kDELETE
+32:14:565 964 303 kDELETE
+32:14:599 964 303 kDELETE
+32:14:632 964 303 kDELETE
+32:14:664 964 303 kDELETE
+32:14:885 964 303 kDELETE
+32:15:037 964 303 kDELETE
+32:15:190 964 303 kDELETE
+32:15:405 964 303 kDELETE
+32:15:582 964 303 kDELETE
+32:16:373 964 303 kSHIFT
+32:16:873 964 303 kSHIFT
+32:16:889 964 303 kN
+32:17:067 974 303 kO
+32:17:229 981 303 kT
+32:17:294 985 303 kE
+32:17:420 991 303 kSHIFT
+32:17:741 998 303 kT
+32:17:812 1002 303 kH
+32:17:871 1009 303 kI
+32:17:955 1013 303 kS
+32:18:141 1021 303 kA
+32:18:294 1028 303 kC
+32:18:534 1034 303 kT
+32:18:608 1038 303 kI
+32:18:640 1042 303 kO
+32:18:700 1049 303 kN
+32:19:254 1060 303 kI
+32:19:326 1063 303 kS
+32:19:630 1072 303 kU
+32:19:716 1079 303 kS
+32:19:844 1085 303 kE
+32:20:029 1091 303 kD
+32:20:357 1102 303 kF
+32:20:428 1106 303 kO
+32:20:531 1113 303 kR
+32:20:821 1121 303 kD
+32:20:988 1128 303 kE
+32:21:182 1135 303 kB
+32:21:267 1142 303 kU
+32:21:430 1149 303 kG
+32:21:539 1156 303 kG
+32:21:627 1163 303 kI
+32:21:700 1166 303 kN
+32:21:758 1173 303 kG
+32:22:030 1184 303 kP
+32:22:181 1191 303 kU
+32:22:307 1198 303 kR
+32:22:443 1203 303 kP
+32:22:515 1210 303 kO
+32:22:620 1217 303 kS
+32:22:814 1222 303 kE
+32:22:891 1228 303 kS
+32:35:918 1237 303 kDELETE
+32:36:397 1237 303 kDELETE
+32:36:898 1237 303 kDELETE
+32:36:929 1237 303 kDELETE
+32:36:961 1237 303 kDELETE
+32:36:994 1237 303 kDELETE
+32:37:030 1237 303 kDELETE
+32:37:060 1237 303 kDELETE
+32:37:093 1237 303 kDELETE
+32:37:126 1237 303 kDELETE
+32:37:159 1237 303 kDELETE
+32:37:192 1237 303 kDELETE
+32:37:225 1237 303 kDELETE
+32:37:258 1237 303 kDELETE
+32:37:291 1237 303 kDELETE
+32:37:324 1237 303 kDELETE
+32:37:357 1237 303 kDELETE
+32:37:390 1237 303 kDELETE
+32:37:423 1237 303 kDELETE
+32:37:456 1237 303 kDELETE
+32:37:491 1237 303 kDELETE
+32:37:522 1237 303 kDELETE
+32:37:554 1237 303 kDELETE
+32:37:587 1237 303 kDELETE
+32:37:622 1237 303 kDELETE
+32:37:659 1237 303 kDELETE
+32:37:688 1237 303 kDELETE
+32:37:720 1237 303 kDELETE
+32:37:753 1237 303 kDELETE
+32:37:785 1237 303 kDELETE
+32:38:694 1237 303 kDELETE
+32:39:194 1237 303 kDELETE
+32:39:226 1237 303 kDELETE
+32:39:257 1237 303 kDELETE
+32:39:290 1237 303 kDELETE
+32:39:324 1237 303 kDELETE
+32:39:356 1237 303 kDELETE
+32:39:389 1237 303 kDELETE
+32:39:422 1237 303 kDELETE
+32:39:455 1237 303 kDELETE
+32:39:685 1237 303 kDELETE
+32:39:854 1237 303 kDELETE
+32:39:997 1237 303 kDELETE
+32:40:141 1237 303 kDELETE
+32:40:268 1237 303 kDELETE
+32:40:371 1237 303 kDELETE
+32:40:492 1237 303 kDELETE
+32:40:694 1237 303 kDELETE
+32:40:835 1237 303 kDELETE
+32:40:996 1237 303 kDELETE
+32:41:222 1237 303 kDELETE
+32:41:340 1237 303 kDELETE
+32:41:525 1237 303 kDELETE
+32:41:686 1237 303 kDELETE
+32:41:836 1237 303 kDELETE
+32:41:990 1237 303 kDELETE
+32:42:179 1237 303 kDELETE
+32:42:534 1237 303 kDELETE
+32:44:285 1237 303 kDOWN_ARROW
+32:44:685 1160 320 kDOWN_ARROW
+32:45:302 1159 338 kRIGHT_ARROW
+32:46:734 1166 338 kBACKSPACE
+32:47:234 1160 338 kBACKSPACE
+32:47:274 1156 338 kBACKSPACE
+32:47:305 1150 338 kBACKSPACE
+32:47:337 1143 338 kBACKSPACE
+32:47:369 1136 338 kBACKSPACE
+32:47:400 1131 338 kBACKSPACE
+32:47:431 1126 338 kBACKSPACE
+32:47:489 1119 338 kBACKSPACE
+32:47:520 1114 338 kBACKSPACE
+32:47:551 1110 338 kBACKSPACE
+32:47:582 1103 338 kBACKSPACE
+32:47:613 1097 338 kBACKSPACE
+32:47:643 1093 338 kBACKSPACE
+32:47:674 1089 338 kBACKSPACE
+32:47:709 1083 338 kBACKSPACE
+32:47:739 1077 338 kBACKSPACE
+32:47:769 1070 338 kBACKSPACE
+32:47:800 1067 338 kBACKSPACE
+32:47:830 1061 338 kBACKSPACE
+32:47:860 1057 338 kBACKSPACE
+32:48:070 1054 338 kBACKSPACE
+32:48:570 1043 338 kBACKSPACE
+32:48:602 1037 338 kBACKSPACE
+32:48:658 1033 338 kBACKSPACE
+32:48:690 1028 338 kBACKSPACE
+32:48:722 1025 338 kBACKSPACE
+32:48:752 1017 338 kBACKSPACE
+32:48:783 1011 338 kBACKSPACE
+32:48:990 1004 338 kBACKSPACE
+32:50:454 998 338 kC
+32:50:571 1004 338 kH
+32:50:651 1011 338 kE
+32:50:805 1017 338 kD
+32:50:979 1028 338 kI
+32:51:133 1032 338 kT
+32:51:211 1036 338 kE
+32:51:510 1042 338 kBACKSPACE
+32:51:652 1036 338 kBACKSPACE
+32:51:771 1032 338 kBACKSPACE
+32:51:867 1028 338 kSHIFT
+32:52:005 1028 338 kI
+32:52:260 1033 338 kT
+32:52:327 1037 338 kE
+32:52:358 1043 338 kM
+32:53:070 1057 338 kI
+32:53:156 1061 338 kS
+32:54:013 1070 338 kSHIFT
+32:54:514 1070 338 kSHIFT
+32:54:545 1070 338 kSHIFT
+32:54:578 1070 338 kSHIFT
+32:54:610 1070 338 kSHIFT
+32:54:644 1070 338 kSHIFT
+32:54:677 1070 338 kSHIFT
+32:55:149 1070 338 kN
+32:55:235 1077 338 kA
+32:55:340 1083 338 kM
+32:55:436 1094 338 kE
+32:55:718 1104 338 kO
+32:55:855 1111 338 kF
+32:58:413 1119 338 kI
+32:58:477 1123 338 kN
+32:58:750 1130 338 kD
+32:58:835 1137 338 kI
+32:59:013 1141 338 kV
+32:59:205 1148 338 kI
+32:59:437 1152 338 kD
+32:59:580 1159 338 kU
+32:59:691 1166 338 kA
+32:59:820 1172 338 kL
+33:00:174 1179 338 kY
+33:00:244 1186 338 kO
+33:00:307 1193 338 kU
+33:00:686 1204 338 kH
+33:00:733 1211 338 kA
+33:00:811 1217 338 kV
+33:00:940 1224 338 kE
+33:01:262 1234 338 kC
+33:01:339 1240 338 kO
+33:01:412 1247 338 kN
+33:01:862 1254 338 kT
+33:01:932 1258 338 kA
+33:02:166 1264 338 kC
+33:02:462 1270 338 kT
+33:03:157 1278 338 kW
+33:03:224 1288 338 kI
+33:03:297 1292 338 kT
+33:03:329 1296 338 kH
+33:07:518 1303 338 kDOWN_ARROW
+33:07:925 1099 355 kDOWN_ARROW
+33:08:766 1096 373 kEND
+33:10:718 1274 373 kBACKSPACE
+33:11:218 1271 374 kBACKSPACE
+33:11:251 1265 374 kBACKSPACE
+33:11:283 1254 374 kBACKSPACE
+33:11:341 1248 374 kBACKSPACE
+33:11:372 1243 374 kBACKSPACE
+33:11:402 1239 374 kBACKSPACE
+33:11:431 1239 374 kBACKSPACE
+33:11:463 1235 374 kBACKSPACE
+33:11:494 1228 374 kBACKSPACE
+33:11:525 1221 374 kBACKSPACE
+33:11:557 1218 374 kBACKSPACE
+33:11:586 1211 374 kBACKSPACE
+33:11:618 1205 374 kBACKSPACE
+33:11:647 1198 374 kBACKSPACE
+33:11:701 1192 374 kBACKSPACE
+33:11:731 1188 374 kBACKSPACE
+33:11:761 1181 374 kBACKSPACE
+33:11:791 1178 374 kBACKSPACE
+33:11:820 1171 374 kBACKSPACE
+33:11:849 1165 374 kBACKSPACE
+33:11:879 1158 374 kBACKSPACE
+33:11:934 1151 374 kBACKSPACE
+33:11:964 1148 374 kBACKSPACE
+33:11:994 1142 374 kBACKSPACE
+33:12:023 1135 374 kBACKSPACE
+33:12:052 1128 374 kBACKSPACE
+33:12:081 1117 374 kBACKSPACE
+33:12:111 1113 374 kBACKSPACE
+33:12:165 1107 374 kBACKSPACE
+33:12:194 1103 374 kBACKSPACE
+33:12:224 1097 374 kBACKSPACE
+33:12:253 1090 374 kBACKSPACE
+33:12:282 1083 374 kBACKSPACE
+33:12:311 1078 374 kBACKSPACE
+33:12:341 1074 374 kBACKSPACE
+33:12:395 1067 374 kBACKSPACE
+33:12:424 1061 374 kBACKSPACE
+33:12:454 1058 374 kBACKSPACE
+33:12:482 1054 374 kBACKSPACE
+33:12:512 1047 374 kBACKSPACE
+33:12:541 1041 374 kBACKSPACE
+33:12:571 1034 374 kBACKSPACE
+33:12:624 1029 374 kBACKSPACE
+33:12:654 1022 374 kBACKSPACE
+33:12:683 1017 374 kBACKSPACE
+33:12:713 1013 374 kBACKSPACE
+33:12:743 1011 374 kBACKSPACE
+33:12:773 1007 374 kBACKSPACE
+33:12:974 1003 374 kBACKSPACE
+33:13:132 993 374 kBACKSPACE
+33:13:285 989 374 kBACKSPACE
+33:13:420 978 374 kBACKSPACE
+33:13:758 972 374 kBACKSPACE
+33:14:349 967 374 kBACKSPACE
+33:14:557 963 374 kSHIFT
+33:14:838 963 374 kF
+33:15:102 970 374 kE
+33:15:244 978 374 kE
+33:15:430 984 374 kD
+33:15:613 991 374 kB
+33:15:658 998 374 kA
+33:15:853 1004 374 kC
+33:15:940 1010 374 kK
+33:16:133 1020 374 kW
+33:16:204 1031 374 kI
+33:16:396 1035 374 kL
+33:16:540 1039 374 kL
+33:16:782 1046 374 kB
+33:16:950 1053 374 kE
+33:17:325 1063 374 kS
+33:17:436 1068 374 kH
+33:17:493 1075 374 kO
+33:17:573 1082 374 kW
+33:17:700 1092 374 kN
+33:18:126 1103 374 kI
+33:18:185 1107 374 kN
+33:19:094 1117 374 kSHIFT
+33:19:277 1117 374 kD
+33:20:662 1127 374 kBACKSPACE
+33:20:755 1117 374 kSHIFT
+33:20:871 1117 374 kM
+33:21:028 1130 374 kE
+33:21:230 1136 374 kS
+33:21:355 1141 374 kS
+33:21:415 1147 374 kA
+33:21:585 1153 374 kG
+33:21:651 1160 374 kE
+33:21:831 1170 374 kSHIFT
+33:21:972 1170 374 kB
+33:22:149 1179 374 kA
+33:22:324 1185 374 kY
+33:25:188 1196 374 kENTER
+33:29:302 963 391 kSHIFT
+33:29:549 963 391 kR
+33:29:789 973 391 kE
+33:30:150 979 391 kC
+33:30:510 985 391 kI
+33:30:718 989 391 kP
+33:30:926 996 391 kI
+33:31:044 1000 391 kE
+33:31:123 1006 391 kN
+33:31:235 1013 391 kT
+33:31:454 1020 391 kW
+33:31:532 1031 391 kI
+33:31:774 1035 391 kL
+33:31:916 1039 391 kL
+33:32:422 1046 391 kR
+33:32:493 1051 391 kE
+33:32:766 1057 391 kC
+33:33:067 1063 391 kI
+33:33:366 1067 391 kE
+33:33:694 1073 391 kV
+33:33:803 1080 391 kE
+33:34:206 1090 391 kA
+33:36:379 1100 391 kT
+33:36:467 1103 391 kE
+33:36:550 1110 391 kS
+33:36:627 1115 391 kT
+33:37:125 1122 391 kM
+33:37:212 1133 391 kE
+33:37:414 1140 391 kS
+33:37:556 1145 391 kS
+33:37:659 1150 391 kA
+33:37:871 1157 391 kG
+33:37:942 1164 391 kE
+33:44:718 1039 302 Md
+33:44:820 1039 302 Mu
+33:47:220 1321 296 Md
+33:47:275 1321 296 Mu
+33:49:365 1459 381 kDELETE
+33:53:125 350 220 kDELETE
+33:55:199 381 252 Md
+33:55:308 381 252 Mu
+33:57:616 380 242 Md
+33:57:876 380 242 Mu
+34:03:047 1316 243 Md
+34:03:148 1316 243 Mu
+34:03:991 1310 244 Md
+34:04:092 1310 244 Mu
+34:06:679 1216 221 Rd
+34:06:772 1216 221 Ru
+34:09:757 1602 398 Md
+34:09:932 1602 398 Mu
+34:10:439 1602 398 Md
+34:10:532 1602 398 Mu
+34:11:055 1608 398 Md
+34:11:172 1608 398 Mu
+34:12:527 1261 318 Md
+34:12:620 1261 318 Mu
+34:14:624 1254 317 Md
+34:14:708 1254 317 Mu
+34:15:311 1267 246 Md
+34:15:420 1267 246 Mu
+34:17:215 1257 244 Md
+34:17:324 1257 244 Mu
+34:18:375 1606 399 Md
+34:18:478 1603 399 Mu
+34:19:655 1597 397 Md
+34:19:748 1597 397 Mu
+34:21:311 1454 228 Md
+34:21:412 1454 228 Mu
+34:24:183 1390 96 Md
+34:24:300 1390 96 Mu
+34:44:505 1354 109 Md
+34:44:756 1354 109 Mu
+34:45:439 1305 53 Md
+34:45:540 1305 53 Mu
+34:47:437 1319 55 Rd
+34:47:524 1319 55 Ru
+34:48:551 1272 249 Md
+34:48:628 1272 249 Mu
+34:52:733 1167 245 kSHIFT
+34:52:983 1167 245 kO
+34:53:156 1179 255 kN
+34:53:276 1188 255 kE
+34:53:397 1196 255 kSHIFT
+34:53:484 1196 255 kO
+34:53:743 1209 255 kF
+34:53:852 1215 255 kF
+34:54:116 1221 255 kCTRL
+34:54:343 1221 255 kA
+34:54:486 1221 255 kA
+35:47:463 1218 390 kO
+35:47:529 1225 390 kN
+35:48:198 1232 390 kE
+35:48:638 1242 390 kO
+35:48:950 1249 390 kF
+35:49:101 1253 390 kF
+35:49:375 1262 390 kE
+35:49:451 1268 390 kN
+35:49:581 1275 390 kC
+35:49:806 1281 390 kR
+35:50:047 1286 390 kY
+35:50:172 1293 390 kP
+35:50:309 1300 390 kT
+35:50:346 1304 390 kR
+35:51:068 1308 390 kBACKSPACE
+35:51:197 1304 390 kE
+35:51:350 1310 390 kD
+35:53:791 1439 403 Md
+35:53:885 1439 403 Mu
+35:54:415 1436 425 Md
+35:54:532 1436 425 Mu
+35:56:404 1396 388 kENTER
+36:01:910 1079 408 kSHIFT
+36:02:150 1079 408 kR
+36:02:391 1088 408 kA
+36:02:485 1094 408 kN
+36:02:700 1101 408 kD
+36:02:788 1108 408 kO
+36:02:862 1115 408 kM
+36:03:023 1126 408 kL
+36:03:199 1130 408 kY
+36:03:591 1140 408 kG
+36:03:733 1147 408 kE
+36:03:813 1154 408 kN
+36:03:916 1161 408 kE
+36:03:999 1167 408 kR
+36:04:085 1171 408 kA
+36:04:212 1178 408 kT
+36:04:284 1182 408 kE
+36:04:484 1188 408 kD
+36:04:708 1198 408 kK
+36:04:774 1205 408 kE
+36:04:999 1211 408 kY
+36:05:190 1222 408 kW
+36:05:245 1232 408 kI
+36:05:454 1236 408 kL
+36:05:598 1240 408 kL
+36:05:815 1247 408 kB
+36:05:998 1254 408 kE
+36:06:157 1264 408 kP
+36:06:237 1271 408 kR
+36:06:324 1276 408 kI
+36:06:405 1279 408 kN
+36:06:440 1286 408 kT
+36:06:503 1290 408 kE
+36:06:701 1297 408 kD
+36:06:892 1307 408 kT
+36:06:956 1311 408 kO
+36:07:108 1321 408 kSHIFT
+36:07:375 1321 408 kS
+36:08:247 1329 408 kT
+36:08:511 1333 408 kD
+36:08:975 1344 408 kSHIFT
+36:09:475 1344 408 kSHIFT
+36:09:505 1344 408 kSHIFT
+36:09:539 1344 408 kSHIFT
+36:09:605 1344 408 kBACKSPACE
+36:09:700 1340 408 kSHIFT
+36:09:927 1340 408 kO
+36:10:143 1350 408 kU
+36:10:223 1357 408 kT
+36:21:983 1375 236 Md
+36:22:069 1375 236 Mu
+36:24:576 1421 227 Md
+36:24:661 1421 227 Mu
+36:27:815 1449 235 Md
+36:27:933 1449 235 Mu
+36:31:703 1630 252 Md
+36:31:821 1630 252 Mu
+36:32:648 1393 46 Md
+36:32:765 1393 46 Mu
+36:39:456 1278 64 Md
+36:39:549 1278 64 Mu
+36:40:256 1573 255 Md
+36:40:382 1561 253 Mu
+36:41:544 1567 250 Md
+36:41:605 1567 250 Mu
+36:46:215 1273 249 Md
+36:46:485 1273 249 Mu
+36:48:656 484 44 Rd
+36:48:725 484 44 Ru
+36:50:872 1222 34 Md
+36:50:957 1222 34 Mu
+36:53:247 1052 32 kDELETE
+36:53:747 1058 38 kDELETE
+36:53:797 1058 38 kDELETE
+36:53:830 1058 38 kDELETE
+36:53:862 1058 38 kDELETE
+36:53:894 1058 38 kDELETE
+36:53:926 1058 38 kDELETE
+36:53:959 1058 38 kDELETE
+36:53:991 1058 38 kDELETE
+36:54:023 1058 38 kDELETE
+36:54:055 1058 38 kDELETE
+36:54:087 1058 38 kDELETE
+36:54:119 1058 38 kDELETE
+36:54:150 1058 38 kDELETE
+36:54:182 1058 38 kDELETE
+36:54:214 1058 38 kDELETE
+36:54:248 1058 38 kDELETE
+36:54:280 1058 38 kDELETE
+36:54:312 1058 38 kDELETE
+36:54:343 1058 38 kDELETE
+36:54:375 1058 38 kDELETE
+36:54:583 1058 38 kDELETE
+36:54:735 1058 38 kDELETE
+36:54:878 1058 38 kDELETE
+36:55:502 1058 38 kDELETE
+36:56:255 1058 38 kSHIFT
+36:56:756 1058 38 kSHIFT
+36:56:785 1058 38 kSHIFT
+36:56:818 1058 38 kSHIFT
+36:56:852 1058 38 kSHIFT
+36:56:869 1058 38 kM
+36:57:079 1075 38 kE
+36:57:303 1086 38 kS
+36:57:454 1096 38 kS
+36:57:522 1106 38 kA
+36:57:691 1117 38 kG
+36:57:765 1128 38 kE
+37:00:110 1139 38 kHOME
+37:00:229 1058 38 kSHIFT
+37:00:351 1058 38 kD
+37:00:559 1072 38 kE
+37:00:919 1084 38 kB
+37:01:389 1095 38 kU
+37:01:455 1106 38 kG
+37:04:263 1122 38 kSHIFT
+37:04:358 1122 38 kA
+37:04:583 1136 38 kC
+37:04:855 1146 38 kT
+37:04:965 1151 38 kI
+37:05:030 1156 38 kO
+37:05:065 1167 38 kN
+37:05:133 1178 38 kS
+37:31:613 984 437 Rd
+37:31:749 984 437 Ru
+37:32:384 984 437 Md
+37:32:501 984 437 Mu
+37:33:280 979 439 Rd
+37:33:389 979 439 Ru
+37:37:592 1385 6 Md
+37:38:845 1380 4 Mu
+37:40:095 1361 18 kF3
+37:40:512 1361 18 kF3
+37:42:215 1375 35 kF3
+37:42:687 1375 35 kF3
+37:43:183 1375 35 kF3
+37:43:551 1375 35 kF3
+37:43:686 1375 35 kF3
+37:43:863 1375 35 kF3
+37:44:319 1375 35 kF3
+37:44:919 1375 35 kF3
+37:45:870 1351 25 Md
+37:45:965 1351 25 Mu
+37:50:536 1348 30 Md
+37:50:717 1348 30 Mu
+37:52:717 1382 440 Md
+37:52:877 1382 440 Mu
+37:54:345 1376 440 Md
+37:54:445 1376 440 Mu
+37:55:513 1296 28 Md
+37:55:622 1296 28 Mu
+38:01:599 1457 27 Md
+38:01:805 1457 27 Mu
+39:07:529 999 200 Ld
+39:07:645 999 200 Lu

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

@@ -101 +101 @@
                 System.out.println(Base64.getEncoder().encodeToString(key));
                 Mail.sendOneOffMail(mail, colleagueName, key);
+                MessageBay.displayMessage("Test message sent.");
         }
         

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

@@ -34 +34 @@
 public class Actions implements CryptographyConstants {
         
-        public static void SetSurrogateFor(Text surrogate, Text action) {
+        public static void SetAsSurrogateFor(Text surrogate, Text action) {
                 Frame frame = DisplayController.getCurrentFrame();
                 String[] split = action.getText().split(" ");
@@ -48 +48 @@
                         }
                 } else {
-                        MessageBay.displayMessage("Usage: SetSurrogateFor Int, inject desired surrogate.");
+                        FreeItems.getInstance().add(SetAsSurrogateForUsage());
                 }
         }
@@ -69 +69 @@
         }
         
+        public static Text JoinSecret() {
+                return AuthJoinSecretUsage();
+        }
+        
         public static Text JoinSecret(Text key) {
                 return AuthJoinSecret(key);
         }
         
+        public static void Encrypt() {
+                AuthEncryptUsage();
+        }
+        
         public static void Encrypt(Text labelWithKey) {
                 AuthEncrypt(labelWithKey);
+        }
+        
+        public static void Decrypt() {
+                AuthDecryptUsage();
         }
         
@@ -125 +137 @@
                 
                 return key;
+        }
+        
+        public static Text AuthJoinSecret() {
+                return AuthJoinSecretUsage();
         }
                 
@@ -157 +173 @@
         
         public static void AuthEncrypt(Text labelWithKey) {
-                // Obtain encryption key
-                String keyEncoded = labelWithKey.getData().get(0);
-                byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
-                SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
-                
-                // Perform encryption
-                Frame toEncrypt = FrameIO.LoadFrame(labelWithKey.getLink());
-                Collection<Text> textItems = toEncrypt.getTextItems();
-                for (Text t: textItems) {
-                        byte[] encrypted = EncryptSymmetric(t.getText().getBytes(), key);
-                        t.setText(Base64.getEncoder().encodeToString(encrypted));
-                }
-                
-                // Save changes
-                FrameIO.SaveFrame(toEncrypt);
+                try {
+                        // Obtain encryption key
+                        String keyEncoded = labelWithKey.getData().get(0);
+                        byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
+                        SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
+                        
+                        // Perform encryption
+                        Frame toEncrypt = FrameIO.LoadFrame(labelWithKey.getLink());
+                        Collection<Text> textItems = toEncrypt.getTextItems();
+                        for (Text t: textItems) {
+                                byte[] encrypted = EncryptSymmetric(t.getText().getBytes(), key);
+                                t.setText(Base64.getEncoder().encodeToString(encrypted));
+                        }
+                        
+                        // Save changes
+                        FrameIO.SaveFrame(toEncrypt);
+                } catch (Exception e) {
+                        FreeItems.getInstance().add(AuthEncryptUsage());
+                }
         }
         
         public static void AuthDecrypt(Text labelWithKey) {
-                // Obtain encryption key
-                String keyEncoded = labelWithKey.getData().get(0);
-                byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
-                SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
-                
-                // Perform decryption
-                Frame toDecrypt = FrameIO.LoadFrame(labelWithKey.getLink());
-                Collection<Text> textItems = toDecrypt.getTextItems();
-                for (Text t: textItems) {
-                        byte[] decrypted = DecryptSymmetric(Base64.getDecoder().decode(t.getText().getBytes()), key);
-                        t.setText(new String(decrypted));
-                }
-                
-                // Save changes
-                FrameIO.SaveFrame(toDecrypt);
+                try {
+                        // Obtain encryption key
+                        String keyEncoded = labelWithKey.getData().get(0);
+                        byte[] keyDecoded = Base64.getDecoder().decode(keyEncoded);
+                        SecretKey key = new SecretKeySpec(keyDecoded, SymmetricAlgorithm);
+                        
+                        // Perform decryption
+                        Frame toDecrypt = FrameIO.LoadFrame(labelWithKey.getLink());
+                        Collection<Text> textItems = toDecrypt.getTextItems();
+                        for (Text t: textItems) {
+                                byte[] decrypted = DecryptSymmetric(Base64.getDecoder().decode(t.getText().getBytes()), key);
+                                t.setText(new String(decrypted));
+                        }
+                        
+                        // Save changes
+                        FrameIO.SaveFrame(toDecrypt);   
+                } catch (Exception e) {
+                        FreeItems.getInstance().add(AuthDecryptUsage());
+                }
         }
         
@@ -240 +264 @@
         }
         
+        private static Text AuthJoinSecretUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Content matches pattern \"<SecretName> <Amount of Coperation Required> <Total Number of Shares>\"" + nl);
+                message.append(tab + tab + "Data contains <Amount of Coperation Required> partial keys" + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Resulting Text Item will contain joined key in data.");
+                return generateUsageText(message);
+        }
+        
         private static Text AuthSplitSecretUsage() {
                 String nl = System.getProperty("line.separator");
@@ -248 +284 @@
                 message.append(tab + tab + "Context Example: \"SecretName 3 Sandra John Billy Sally Sam Tim\"" + nl);
                 message.append(tab + tab + "Data contains key data" + nl);
-                message.append(tab + "Middle click on this action." + nl);
+                message.append(tab + "Left click on this action." + nl);
                 message.append(tab + "Resulting Text Item will contain shares in data.");
                 return generateUsageText(message);
@@ -261 +297 @@
                 message.append(tab + tab + "Content represents the desired label name for the generated secret." + nl);
                 message.append(tab + tab + "This action will overwrite any existing data." + nl);
-                message.append(tab + "Middle click on this action." + nl);
+                message.append(tab + "Left click on this action." + nl);
                 message.append(tab + "Text Item will now contain a full key in its data." + nl);
                 message.append(tab + "Resulting Text Item is now a Secret and can be placed on secrets frame.");
+                return generateUsageText(message);
+        }
+        
+        private static Text AuthEncryptUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "Note: this action was used for demonstration purposes earlier in development." + nl);
+                message.append(tab + "(It can now be considered deprecated by Encryption Label and surrogate functionality)" + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Data contains key data." + nl);
+                message.append(tab + tab + "Must be linked to frame you wish to encrypt." + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Content on linked frame will now be encrypted.");
+                return generateUsageText(message);
+        }
+        
+        private static Text AuthDecryptUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "Note: this action was used for demonstration purposes earlier in development." + nl);
+                message.append(tab + "(It can now be considered deprecated by Encryption Label and surrogate functionality)" + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Data contains key data." + nl);
+                message.append(tab + tab + "Must be linked to frame that was previously encrypted." + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Content on linked frame will now be decrypted.");
+                return generateUsageText(message);
+        }
+        
+        private static Text SetAsSurrogateForUsage() {
+                String nl = System.getProperty("line.separator");
+                String tab = "   ";
+                StringBuilder message = new StringBuilder("Usage: " + nl);
+                message.append(tab + "Change arugment to be the ID of the desired primary item." + nl);
+                message.append(tab + "(An items ID is available in its extracted properties)" + nl);
+                message.append(tab + "With Text Item attached to cursor: " + nl);
+                message.append(tab + tab + "Attached Item is desired surrogate." + nl);
+                message.append(tab + "Left click on this action." + nl);
+                message.append(tab + "Item will respect surrogate mode once placed on frame." + nl);
                 return generateUsageText(message);
         }