From: Frédéric Perrin <fred@fperrin.net>
Date: Sun, 1 Dec 2019 21:37:03 +0000 (+0000)
Subject: Merge branch 'srtm-multi-sources' into fp-integration
X-Git-Tag: v19.2.fp3
X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=4af8c81c67e21029fe2d0380e757d1f090d15127;hp=1b1128bb59c2831eda4f40c48236f02e41581e54

Merge branch 'srtm-multi-sources' into fp-integration
---

diff --git a/src/tim/prune/function/settings/SetEarthdataAuthentication.java b/src/tim/prune/function/settings/SetEarthdataAuthentication.java
index d4a166a..146ed77 100644
--- a/src/tim/prune/function/settings/SetEarthdataAuthentication.java
+++ b/src/tim/prune/function/settings/SetEarthdataAuthentication.java
@@ -143,25 +143,25 @@ public class SetEarthdataAuthentication extends GenericFunction
 
 	private void prefillCurrentAuth()
 	{
+		_usernameField.setText("");
+		_passwordField.setText("");
+		_authAccepted.setText(" ");
+
 		String authString = Config.getConfigString(Config.KEY_EARTHDATA_AUTH);
-		if (authString == null)
-		{
-			_usernameField.setText("");
-			_passwordField.setText("");
-		}
-		String decoded = new String(Base64.getDecoder().decode(authString));
-		if (decoded.contains(":"))
+		try
 		{
-			_usernameField.setText(decoded.split(":", 2)[0]);
-			_passwordField.setText(decoded.split(":", 2)[1]);
+			String decoded = new String(Base64.getDecoder().decode(authString));
+			if (decoded.contains(":"))
+			{
+				_usernameField.setText(decoded.split(":", 2)[0]);
+				_passwordField.setText(decoded.split(":", 2)[1]);
+			}
 		}
-		else
+		catch (Exception e)
 		{
-			_usernameField.setText("");
-			_passwordField.setText("");
+			// empty settings, or invalid base64 data --leave blank
+			return;
 		}
-
-		_authAccepted.setText(" ");
 	}
 
 	private void testUsernameAndPassword()