Commit: e41fb320a27befb10e43ae5c390602e8f85f2164 - FinalCrypt (git)

FinalCrypt - The No¹ One-Time Pad Encryption

Commit MetaInfo

• Revisión: e41fb320a27befb10e43ae5c390602e8f85f2164 (tree)
• Tiempo: 2019-11-25 13:26:54
• Autor: ron <ronuitzaandam@gmai...>
• Commiter: ron

Log Message

Date: 2019-11-25 Version: 5.6.6

Improved Apple OSX stability FinalCrypt User Interface
Support Window now closes on Home / Share button click
No longer printing keypaths on statusbar creating keys

Cambiar Resumen

• modified: changelog.txt
• modified: manpage.txt
• modified: manpage_examples.txt
• modified: nbproject/project.properties
• modified: src/rdj/Audio.java
• modified: src/rdj/FinalCrypt.java
• modified: src/rdj/GUIFX.java
• modified: src/rdj/Sound.java
• modified: src/rdj/Support.java
• modified: src/rdj/VERSION
• modified: src/rdj/VERSION2
• add: src/rdj/audio/voice/finished_decrypting.aiff
• add: src/rdj/audio/voice/finished_encrypting.aiff

Diferencia incremental

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+Date: 2019-11-25 Version: 5.6.6
+
+Improved Apple OSX stability FinalCrypt User Interface
+Support Window now closes on Home / Share button click
+No longer printing keypaths on statusbar creating keys
+
 Date: 2019-11-24 Version: 5.6.5
 
 Fixed Brute Force Dict-Size, Heap-Mem & Performance

--- a/manpage.txt
+++ b/manpage.txt
@@ -62,4 +62,4 @@ Parameters:
             <[-t "file/dir"]>                                               Target items (files or directories) you want to encrypt (recursive).
             <[-b "batchfile"]>                                              Batchfile with targetfiles you want to encrypt (only files).
 
-FinalCrypt 5.6.5 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file
+FinalCrypt 5.6.6 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file

--- a/manpage_examples.txt
+++ b/manpage_examples.txt
@@ -76,4 +76,4 @@ Key Device Examples (Linux):
             java -cp finalcrypt.jar rdj/CLUI --encrypt -k /dev/sdc1 -t myfile
             java -cp finalcrypt.jar rdj/CLUI --decrypt -k /dev/sdc1 -t myfile
 
-FinalCrypt 5.6.5 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file
+FinalCrypt 5.6.6 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file

--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -8,7 +8,7 @@ application.homepage=http://www.finalcrypt.org/
 application.splash=
 application.title=FinalCrypt
 application.vendor=FinalCrypt
-application.implementation.version=5.6.5
+application.implementation.version=5.6.6
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=false
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4

--- a/src/rdj/Audio.java
+++ b/src/rdj/Audio.java
@@ -65,6 +65,8 @@ public class Audio
     public static final String VOI_ENCRYPT_FILES =		    "/rdj/audio/voice/encrypt_files";
     public static final String VOI_ENCRYPTING_FILES =		    "/rdj/audio/voice/encrypting_files";
     public static final String VOI_ENCRYPT_OR_DECRYPT_FILES =	    "/rdj/audio/voice/encrypt_or_decrypt_files";
+    public static final String VOI_FINISHED_DECRYPTING =	    "/rdj/audio/voice/finished_decrypting";
+    public static final String VOI_FINISHED_ENCRYPTING =	    "/rdj/audio/voice/finished_encrypting";
     public static final String VOI_SCANNING_FILES =		    "/rdj/audio/voice/scanning_files";
     public static final String VOI_SELECT_FILES =		    "/rdj/audio/voice/select_files";
     public static final String VOI_SELECT_KEY =			    "/rdj/audio/voice/select_key";

--- a/src/rdj/FinalCrypt.java
+++ b/src/rdj/FinalCrypt.java
@@ -446,7 +446,8 @@ public class FinalCrypt extends Thread
 
 				ByteBuffer  randomBuffer =	    ByteBuffer.allocate(bufferSize); randomBuffer.clear();
 
