return username unchanged if it doesn't look like a phone number, cf. #88

3 files changed, 11 insertions, 40 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
index 952bd137..a744cf72 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.gui.bku.mobile.MobileBKUs;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
-import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
 import at.asit.pdfover.gui.utils.LocaleSerializer;
 import at.asit.pdfover.commons.Messages;
@@ -568,19 +567,10 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 	 */
 	@Override
 	public void setDefaultMobileNumber(String number) {
-		try {
-			if (number == null || number.trim().isEmpty()) {
-				this.configuration.setMobileNumber(STRING_EMPTY);
-			} else {
-				this.configuration.setMobileNumber(number);
-			}
-		} catch (InvalidNumberException e) {
-			log.error("Error setting mobile number", e); //$NON-NLS-1$
-			try {
-				this.configuration.setMobileNumber(STRING_EMPTY);
-			} catch (InvalidNumberException e1) {
-				// Ignore
-			}
+		if (number == null || number.trim().isEmpty()) {
+			this.configuration.setMobileNumber(STRING_EMPTY);
+		} else {
+			this.configuration.setMobileNumber(number);
 		}
 	}
 
@@ -589,19 +579,10 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 	 */
 	@Override
 	public void setDefaultMobileNumberOverlay(String number) {
-		try {
-			if (number == null || number.trim().isEmpty()) {
-				this.configurationOverlay.setMobileNumber(STRING_EMPTY);
-			} else {
-				this.configurationOverlay.setMobileNumber(number);
-			}
-		} catch (InvalidNumberException e) {
-			log.error("Error setting mobile number", e); //$NON-NLS-1$
-			try {
-				this.configurationOverlay.setMobileNumber(STRING_EMPTY);
-			} catch (InvalidNumberException e1) {
-				// Ignore
-			}
+		if (number == null || number.trim().isEmpty()) {
+			this.configurationOverlay.setMobileNumber(STRING_EMPTY);
+		} else {
+			this.configurationOverlay.setMobileNumber(number);
 		}
 	}
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
index 14383913..e2381a6f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
@@ -22,7 +22,6 @@ import org.eclipse.swt.graphics.Point;
 
 import at.asit.pdfover.gui.bku.mobile.MobileBKUs;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
-import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
 import at.asit.pdfover.signator.BKUs;
 import at.asit.pdfover.signator.SignaturePosition;
@@ -53,9 +52,8 @@ public interface ConfigurationContainer {
 	/**
 	 * Sets the mobile phone number 
 	 * @param number the mobile phone number
-	 * @throws InvalidNumberException
 	 */
-	public void setMobileNumber(String number) throws InvalidNumberException;
+	public void setMobileNumber(String number);
 
 	/**
 	 * Gets the mobile phone number
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
index 92153fb4..c989d59f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
@@ -32,9 +32,7 @@ import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.gui.bku.mobile.MobileBKUHelper;
 import at.asit.pdfover.gui.bku.mobile.MobileBKUs;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
-import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
-import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.signator.BKUs;
 import at.asit.pdfover.signator.SignaturePosition;
 
@@ -200,18 +198,12 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 	 * @see at.asit.pdfover.gui.composites.ConfigurationContainer#setNumber(java.lang.String)
 	 */
 	@Override
-	public void setMobileNumber(String number) throws InvalidNumberException {
+	public void setMobileNumber(String number) {
 		if(number == null || number.trim().isEmpty()) {
 			this.mobileNumber = null;
 			return;
 		}
-		try {
-			this.mobileNumber = MobileBKUHelper.normalizeMobileNumber(number);
-		} catch (InvalidNumberException e) {
-			// assume this is a username for ID-Austria
-			// todo: re-evaluate this (cf. #88)
-			this.mobileNumber = number;
-		}
+		this.mobileNumber = MobileBKUHelper.normalizeMobileNumber(number);
 	}