Merge pull request #211 from tobexyz/issue207

Issue207

Author: tobexyz

.gitignore

@@ -1,3 +1,4 @@
+reports
 .kiro
 doxygen
 .bundle

yaacc/src/main/java/de/yaacc/browser/ServerListFragment.java

@@ -22,7 +22,6 @@
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import de.yaacc.util.YaaccLogger;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -53,6 +52,7 @@
 import de.yaacc.util.FormatHelper;
 import de.yaacc.util.ShutdownTimerListener;
 import de.yaacc.util.ThemeHelper;
+import de.yaacc.util.YaaccLogger;
 
 /**
  * Activity for browsing devices and folders. Represents the entrypoint for the whole application.
@@ -81,7 +81,7 @@ private SharedPreferences getPreferences() {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         // Register callback for MediaProjection stop events
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
             de.yaacc.upnp.server.media.MediaProjectionHelper.setStopCallback(() -> {
@@ -90,17 +90,17 @@ public void onCreate(Bundle savedInstanceState) {
                     getActivity().runOnUiThread(() -> {
                         android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(requireContext());
                         prefs.edit()
-                            .putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), false)
-                            .putBoolean(getString(R.string.settings_local_server_serve_screen_cast_chkbx), false)
-                            .apply();
-                        
+                                .putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), false)
+                                .putBoolean(getString(R.string.settings_local_server_serve_screen_cast_chkbx), false)
+                                .apply();
+
                         de.yaacc.browser.BrowseDeviceAdapter.setAudioStreaming(false);
                         de.yaacc.browser.BrowseDeviceAdapter.setVideoStreaming(false);
-                        
+
                         if (bDeviceAdapter != null) {
                             bDeviceAdapter.notifyDataSetChanged();
                         }
-                        
+
                         YaaccLogger.i(getClass().getName(), "Streaming disabled - MediaProjection stopped");
                     });
                 }
@@ -192,6 +192,10 @@ public void receiverDeviceAdded(Device<?, ?, ?> device) {
     @Override
     public void onResume() {
         super.onResume();
+        // Trigger UPnP discovery to find new devices
+        if (upnpClient != null && upnpClient.isInitialized()) {
+            upnpClient.searchDevices();
+        }
         //refresh device list
         Thread thread = new Thread(this::populateDeviceList);
         thread.start();
@@ -345,21 +349,21 @@ public void setShutdownTimerRemainingTime(String s) {
     public void onTick(long millisUntilFinished) {
         setShutdownTimerRemainingTime(FormatHelper.parseMillisToTimeStringTo(millisUntilFinished));
     }
-    
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, android.content.Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        
+
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q &&
-            requestCode == de.yaacc.upnp.server.media.MediaProjectionHelper.REQUEST_CODE_MEDIA_PROJECTION) {
-            
+                requestCode == de.yaacc.upnp.server.media.MediaProjectionHelper.REQUEST_CODE_MEDIA_PROJECTION) {
+
             if (de.yaacc.upnp.server.media.MediaProjectionHelper.handlePermissionResult(requireContext(), resultCode, data)) {
                 // Permission granted - enable only the button that requested it
                 YaaccLogger.i(getClass().getName(), "MediaProjection permission granted");
-                
+
                 android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(requireContext());
                 android.content.SharedPreferences.Editor editor = prefs.edit();
-                
+
                 // Enable only the button that requested permission
                 if (de.yaacc.browser.BrowseDeviceAdapter.isPendingAudioRequest()) {
                     editor.putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), true);
@@ -370,26 +374,26 @@ public void onActivityResult(int requestCode, int resultCode, android.content.In
                     de.yaacc.browser.BrowseDeviceAdapter.setVideoStreaming(true);
                 }
                 editor.apply();
-                
+
                 // Clear pending flags
                 de.yaacc.browser.BrowseDeviceAdapter.clearPendingRequests();
-                
+
                 // Refresh the adapter to update button states
                 if (bDeviceAdapter != null) {
                     bDeviceAdapter.notifyDataSetChanged();
                 }
             } else {
                 // Permission denied - disable both and clear pending
                 YaaccLogger.w(getClass().getName(), "MediaProjection permission denied");
-                
+
                 de.yaacc.browser.BrowseDeviceAdapter.clearPendingRequests();
-                
+
                 android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(requireContext());
                 prefs.edit()
-                    .putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), false)
-                    .putBoolean(getString(R.string.settings_local_server_serve_screen_cast_chkbx), false)
-                    .apply();
-                
+                        .putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), false)
+                        .putBoolean(getString(R.string.settings_local_server_serve_screen_cast_chkbx), false)
+                        .apply();
+
                 // Update adapter state
                 if (bDeviceAdapter != null) {
                     de.yaacc.browser.BrowseDeviceAdapter.setAudioStreaming(false);

yaacc/src/main/java/de/yaacc/upnp/server/YaaccUpnpServerService.java

@@ -97,6 +97,7 @@
 import de.yaacc.upnp.server.media.SystemAudioCaptureService;
 import de.yaacc.upnp.server.renderingcontrol.YaaccAudioRenderingControlService;
 import de.yaacc.util.InterfaceResolutionHelper;
+import de.yaacc.util.InterfaceResolutionHelper.InterfaceHolder;
 import de.yaacc.util.NotificationId;
 import de.yaacc.util.SAFCacheManager;
 import de.yaacc.util.YaaccLogger;
@@ -230,6 +231,25 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // App is active when service starts
         networkDeviceListener.setAppInForeground(true);
 
+        // Trigger UPnP discovery when service starts
+        YaaccLogger.d(getClass().getName(), "Triggering UPnP discovery on service start");
+        if (networkDeviceListener.isInitalized()) {
+            new Thread(() -> {
+                try {
+                    Thread.sleep(1000); // Wait a bit for network to stabilize
+                    UpnpClient client = ((Yaacc) getApplicationContext()).getUpnpClient();
+                    if (client != null && client.isInitialized()) {
+                        client.searchDevices();
+                        YaaccLogger.d(getClass().getName(), "UPnP discovery triggered");
+                    }
+                } catch (Exception e) {
+                    YaaccLogger.e(getClass().getName(), "Error triggering UPnP discovery", e);
+                }
+            }).start();
+        } else {
+            YaaccLogger.w(getClass().getName(), "NetworkDeviceListener not initialized, discovery will be triggered when network becomes available");
+        }
+
         locaDeviceUuid = preferences.getString(getApplicationContext().getString(R.string.settings_local_device_uuid_key), null);
         if (locaDeviceUuid == null) {
             locaDeviceUuid = UUID.randomUUID().toString();
@@ -332,6 +352,18 @@ private void showNotification() {
             statusBuilder.append("⚠ HTTP");
         }
 
+        // Network interface info
+        if (networkDeviceListener != null && networkDeviceListener.isInitalized()) {
+            try {
+                InterfaceHolder iface = InterfaceResolutionHelper.getNetworkInterface(this);
+                if (iface.inetAddress != null && iface.networkInterface != null) {
+                    statusBuilder.append(" | ").append(iface.networkInterface.getName()).append(":").append(iface.inetAddress.getHostAddress());
+                }
+            } catch (Exception e) {
+                YaaccLogger.d(getClass().getName(), "Failed to get network interface info", e);
+            }
+        }
+
         // Server/Renderer status
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         boolean serverEnabled = preferences.getBoolean(getString(R.string.settings_local_server_chkbx), false);
@@ -565,7 +597,7 @@ private void createUpnpDevice() {
                 // Register BOTH devices as separate top-level devices
                 registry.addDevice(serverDevice);
                 registry.addDevice(rendererDevice);
-                
+
                 localDevice = serverDevice; // Track server device for reference
             } else {
                 // Single device type
@@ -1259,7 +1291,7 @@ private void startCombinedCapture() {
             return;
         }
 
-        android.media.projection.MediaProjection projection = MediaProjectionHelper.getMediaProjection();
+        MediaProjection projection = MediaProjectionHelper.getMediaProjection();
 
         if (projection == null) {
             YaaccLogger.w(getClass().getName(), "Cannot start combined capture: no MediaProjection");

yaacc/src/main/java/de/yaacc/util/InterfaceResolutionHelper.java

@@ -103,7 +103,7 @@ public static String[] getIfAndIpAddress(Context context) {
     public static InterfaceHolder getNetworkInterface(Context context) {
         InterfaceHolder result = new InterfaceHolder();
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        List<String> interfaces = new ArrayList<>(List.of(preferences.getString(context.getString(R.string.settings_local_server_if_filter_key), "lo,dummy,rmnet,ccmni").split(",")));
+        List<String> interfaces = new ArrayList<>(List.of(preferences.getString(context.getString(R.string.settings_upnp_if_filter_key), "lo,dummy,rmnet,ccmni,tun").split(",")));
         interfaces.remove(""); //remove empty string, if there, otherwise we got into trouble finding an network interface in code  below
         try {
             for (Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements(); ) {

yaacc/src/main/res/values-de/setting_strings.xml

@@ -42,6 +42,7 @@
     <string name="settings_default_duration">Standardanzeigedauer</string>
     <string name="settings_silence_duration">Pausendauer</string>
     <string name="settings_local_server_title">Lokale Serverkonfiguration</string>
+    <string name="settings_upnp_server_title">UPnP-Server und Netzwerk</string>
     <string name="settings_local_server_activation_title">Lokaler Serverstatus</string>
     <string name="settings_local_server_started">Lokaler server ist gestartet</string>
     <string name="settings_local_server_stopped">Lokaler server ist gestoppt</string>
@@ -111,4 +112,5 @@
     <string name="settings_local_server_serve_screen_cast_title">Screencast-Stream</string>
     <string name="settings_local_server_serve_screen_cast_off">Die Bildschirmübertragung ist deaktiviert.</string>
     <string name="settings_local_server_serve_screen_cast_on">Bildschirmübertragung ist aktiviert</string>
+    <string name="settings_upnp_if_filter_names">Sperrliste für die UPnP-Netzwerkschnittstellenerkennung</string>
 </resources>

yaacc/src/main/res/values-de/strings.xml

@@ -38,13 +38,15 @@
     <string name="error_upnp_generic">Während des Überfliegens ist ein Fehler aufgetreten </string>
     <string name="error_upnp_specific">Es ist folgender Fehler aufgetreten:</string>
     <string name="error_no_receiver_device_found">Kein Empfänger gefunden</string>
+    <string name="error_no_receiver_selected">Es ist kein Empfängergerät ausgewählt. Bitte wählen Sie zuerst einen Empfänger im Reiter „Empfänger“ aus.</string>
     <string name="error_no_activity_found">Keine Aktivität zum Abspielen vom Typ \'%1$s\' gefunden</string>
     <string name="image_viewer_settings_duration">Dauer der Bildanzeige</string>
     <string name="no_valid_uri_data_found_to_display">Keine gültigen Uri-Informationen zum Anzeigen gefunden</string>
     <string name="play">spiele</string>
     <string name="stop">stoppe</string>
     <string name="pause">pausiere</string>
     <string name="previous">vorheriges</string>
+    <string name="image_viewer_content_description">Bild</string>
     <string name="next">nächstes</string>
     <string name="exit">Beenden</string>
     <string name="musicActivityImageView">Albumbild</string>

yaacc/src/main/res/values-es/setting_strings.xml

@@ -57,6 +57,7 @@
     <string name="settings_browse_load_threads_summ">Configure la cantidad de subprocesos utilizados para cargar contenido desde el servidor UPnP. Más subprocesos provocan una carga más rápida pero aumentan la posibilidad de errores. Los cambios entran en vigor después del reinicio de yaacc.</string>
     <string name="settings_no_content_found">no se encontró contenido para navegar</string>
     <string name="settings_local_server_title">configuración del servidor local</string>
+    <string name="settings_upnp_server_title">Servidor UPnP y redes</string>
     <string name="settings_local_server_activation_title">estado del servidor local</string>
     <string name="settings_local_server_started">se inicia el servidor local</string>
     <string name="settings_local_server_stopped">el servidor local está detenido</string>
@@ -111,4 +112,5 @@
     <string name="settings_local_server_serve_screen_cast_title">transmisión de pantalla</string>
     <string name="settings_local_server_serve_screen_cast_off">La transmisión de pantalla está deshabilitada</string>
     <string name="settings_local_server_serve_screen_cast_on">La transmisión de pantalla está habilitada</string>
+    <string name="settings_upnp_if_filter_names">Interfaces incluidas en la lista negra para la detección de interfaces de red UPnP</string>
 </resources>

yaacc/src/main/res/values-es/strings.xml

@@ -38,6 +38,7 @@
     <string name="error_upnp_generic">Ocurrió un error desconocido mientras navegaba</string>
     <string name="error_upnp_specific">Se produjo el siguiente error:</string>
     <string name="error_no_receiver_device_found">No se encontró ningún dispositivo receptor</string>
+    <string name="error_no_receiver_selected">No se ha seleccionado ningún dispositivo receptor. Seleccione primero un receptor en la pestaña Receptor.</string>
     <string name="error_no_activity_found">No se encontró actividad para jugar tipo MIME \'%1$s\'</string>
     <string name="image_viewer_settings_duration">Duración de la estancia de la foto</string>
     <string name="yaacc_menu_settings">Configuración de YAACC</string>
@@ -47,6 +48,7 @@
     <string name="stop">detener</string>
     <string name="pause">pausa</string>
     <string name="previous">Previo</string>
+    <string name="image_viewer_content_description">Imagen</string>
     <string name="next">próximo</string>
     <string name="exit">Salida</string>
     <string name="title_activity_music_player">reproductor de música yaac</string>

yaacc/src/main/res/values-fr/setting_strings.xml

@@ -57,6 +57,7 @@
     <string name="settings_browse_load_threads_summ">Configurez le nombre de threads utilisés pour charger le contenu à partir du serveur UPnP. Plus de threads entraînent un chargement plus rapide mais augmentent le risque d\'erreurs. Les modifications prennent effet après le redémarrage de yaacc.</string>
     <string name="settings_no_content_found">aucun contenu trouvé pour la navigation</string>
     <string name="settings_local_server_title">configuration du serveur local</string>
+    <string name="settings_upnp_server_title">Serveur UPnP et réseau</string>
     <string name="settings_local_server_activation_title">état du serveur local</string>
     <string name="settings_local_server_started">le serveur local est démarré</string>
     <string name="settings_local_server_stopped">le serveur local est arrêté</string>
@@ -111,4 +112,5 @@
     <string name="settings_local_server_serve_screen_cast_title">flux de diffusion d\'écran</string>
     <string name="settings_local_server_serve_screen_cast_off">La diffusion d\'écran est désactivée.</string>
     <string name="settings_local_server_serve_screen_cast_on">La diffusion d\'écran est activée</string>
+    <string name="settings_upnp_if_filter_names">interfaces mises sur liste noire pour la découverte d\'interfaces réseau UPnP</string>
 </resources>

yaacc/src/main/res/values-fr/strings.xml

@@ -38,6 +38,7 @@
     <string name="error_upnp_generic">Une erreur inconnue s\'est produite lors de la navigation</string>
     <string name="error_upnp_specific">L\'erreur suivante s\'est produite :</string>
     <string name="error_no_receiver_device_found">Aucun appareil récepteur trouvé</string>
+    <string name="error_no_receiver_selected">Aucun périphérique récepteur n\'est sélectionné. Veuillez d\'abord sélectionner un récepteur dans l\'onglet Récepteur.</string>
     <string name="error_no_activity_found">Aucune activité trouvée pour la lecture du type MIME \'%1$s\'</string>
     <string name="image_viewer_settings_duration">Durée du séjour photo</string>
     <string name="yaacc_menu_settings">Paramètres YAACC</string>
@@ -47,6 +48,7 @@
     <string name="stop">arrêt</string>
     <string name="pause">pause</string>
     <string name="previous">précédent</string>
+    <string name="image_viewer_content_description">Image</string>
     <string name="next">suivant</string>
     <string name="exit">Sortie</string>
     <string name="title_activity_music_player">Lecteur de musique YAACC</string>