From 2813538601b2f60c3b6d98f536252b820201b22d Mon Sep 17 00:00:00 2001
From: Xcreen <Xcreen@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:30:32 +0100
Subject: [PATCH] Added setting to enable/disable nsd

---
 .../net/xcreen/restsms/fragments/SettingsFragment.kt |  8 ++++++++
 .../main/java/net/xcreen/restsms/server/SMSServer.kt |  6 ++++--
 .../java/net/xcreen/restsms/server/ServerService.kt  |  2 ++
 app/src/main/res/layout/fragment_settings.xml        | 12 ++++++++++++
 app/src/main/res/values/strings.xml                  |  1 +
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.kt b/app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.kt
index d7e9f0e..c7e26b1 100644
--- a/app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.kt
+++ b/app/src/main/java/net/xcreen/restsms/fragments/SettingsFragment.kt
@@ -24,6 +24,7 @@ class SettingsFragment : Fragment() {
         val openBrowserCheckBox = rootView.findViewById<CheckBox>(R.id.settings_open_browser_checkbox)
         val disableLoggingCheckBox = rootView.findViewById<CheckBox>(R.id.settings_disable_logging_checkbox)
         val enableAuth = rootView.findViewById<CheckBox>(R.id.settings_enable_auth)
+        val enableNSD = rootView.findViewById<CheckBox>(R.id.settings_enable_nsd)
         val saveBtn = rootView.findViewById<Button>(R.id.settings_save_btn)
         saveBtn.setOnClickListener { v ->
             var saved = false
@@ -58,6 +59,9 @@ class SettingsFragment : Fragment() {
             //Save Enable authentication
             editor.putBoolean("enable_auth", enableAuth.isChecked)
             editor.apply()
+            //Save Enable NSD
+            editor.putBoolean("enable_nsd", enableNSD.isChecked)
+            editor.apply()
             if (saved) {
                 Toast.makeText(v.context, resources.getText(R.string.setting_saved), Toast.LENGTH_SHORT).show()
             }
@@ -78,6 +82,10 @@ class SettingsFragment : Fragment() {
         if (sharedPref.getBoolean("enable_auth", false)) {
             enableAuth.isChecked = true
         }
+        //Set current "NSD"-Option
+        if (sharedPref.getBoolean("enable_nsd", false)) {
+            enableNSD.isChecked = true
+        }
         return rootView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/xcreen/restsms/server/SMSServer.kt b/app/src/main/java/net/xcreen/restsms/server/SMSServer.kt
index e4ebf40..20b0fc9 100644
--- a/app/src/main/java/net/xcreen/restsms/server/SMSServer.kt
+++ b/app/src/main/java/net/xcreen/restsms/server/SMSServer.kt
@@ -12,6 +12,7 @@ import javax.servlet.MultipartConfigElement
 
 class SMSServer {
     var port = 8080
+    var startNSD = false
     var goodToken = ""
     var authEnabled = false
     private var jettyServer: Server? = null
@@ -75,8 +76,9 @@ class SMSServer {
                 serverLogging!!.log("error", "NSD Service unregistration failed: $errorCode")
             }
         }
-        nsdManager!!.registerService(nsdServiceInfo, NsdManager.PROTOCOL_DNS_SD, nsdRegistrationListener)
-
+        if(startNSD) {
+            nsdManager!!.registerService(nsdServiceInfo, NsdManager.PROTOCOL_DNS_SD, nsdRegistrationListener)
+        }
         //Start Jetty
         jettyServer!!.start()
         jettyServer!!.join()
diff --git a/app/src/main/java/net/xcreen/restsms/server/ServerService.kt b/app/src/main/java/net/xcreen/restsms/server/ServerService.kt
index 427b6f7..aa2a97b 100644
--- a/app/src/main/java/net/xcreen/restsms/server/ServerService.kt
+++ b/app/src/main/java/net/xcreen/restsms/server/ServerService.kt
@@ -58,6 +58,8 @@ class ServerService : Service() {
         val sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
         val serverPort = sharedPref.getInt("server_port", 8080)
         appContext?.smsServer?.port = serverPort
+        //Set NSD
+        appContext?.smsServer?.startNSD = sharedPref.getBoolean("enable_nsd", false)
         //Set Auth params
         val goodToken = sharedPref.getString("server_token", "") ?: ""
         val authEnabled = sharedPref.getBoolean("enable_auth", false)
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index e2c24cd..8ca2a07 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -107,6 +107,18 @@
             android:textColor="@color/colorWhite"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/settings_open_browser_checkbox" />
+
+        <CheckBox
+            android:id="@+id/settings_enable_nsd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/setting_enable_nsd"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:textColor="@color/colorWhite"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/settings_token_edittext" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1675208..2743974 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="setting_open_website">Open Browser after Server-Start</string>
     <string name="setting_disable_logging">Disable writing/creating log-files</string>
     <string name="setting_enable_auth">Enable authentication</string>
+    <string name="setting_enable_nsd">Enable Network Service Discovery</string>
     <string name="setting_save">Save</string>
     <string name="setting_invalid_port">Invalid Port!</string>
     <string name="setting_invalid_port_range">Port must be between 0 and 65535!</string>