Use domain instead of IP for default server.

Nutomic · Mar 8, 2016 · 127acfb · 127acfb
1 parent ca2c4c6
commit 127acfb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/android/src/main/scala/com/nutomic/ensichat/activities/FirstStartActivity.scala b/android/src/main/scala/com/nutomic/ensichat/activities/FirstStartActivity.scala
@@ -74,7 +74,7 @@ class FirstStartActivity extends AppCompatActivity with OnEditorActionListener w
       .putBoolean(KeyNotificationSoundsOn,  DefaultNotificationSoundsOn)
       .putString(KeyScanInterval,           DefaultScanInterval.toString)
       .putString(KeyMaxConnections,         DefaultMaxConnections.toString)
-      .putString(KeyServers,                DefaultServers.mkString(", "))
+      .putString(KeyServers,                DefaultServers)
       .apply()
 
     startMainActivity()

diff --git a/core/src/main/scala/com/nutomic/ensichat/core/interfaces/SettingsInterface.scala b/core/src/main/scala/com/nutomic/ensichat/core/interfaces/SettingsInterface.scala
@@ -25,7 +25,8 @@ object SettingsInterface {
   val DefaultScanInterval         = 15
   val DefaultNotificationSoundsOn = true
   val DefaultMaxConnections       = 1000000
-  val DefaultServers              = Set("46.101.249.188:26344", "46.101.238.107:26344")
+  // When updating this, be sure to adjust the code in [[InternetInterface.create]].
+  val DefaultServers              = Set("ensichat.nutomic.com:26344").mkString(", ")
 
 }
 

diff --git a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala
@@ -39,6 +39,10 @@ class InternetInterface(connectionHandler: ConnectionHandler, crypto: Crypto,
    * Initializes and starts discovery and listening.
    */
   override def create(): Unit = {
+    val servers = settings.get(SettingsInterface.KeyServers, "")
+      .replace("46.101.249.188:26344", SettingsInterface.DefaultServers)
+    settings.put(SettingsInterface.KeyServers, servers)
+
     FutureHelper {
       serverThread.start()
       openAllConnections(maxConnections)

diff --git a/server/src/main/scala/com/nutomic/ensichat/server/Main.scala b/server/src/main/scala/com/nutomic/ensichat/server/Main.scala
@@ -38,7 +38,7 @@ object Main extends App with CallbackInterface {
     KeyFolder.mkdirs()
     Log.setLogInstance(logInstance)
     sys.addShutdownHook(connectionHandler.stop())
-    settings.put(KeyServers, DefaultServers.mkString(", "))
+    settings.put(KeyServers, DefaultServers)
 
     val parser = new OptionParser[Config]("ensichat") {
       head("ensichat")