-				ui.log(UTF8_CREATE_SYMBOL + UTF8_KEY_SYMBOL + " \"" + dynamicKeyFCPath.path.toAbsolutePath() + "\" ", true, false, false, false, false);
+//				ui.log(UTF8_CREATE_SYMBOL + UTF8_KEY_SYMBOL + " \"" + dynamicKeyFCPath.path.toAbsolutePath() + "\" ", true, false, false, false, false);
+				ui.log(UTF8_CREATE_SYMBOL + UTF8_KEY_SYMBOL + " \"" + targetDestinPath.toAbsolutePath().toString() + "\" ", true, false, false, false, false);
 				ui.log(UTF8_CREATE_SYMBOL + UTF8_KEY_SYMBOL, false, true, true, false, false);
 
 				write1loop: while ( (totalTranfered < ( newTargetSourceFCPath.size + FCPath.MAC_SIZE )) && (! inputEnded ))

--- a/src/rdj/GUIFX.java
+++ b/src/rdj/GUIFX.java
@@ -255,6 +255,9 @@ public class GUIFX extends Application implements UI, Initializable
     private final String ENCRYPTING_FILES =		"Encrypting Files";
     private final String DECRYPTING_FILES =		"Decrypting Files";
 
+    private final String FINISHED_ENCRYPTING =		"Finished Encrypting";
+    private final String FINISHED_DECRYPTING =		"Finished Decrypting";
+
     private final String USER_GUID_TEXT_FILL_BASE =	"#706050";// #5A2D0C #663B1B
     private final String USER_GUID_TEXT_FILL_HIGH =	"#BBBBBB";
 
@@ -1082,7 +1085,14 @@ public class GUIFX extends Application implements UI, Initializable
 		    // ============================================================================================================================
 
 
-		    disableFileChoosers(false, true);
+		    if (System.getProperty("os.name").toLowerCase().indexOf("mac") == -1) // Again due to Mac OSX
+		    {
+			disableFileChoosers(false, true, true);
+		    }
+		    else
+		    {
+			disableFileChoosers(false, true, true);
+		    }
 
 		    FadeTransition sysmonFadeTransition = new FadeTransition(Duration.millis(2000), sysMonCanvas);
 		    sysmonFadeTransition.setFromValue(0.0f);
@@ -1181,48 +1191,70 @@ public class GUIFX extends Application implements UI, Initializable
 //        alert.showAndWait();        
     }
     
-    private void disableFileChoosers(boolean param, boolean firsttime)
+    private void disableFileChoosers(boolean param, boolean firsttime, boolean animated)
     {
-	if (param) // disable filechoosers
+	if (! animated)
 	{
-	    keyFileSwingNode.setMouseTransparent(param); targetFileSwingNode.setMouseTransparent(param);
-	    
-	    Timeline disableTimeline = new Timeline
-	    (
-		    new KeyFrame(Duration.ZERO,
-		    new KeyValue(keyFileFoil.opacityProperty(), 0.1),
-		    new KeyValue(targetFileFoil.opacityProperty(), 0.1)),
-		    new KeyFrame(Duration.seconds(1),
-		    new KeyValue(keyFileFoil.opacityProperty(), 0.5),
-		    new KeyValue(targetFileFoil.opacityProperty(), 0.5))
-	    );
-	    disableTimeline.setAutoReverse(false);
-	    disableTimeline.setOnFinished((ActionEvent actionEvent) -> { });
-	    disableTimeline.play();
-	}
-	else // enable filechoosers
-	{
-	    Timeline enableTimeline = new Timeline
-	    (
-		    new KeyFrame(Duration.ZERO,
-		    new KeyValue(keyFileFoil.opacityProperty(), 0.5),
-		    new KeyValue(targetFileFoil.opacityProperty(), 0.5)),
-		    new KeyFrame(Duration.seconds(1),
-		    new KeyValue(keyFileFoil.opacityProperty(), 0.1),
-		    new KeyValue(targetFileFoil.opacityProperty(), 0.1))
-	    );
-	    enableTimeline.setAutoReverse(false);
-	    enableTimeline.setOnFinished((ActionEvent actionEvent) ->
+	    if (param) // disable filechoosers
 	    {
 		keyFileSwingNode.setMouseTransparent(param); targetFileSwingNode.setMouseTransparent(param);
-		
+		keyFileFoil.setOpacity(0.5);
+		targetFileFoil.setOpacity(0.5);
+	    }
+	    else // enable filechoosers
+	    {
+		keyFileSwingNode.setMouseTransparent(param); targetFileSwingNode.setMouseTransparent(param);
+		keyFileFoil.setOpacity(0.1);
+		targetFileFoil.setOpacity(0.1);
 		if (firsttime)
 		{
 //			keyFileChooserPropertyCheck();
 		}
-	    });
-	    enableTimeline.play();
+	    }
 	}
