Fixed an issue which may cause crashes if the gateway device fails to…

… respond in time or does not provide a gateway address.
dotStart · Jul 30, 2019 · ff8375f · ff8375f
1 parent 8dd238e
commit ff8375f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/ui/src/main/kotlin/tv/dotstart/beacon/controller/MainController.kt b/ui/src/main/kotlin/tv/dotstart/beacon/controller/MainController.kt
@@ -38,6 +38,7 @@ import tv.dotstart.beacon.exposure.PortMapper
 import tv.dotstart.beacon.repository.Model
 import tv.dotstart.beacon.repository.ServiceRegistry
 import tv.dotstart.beacon.repository.model.Port
+import tv.dotstart.beacon.util.Localization
 import tv.dotstart.beacon.util.splashWindow
 import java.net.URL
 import java.nio.file.Files
@@ -83,7 +84,7 @@ class MainController : Initializable {
         .addListener({ _, _, new -> this.onServiceSelect(new.value) })
     this.externalAddress.textProperty().bind(Bindings.createObjectBinding(
         Callable {
-          Gateway.externalAddress?.hostAddress
+          Gateway.externalAddress?.hostAddress ?: Localization("address.unknown")
         },
         Gateway.externalAddressProperty
     ))

diff --git a/ui/src/main/resources/localization/messages_de.properties b/ui/src/main/resources/localization/messages_de.properties
@@ -22,6 +22,8 @@ preload.upnp=UPnP Client wird gestartet
 preload.mapper=Port Mapper wird gestartet
 preload.gateway.fuse=Warten auf Internet Gateway
 
+address.unknown=Unbekannte Externe Adresse
+
 category.game=Spiele
 category.tool=Werkzeuge
 

diff --git a/ui/src/main/resources/localization/messages_en.properties b/ui/src/main/resources/localization/messages_en.properties
@@ -22,6 +22,8 @@ preload.upnp=Starting UPnP Client
 preload.mapper=Starting Port Mapper
 preload.gateway.fuse=Waiting for Internet Gateway
 
+address.unknown=Unknown External Address
+
 category.game=Games
 category.tool=Tools