Commit: 44a31bc0875b76438f591bee3ded145eabc17f0b - FinalCrypt (git)

FinalCrypt - The No¹ One-Time Pad Encryption

Commit MetaInfo

• Revisión: 44a31bc0875b76438f591bee3ded145eabc17f0b (tree)
• Tiempo: 2020-07-08 04:14:22
• Autor: ron <ronuitzaandam@gmai...>
• Commiter: ron

Log Message

Date: 2020-07-07 Version: 6.3.9

Added 3 Sec HTTP Timeout to speedup HTTP(S) connect
This also improves all other HTTP Connect Responses
General, Support, Update, Download or Share Webpage
This fixes FinalCrypt's unresponsiveness at startup
when the webservers of the hosting are unresponsive

Cambiar Resumen

• modified: src/rdj/GUIFX.java
• modified: src/rdj/Version.java

Diferencia incremental

--- a/src/rdj/GUIFX.java
+++ b/src/rdj/GUIFX.java
@@ -1791,65 +1791,47 @@ public class GUIFX extends Application implements UI, Initializable
 
     private void checkUpdate(boolean userActivated)
     {
-//        Platform.runLater(() ->
-//	{
-	    Thread pleaseShareThread = new Thread(new Runnable()
-	    {
-		@Override
-		@SuppressWarnings({"static-access"})
-		public void run()
-		{
-		    Platform.runLater(() ->
-		    {
-			version = new Version(ui);
-			version.checkCurrentlyInstalledVersion(GUIFX.this);
-			version.checkLatestOnlineVersion(GUIFX.this);
-			prefs.putLong("Update Checked", now); flushPrefs(prefs); 
-			String[] lines = version.getUpdateStatus().split("\r\n");
-			for (String line: lines) { log(line + "\r\n", true, true, true, false, false); }
-
-			// Just for testing purposes (uncomment)
-			// alertCurrentVersionIsUp2Date();
-			// alertCurrentVersionCanBeUpdated();
-			// alertCurrentVersionIsDevelopement();
-			// alertlatestVersionUnknown();
-			// latestAlertMessage();
-			//// currentAlertMessage(); // Should never be tested and used in production
-
-			if (version.latestVersionIsKnown())
-			{
-			    if (( ! version.versionIsDifferent() ) && ( userActivated ))	 { alertCurrentVersionIsUp2Date(); }
-			    else { if (version.versionCanBeUpdated())				 { alertCurrentVersionCanBeUpdated(); }
-			    else if ( (version.versionIsDevelopment() ) && ( userActivated ) )   { alertCurrentVersionIsDevelopement(); } }
-			}
-			else									 { alertlatestVersionUnknown(); }
-
-	    //	    After all check update processing comes an optional alert	    
-			if (
-				( true ) // Leave to "true" to enable online alerts
-				&& ( version.getLatestAlertSubjectString() != null)
-				&& ( ! version.getLatestAlertSubjectString().isEmpty())
-				&& ( version.getLatestAlertString() != null)
-				&& ( ! version.getLatestAlertString().isEmpty())
-			    )   // Only display Alert in VERSION2 file
-			{ latestAlertMessage(); }
-
-			if (
-				( false ) // Leave to "false" Only set to true to test an alert
-				&& ( version.getCurrentAlertSubjectString() != null)
-				&& ( ! version.getCurrentAlertSubjectString().isEmpty())
-				&& ( version.getCurrentAlertString() != null)
-				&& ( ! version.getCurrentAlertString().isEmpty())
-			    )   // Only display Alert in VERSION2 file
-			{ currentAlertMessage(); }
-		    });
-					}
-	    });
-	    pleaseShareThread.setName("pleaseShareThread");
-	    pleaseShareThread.setDaemon(true);
-	    pleaseShareThread.start();
-
-//	});
+	version = new Version(this);
+	version.checkCurrentlyInstalledVersion(GUIFX.this);
+	version.checkLatestOnlineVersion(GUIFX.this);
+	prefs.putLong("Update Checked", now); flushPrefs(prefs); 
+	String[] lines = version.getUpdateStatus().split("\r\n");
+	for (String line: lines) { log(line + "\r\n", true, true, true, false, false); }
+
+	// Just for testing purposes (uncomment)
+	// alertCurrentVersionIsUp2Date();
+	// alertCurrentVersionCanBeUpdated();
+	// alertCurrentVersionIsDevelopement();
+	// alertlatestVersionUnknown();
+	// latestAlertMessage();
+	//// currentAlertMessage(); // Should never be tested and used in production
+
+	if (version.latestVersionIsKnown())
+	{
+	    if (( ! version.versionIsDifferent() ) && ( userActivated ))	 { alertCurrentVersionIsUp2Date(); }
+	    else { if (version.versionCanBeUpdated())				 { alertCurrentVersionCanBeUpdated(); }
+	    else if ( (version.versionIsDevelopment() ) && ( userActivated ) )   { alertCurrentVersionIsDevelopement(); } }
+	}
+	else									 { alertlatestVersionUnknown(); }
+
+//	    After all check update processing comes an optional alert	    
+	if (
+		( true ) // Leave to "true" to enable online alerts
+		&& ( version.getLatestAlertSubjectString() != null)
+		&& ( ! version.getLatestAlertSubjectString().isEmpty())
+		&& ( version.getLatestAlertString() != null)
+		&& ( ! version.getLatestAlertString().isEmpty())
+	    )   // Only display Alert in VERSION2 file
+	{ latestAlertMessage(); }
+
+	if (
+		( false ) // Leave to "false" Only set to true to test an alert
+		&& ( version.getCurrentAlertSubjectString() != null)
+		&& ( ! version.getCurrentAlertSubjectString().isEmpty())
+		&& ( version.getCurrentAlertString() != null)
+		&& ( ! version.getCurrentAlertString().isEmpty())
+	    )   // Only display Alert in VERSION2 file
+	{ currentAlertMessage(); }
     }
     
     private void alertCurrentVersionIsUp2Date()

--- a/src/rdj/Version.java
+++ b/src/rdj/Version.java
@@ -107,8 +107,13 @@ public class Version
 									    ,"http://www.google.com/search?q=finalcrypt+homepage&oq=finalcrypt+homepage"			// tested
 									};
 
+//  Emulate bad server response
+//  nc -l -p 8080
+//  "http://localhost:8080/VERSION2"
+    
     private static final String[] REMOTEVERSIONFILEURLSTRINGARRAY =	{
 									     "https://www.finalcrypt.org/VERSION2"								// tested
+//									    ,"http://localhost:8080/VERSION2"									// tested
 									    ,"http://www.finalcrypt.org/VERSION2"								// tested
 									    ,"https://www.finalcrypt.com/VERSION2"								// tested
 									    ,"http://www.finalcrypt.com/VERSION2"								// tested
@@ -412,7 +417,7 @@ public class Version
 	    
 	    if (remoteVERSION2FileString.startsWith("https://")) { remoteContent = httpsGetRequest(ui, remoteVERSION2FileString); } else { remoteContent = httpGetRequest(ui, remoteVERSION2FileString); }
 	    
-//	    ui.test("\r\nNEXT\r\n");
+//	    ui.test("Remote Content: " + remoteContent + "\r\n\r\n");
 	    if ((remoteContent != null) && (! checkOnlineFailed))
 	    {
 		String[] lines = remoteContent.split("\n"); // VERSION2 file was create on linux with unix newlines \n