+	else
+	{
+	    if (param) // disable filechoosers
+	    {
+		keyFileSwingNode.setMouseTransparent(param); targetFileSwingNode.setMouseTransparent(param);
+
+		Timeline disableTimeline = new Timeline
+		(
+			new KeyFrame(Duration.ZERO,
+			new KeyValue(keyFileFoil.opacityProperty(), 0.1),
+			new KeyValue(targetFileFoil.opacityProperty(), 0.1)),
+			new KeyFrame(Duration.seconds(1),
+			new KeyValue(keyFileFoil.opacityProperty(), 0.5),
+			new KeyValue(targetFileFoil.opacityProperty(), 0.5))
+		);
+		disableTimeline.setAutoReverse(false);
+		disableTimeline.setOnFinished((ActionEvent actionEvent) -> { });
+		disableTimeline.play();
+	    }
+	    else // enable filechoosers
+	    {
+		Timeline enableTimeline = new Timeline
+		(
+			new KeyFrame(Duration.ZERO,
+			new KeyValue(keyFileFoil.opacityProperty(), 0.5),
+			new KeyValue(targetFileFoil.opacityProperty(), 0.5)),
+			new KeyFrame(Duration.seconds(1),
+			new KeyValue(keyFileFoil.opacityProperty(), 0.1),
+			new KeyValue(targetFileFoil.opacityProperty(), 0.1))
+		);
+		enableTimeline.setAutoReverse(false);
+		enableTimeline.setOnFinished((ActionEvent actionEvent) ->
+		{
+		    keyFileSwingNode.setMouseTransparent(param); targetFileSwingNode.setMouseTransparent(param);
+
+		    if (firsttime)
+		    {
+    //			keyFileChooserPropertyCheck();
+		    }
+		});
+		enableTimeline.play();
+	    }
+	}	    
     }
     
     synchronized public void userGuidanceMessage(String message, int fontsize, boolean bottomleft, boolean topleft, boolean topright, boolean bottomright, String audio, int media_Delay)
@@ -1908,7 +1940,7 @@ public class GUIFX extends Application implements UI, Initializable
 			finalCrypt.setPwd(pwdField.getText()); finalCrypt.setPwdBytes(pwdField.getText()); finalCrypt.resetPwdPos(); finalCrypt.resetPwdBytesPos();
 
 			keyImageView.setOpacity(0.8);
-			filesProgressBar.setVisible(true); filesProgressBar.setProgress(ProgressBar.INDETERMINATE_PROGRESS);
+			if ((targetPathList != null) && (targetPathList.size() > 0)) { filesProgressBar.setVisible(true); filesProgressBar.setProgress(ProgressBar.INDETERMINATE_PROGRESS); }
 
 			new Sound().play(this, Audio.SND_READY,Audio.AUDIO_CODEC);
 			userGuidanceMessage(SCANNING_FILES, 64, false, false, false, false, Voice.VOI_SCANNING_FILES, 0);
@@ -2943,7 +2975,15 @@ public class GUIFX extends Application implements UI, Initializable
 
 	    processRunning = true;
 	    
-	    disableFileChoosers(true, false);
+	    if (System.getProperty("os.name").toLowerCase().indexOf("mac") == -1) // Again due to Mac OSX
+	    {
+		disableFileChoosers(true, false, true);
+	    }
+	    else
+	    {
+		disableFileChoosers(true, false, true);
+	    }
+		
 	    
 	    encryptButton.setDisable(true);
 	    decryptButton.setDisable(true);
@@ -3049,94 +3089,108 @@ public class GUIFX extends Application implements UI, Initializable
         
     @Override public void processFinished(FCPathList<FCPath> openFCPathList, boolean open)
     {
-        Platform.runLater(() ->
+	Platform.runLater(() ->
 	{
-	    new Sound().play(this, Audio.SND_SHUTDOWN,Audio.AUDIO_CODEC);
+	    fileProgressBar.setProgress(100.0); filesProgressBar.setProgress(100.0);
 
-	    megaBytesPerSecond = 0;
-	    updateSystemMonitor();
-
-	    // Clocks	
-//	    if ((processRunningMode == ENCRYPT_MODE)  || (processRunningMode == DECRYPT_MODE)) { UPDATE_CLOCKS_TIMELINE.stop(); }
-	    UPDATE_CLOCKS_TIMELINE.stop();
-	    
-	    targetFCPathList = new FCPathList<FCPath>();
+	    if ( processRunningMode == ENCRYPT_MODE ) { userGuidanceMessage(FINISHED_ENCRYPTING, 64, false, false, false, false, Voice.VOI_FINISHED_ENCRYPTING, 0); }
+	    if ( processRunningMode == DECRYPT_MODE ) { userGuidanceMessage(FINISHED_DECRYPTING, 64, false, false, false, false, Voice.VOI_FINISHED_DECRYPTING, 0); }
 	    
-	    updateDashboard(targetFCPathList);
-	    
-	    disableFileChoosers(false, false);
-	    
-	    encryptButton.setDisable(true);
-	    decryptButton.setDisable(true);
-	    if ( keyFCPath.isValidKey )
+	    Timeline timeline = new Timeline(new KeyFrame( Duration.millis(2000), ae ->
 	    {
-		pwdField.setDisable(false);
-		if ((showPasswordCheckBox.isVisible()) && (pwdField.getText().length() == 0)) { passwordHeaderLabel.setText(PASSWORD_OPTIONAL); } else { passwordHeaderLabel.setText(PASSWORD_SET); }
-		pwdtxtField.setDisable(false);
-		keyImageView.setImage(KEY_FILE_IMAGE);
-		keyImageView.setOpacity(0.8);
-	    }
-	    pauseToggleButton.setDisable(true);
-	    stopButton.setDisable(true);
-	    
-//	    keyButton.setDisable(false);
-	    
-	    fileProgressBar.setProgress(0); fileProgressBar.setVisible(false);
-	    filesProgressBar.setProgress(0); filesProgressBar.setVisible(false);
-	    
-//	    encryptionModeToggleButton.setMouseTransparent(!encryptionModeToggleButton.isMouseTransparent());
-//	    encryptionModeAnchorPane.setMouseTransparent(!encryptionModeAnchorPane.isMouseTransparent());
-	    
-//	    if (System.getProperty("os.name").toLowerCase().indexOf("mac") == -1) // Due to Mac OSX // to 2
-//	    {
-		if ( keyFCPath.isValidKeyDir ) { updateFileChoosers(true, true); } else { updateFileChoosers(true, false); } // if keyfile selected then NO update keyFileChooser keeping key file selected; processFinished()
-//	    }
-	    
-	    processRunningMode = NONE;
-	    processRunning = false;
+		fileProgressBar.setVisible(false);filesProgressBar.setVisible(false);
+		
+		megaBytesPerSecond = 0;
+		updateSystemMonitor();
 
-	    targetFCPathList = new FCPathList<FCPath>();
-	    buildReady(targetFCPathList, false);
+		// Clocks	
+    //	    if ((processRunningMode == ENCRYPT_MODE)  || (processRunningMode == DECRYPT_MODE)) { UPDATE_CLOCKS_TIMELINE.stop(); }
+		UPDATE_CLOCKS_TIMELINE.stop();
 
-//	    if (clockUpdated)
-//	    {
-		remainingTimeLabel.setText("00:00:00");
-		totalTimeLabel.setText(elapsedTimeLabel.getText());
-//	    }
+		targetFCPathList = new FCPathList<FCPath>();
+		updateDashboard(targetFCPathList);
+
+		encryptButton.setDisable(true);
+		decryptButton.setDisable(true);
+		if ( keyFCPath.isValidKey )
+		{
+		    pwdField.setDisable(false);
+		    if ((showPasswordCheckBox.isVisible()) && (pwdField.getText().length() == 0)) { passwordHeaderLabel.setText(PASSWORD_OPTIONAL); } else { passwordHeaderLabel.setText(PASSWORD_SET); }
+		    pwdtxtField.setDisable(false);
+		    keyImageView.setImage(KEY_FILE_IMAGE);
+		    keyImageView.setOpacity(0.8);
+		}
+		pauseToggleButton.setDisable(true);
+		stopButton.setDisable(true);
 
-//	    The Open selected file when finished section
+    //	    keyButton.setDisable(false);
 
-	    Thread openThread;
-	    openThread = new Thread(() ->
-	    {
-		try { Thread.sleep(1000); } catch (InterruptedException ex) {  }
-		if (open)
+
+    //	    encryptionModeToggleButton.setMouseTransparent(!encryptionModeToggleButton.isMouseTransparent());
+    //	    encryptionModeAnchorPane.setMouseTransparent(!encryptionModeAnchorPane.isMouseTransparent());
+
+    //	    if (System.getProperty("os.name").toLowerCase().indexOf("mac") == -1) // Due to Mac OSX // to 2
+    //	    {
+		    if ( keyFCPath.isValidKeyDir ) { updateFileChoosers(true, true); } else { updateFileChoosers(true, false); } // if keyfile selected then NO update keyFileChooser keeping key file selected; processFinished()
+    //	    }
+
+		processRunningMode = NONE;
+		processRunning = false;
+
+		targetFCPathList = new FCPathList<FCPath>();
+		buildReady(targetFCPathList, false);
+
+    //	    if (clockUpdated)
+    //	    {
+		    remainingTimeLabel.setText("00:00:00");
+		    totalTimeLabel.setText(elapsedTimeLabel.getText());
+    //	    }
+
+    //	    The Open selected file when finished section
+
+		Thread openThread;
+		openThread = new Thread(() ->
 		{
-		    for (Iterator fcPathIterator = openFCPathList.iterator(); fcPathIterator.hasNext();)
+		    try { Thread.sleep(1000); } catch (InterruptedException ex) {  }
+		    if (open)
 		    {
-			FCPath openFCPath = (FCPath) fcPathIterator.next();
-			Path newPath = Paths.get(openFCPath.path.toAbsolutePath().toString().substring(0, openFCPath.path.toAbsolutePath().toString().lastIndexOf('.')));
+			for (Iterator fcPathIterator = openFCPathList.iterator(); fcPathIterator.hasNext();)
+			{
+			    FCPath openFCPath = (FCPath) fcPathIterator.next();
+			    Path newPath = Paths.get(openFCPath.path.toAbsolutePath().toString().substring(0, openFCPath.path.toAbsolutePath().toString().lastIndexOf('.')));
 
-			new Sound().play(this, Audio.SND_OPEN,Audio.AUDIO_CODEC);
-			try { Desktop.getDesktop().open(newPath.toFile()); }
-			catch (IOException ex) { log("Error: Desktop.getDesktop().open(" + newPath.toFile().getAbsolutePath().toString() + "); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
+			    new Sound().play(this, Audio.SND_OPEN,Audio.AUDIO_CODEC);
+			    try { Desktop.getDesktop().open(newPath.toFile()); }
+			    catch (IOException ex) { log("Error: Desktop.getDesktop().open(" + newPath.toFile().getAbsolutePath().toString() + "); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
 
-			targetFCPathList = new FCPathList<FCPath>(); updateDashboard(targetFCPathList);
-			Platform.runLater(new Runnable()
-			{
-			    @Override public void run()
+			    targetFCPathList = new FCPathList<FCPath>(); updateDashboard(targetFCPathList);
+			    Platform.runLater(new Runnable()
 			    {
-				encryptButton.setDisable(true);
-				decryptButton.setDisable(true);
-//				keyButton.setDisable(true);  keyButton.setTextFill(Color.GREY); keyButton.setText(CREATE_KEY); keyButton.setVisible(false);
-			    }
-			});
+				@Override public void run()
+				{
+				    encryptButton.setDisable(true);
+				    decryptButton.setDisable(true);
+    //				keyButton.setDisable(true);  keyButton.setTextFill(Color.GREY); keyButton.setText(CREATE_KEY); keyButton.setVisible(false);
+				}
+			    });
+			}
 		    }
+		});
+		openThread.setName("openThread");
+		openThread.setDaemon(true);
+		openThread.start();
+
+		new Sound().play(this, Audio.SND_SHUTDOWN,Audio.AUDIO_CODEC);
+
+		if (System.getProperty("os.name").toLowerCase().indexOf("mac") == -1) // Again due to Mac OSX
+		{
+		    disableFileChoosers(false, false, true);
 		}
-	    });
-	    openThread.setName("openThread");
-	    openThread.setDaemon(true);
-	    openThread.start();
+		else
+		{
+		    disableFileChoosers(false, false, true);
+		}
+	    })); timeline.play();
 	});
     }    
     
@@ -3148,7 +3202,7 @@ public class GUIFX extends Application implements UI, Initializable
 	{
 	    if (updateTargetFC)
 	    {		    
-		    Timeline timeline = new Timeline(new KeyFrame( Duration.millis(100), ae ->
+		    Timeline timeline = new Timeline(new KeyFrame( Duration.millis(500), ae ->
 		    {
 //			tgtFileChooser.rescanCurrentDirectory();
 			tgtFileChooser.setFileFilter(keyFileChooser.getAcceptAllFileFilter());
@@ -3297,7 +3351,7 @@ public class GUIFX extends Application implements UI, Initializable
         String platform = System.getProperty("os.name").toLowerCase(); // Due to a nasty JFileChooser focus issue on Mac
         if ( platform.indexOf("mac") != -1 ) // if it is a mac
 	{
-	    Timeline timeline = new Timeline(new KeyFrame( Duration.millis(100), ae -> 
+	    Timeline timeline = new Timeline(new KeyFrame( Duration.millis(200), ae -> 
 	    {
 		targetFileSwingNode.setContent(tgtFileChooser); // Delay setting this JFileChooser avoiding a simultanious key and target JFileChooser focus conflict causing focus to endlessly flipflop between the two JFileChoosers
 		tgtFileChooser.setVisible(false); tgtFileChooser.setVisible(true); keyFileChooser.setVisible(false); keyFileChooser.setVisible(true); // Reldraw FileChoosers

--- a/src/rdj/Sound.java
+++ b/src/rdj/Sound.java
@@ -46,8 +46,15 @@ public class Sound extends Audio
 	    case MP3:		media = new Media(ui.getClass().getResource(audio + ".mp3").toExternalForm());		break;
 	    default:		media = new Media(ui.getClass().getResource(audio + ".wav").toExternalForm());		break;
 	}
-//	playJavaX(ui, media, audio_codec);  // Stops playing spontaniously on all OSes
-	playJavaFX(ui, media, audio_codec); // Plays fast, but crashes often on Linux (libld.so native player issue)
+
+	if  (
+		    ((media.getSource().contains("sounds")) && ((sound_Is_Enabled)))
+		||  ((media.getSource().contains("voice")) && ((voice_Is_Enabled)))
+	    )
+	{
+//	    playJavaX(ui, media, audio_codec);  // Stops playing spontaniously on all OSes
+	    playJavaFX(ui, media, audio_codec); // Plays fast, but crashes often on Linux (libld.so native player issue)
+	}
     }
     
     synchronized public void playJavaX(UI ui, Media media, int audio_codec) // javax.sound.sampled.AudioSystem

--- a/src/rdj/Support.java
+++ b/src/rdj/Support.java
@@ -84,7 +84,10 @@ public class Support extends Application implements Initializable
         
     private void closeWindow()
     {
-	Stage stage = (Stage) facebookImageView.getScene().getWindow(); stage.close();
+	Platform.runLater(() ->
+	{
+	    Stage stage = (Stage) facebookImageView.getScene().getWindow(); stage.close();
+	});
     }
 
     public static void main(String[] args)
@@ -102,6 +105,7 @@ public class Support extends Application implements Initializable
 	    try {  Desktop.getDesktop().browse(new URI("https://www.facebook.com/share.php?u=http://www.finalcrypt.org/")); prefs.put("Shared", "Yes"); }
 	    catch (URISyntaxException ex) { guifx.log("Error: URISyntaxException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
 	    catch (IOException ex) { guifx.log("Error: IOException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
+	    closeWindow();
 	});
 	shareThread.setName("shareThread");
 	shareThread.setDaemon(true);
@@ -117,6 +121,7 @@ public class Support extends Application implements Initializable
 	    try {  Desktop.getDesktop().browse(new URI("https://twitter.com/share?original_referer=/&text=FinalCrypt%20-%20THE%20WORLD'S%20MOST%20UNBREAKABLE%20ENCRYPTION&url=http://www.finalcrypt.org/")); prefs.put("Shared", "Yes"); }
 	    catch (URISyntaxException ex) { guifx.log("Error: URISyntaxException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
 	    catch (IOException ex) { guifx.log("Error: IOException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
+	    closeWindow();
 	});
 	shareThread.setName("shareThread");
 	shareThread.setDaemon(true);
@@ -132,6 +137,7 @@ public class Support extends Application implements Initializable
 	    try {  Desktop.getDesktop().browse(new URI("https://www.linkedin.com/cws/share?url=http://www.finalcrypt.org/")); prefs.put("Shared", "Yes"); }
 	    catch (URISyntaxException ex) { guifx.log("Error: URISyntaxException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
 	    catch (IOException ex) { guifx.log("Error: IOException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
+	    closeWindow();
 	});
 	shareThread.setName("shareThread");
 	shareThread.setDaemon(true);
@@ -147,6 +153,7 @@ public class Support extends Application implements Initializable
 	    try {  Desktop.getDesktop().browse(new URI("http://pinterest.com/pin/create/button/?url=http://www.finalcrypt.org/&media=http://www.finalcrypt.org/FinalCrypt_Encrypt.png&description=Free%20File%20Encryption")); prefs.put("Shared", "Yes"); }
 	    catch (URISyntaxException ex) { guifx.log("Error: URISyntaxException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
 	    catch (IOException ex) { guifx.log("Error: IOException: Desktop.getDesktop().open(file); " + ex.getMessage() + "\r\n", true, true, true, true, false); }
+	    closeWindow();
 	});
 	shareThread.setName("shareThread");
 	shareThread.setDaemon(true);
@@ -160,6 +167,7 @@ public class Support extends Application implements Initializable
 	Thread shareThread; shareThread = new Thread(() ->
 	{
 	    Version.openWebSite(guifx);
+	    closeWindow();
 	});
 	shareThread.setName("shareThread");
 	shareThread.setDaemon(true);

--- a/src/rdj/VERSION
+++ b/src/rdj/VERSION
@@ -1 +1 @@
-5.6.5
\ No newline at end of file
+5.6.6
\ No newline at end of file

--- a/src/rdj/VERSION2
+++ b/src/rdj/VERSION2
@@ -1,4 +1,4 @@
-[Version] =		{5.6.5}
+[Version] =		{5.6.6}
 [] = {} ================================================================
 [Release Notes] =	{You are using a very old version of FinalCrypt}
 [Release Message] =	{Please visit the website and download the latest}
@@ -19,15 +19,11 @@
 [Upgrade Notes] =	{Brute Force only works on the Command Line Interface}
 [Upgrade Notes] =	{}
 [] = {} ----------------------------------------------------------------
-[Update Notes] =	{Update 5}
+[Update Notes] =	{Update 6}
 [Update Notes] =	{}
-[Update Notes] =	{Fixed Brute Force Dict-Size, Heap-Mem & Performance}
-[Update Notes] =	{}
-[Update Notes] =	{This update provides:}
-[Update Notes] =	{}
-[Update Notes] =	{Out of heapmem bugfix using a large dictionary file}
-[Update Notes] =	{Buffered loading of limitless sized dictionary file}
-[Update Notes] =	{Better Multitasking with sliced up dictionary files}
+[Update Notes] =	{Improved Apple OSX stability FinalCrypt User Interface}
+[Update Notes] =	{Support Window now closes on Home / Share button click}
+[Update Notes] =	{No longer printing keypaths on statusbar creating keys}
 [] = {} --------------------------------------------------------------------------------------------------------
 [Alert Subject_] =	{}
 [Alert Notes_] =	{}

Binary files /dev/null and b/src/rdj/audio/voice/finished_decrypting.aiff differ

Binary files /dev/null and b/src/rdj/audio/voice/finished_encrypting.aiff differ