chore: eliminar contenido y referencias de disney

feat: migrar player a media3 y mejoras de resolución
v10.1.11: Aceptar todos los certificados SSL para streams con redirección
2026-03-02 18:29:03 -03:00 · 2026-03-02 18:25:49 -03:00 · 2026-02-19 16:59:53 -03:00 · 2026-02-19 16:54:04 -03:00 · 2026-02-15 19:18:01 -03:00 · 2026-02-15 19:08:52 -03:00
28 changed files with 2137 additions and 525 deletions
--- a/CHANGELOG-v10.1.4.md
+++ b/CHANGELOG-v10.1.4.md
@@ -0,0 +1,60 @@
+# StreamPlayer v10.1.4 - Mejoras de Interfaz
+
+## Correcciones Implementadas
+
+### 1. Botón de Actualización Más Visible
+- **Archivo**: `app/src/main/res/drawable/btn_refresh_selector.xml` (nuevo)
+- **Descripción**: El botón de actualizar eventos ahora cambia a un color ámbar brillante (#FFC107) con borde grueso cuando está enfocado, mejorando significativamente la visibilidad para control remoto.
+
+### 2. Prevención de Navegación Entre Secciones
+- **Archivo**: `app/src/main/java/com/streamplayer/MainActivity.java`
+- **Descripción**: Al hacer scroll después del último evento, la aplicación se detiene en lugar de pasar a la sección de canales, mejorando la experiencia de usuario.
+
+### 3. Barra de Indicador de Scroll
+- **Archivos**: `app/src/main/res/layout/activity_main.xml`, `app/src/main/res/drawable/scrollbar_vertical.xml` (nuevo)
+- **Descripción**: Agregada barra de scroll visual a la derecha de la lista de contenido como indicador de posición (no navegable).
+
+## Cambios Técnicos
+
+### Nuevo Archivo: btn_refresh_selector.xml
+```xml
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#FFC107" />
+            <corners android:radius="8dp" />
+            <stroke android:width="4dp" android:color="#FFD54F" />
+        </shape>
+    </item>
+    <!-- ... otros estados ... -->
+</selector>
+```
+
+### Modificación: MainActivity.java
+- Agregado `RecyclerView.OnScrollListener` en `showEvents()` para prevenir scroll más allá del último evento
+
+### Modificación: activity_main.xml
+- Botón refresh usa `@drawable/btn_refresh_selector`
+- RecyclerView ahora tiene `android:scrollbars="vertical"` y `scrollbarThumbVertical`
+
+### Nuevos Colores: colors.xml
+- `refresh_button_default`: #2A2A2A
+- `refresh_button_focused`: #FFC107
+- `refresh_button_focused_border`: #FFD54F
+- `refresh_button_pressed`: #FF9800
+
+## Compatibilidad
+- Versión mínima de Android: API 21+
+- Compilado con SDK 34
+- Probado en Android TV con control remoto
+
+## Instalación
+1. Descargar `StreamPlayer-10.1.4-debug.apk`
+2. Habilitar "Fuentes desconocidas" en configuraciones de seguridad
+3. Instalar el APK
+4. Disfrutar las mejoras de interfaz
+
+## Notas de Desarrollo
+- La barra de scroll es puramente visual (indicador)
+- El foco del botón refresh ahora usa color ámbar de alto contraste
+- El scroll se detiene correctamente al final de la lista de eventos
--- a/CHANGELOG-v10.1.5.md
+++ b/CHANGELOG-v10.1.5.md
@@ -0,0 +1,48 @@
+# StreamPlayer v10.1.5 - Correcciones Críticas
+
+## Correcciones Implementadas
+
+### 1. Scroll Listener Corregido
+- **Problema**: El último evento aparecía solo a la mitad y requería bajar/subir muchas veces para verlo completo
+- **Solución**: Cambiado de `findFirstVisibleItemPosition()` a `findLastCompletelyVisibleItemPosition()`
+- Ahora el scroll solo se detiene cuando el último elemento está COMPLETAMENTE visible
+
+### 2. Barra de Scroll Más Visible
+- **Problema**: La barra indicadora no era visible (30% de opacidad)
+- **Solución**:
+  - Opacidad aumentada de #4DFFFFFF (30%) a #CCFFFFFF (80%)
+  - Ancho de la barra aumentado a 8dp
+  - Radio de esquinas aumentado a 4dp para mejor apariencia
+  - Estilo cambiado de `outsideOverlay` a `insideInset`
+  - Agregado `scrollbarFadeDuration="0"` para que nunca se desvanezca
+
+### 3. URLs Actualizadas
+- **Problema**: Ciertos ISP bloquean las URLs viejas
+- **Solución**: Eliminado sistema de fallback múltiples URLs
+- Ahora usa únicamente: `https://streamtp10.com/eventos.json`
+- Código simplificado, más eficiente y sin bloqueos
+
+## Archivos Modificados
+
+### EventRepository.java
+- Simplificado para usar solo streamtp10.com
+- Eliminado código de fallback no necesario
+- Eliminado KEY_WORKING_URL y lógica asociada
+
+### MainActivity.java
+- Scroll listener corregido para usar `findLastCompletelyVisibleItemPosition()`
+
+### scrollbar_vertical.xml
+- Color cambiado a #CCFFFFFF (80% opacidad)
+- Ancho definido en 8dp
+- Radio de esquinas a 4dp
+
+### activity_main.xml
+- `scrollbarStyle` cambiado a `insideInset`
+- `scrollbarSize` definido en 8dp
+- `scrollbarFadeDuration` en 0 (siempre visible)
+
+## Compatibilidad
+- Versión mínima de Android: API 21+
+- Compilado con SDK 34
+- Probado en Android TV con control remoto
--- a/CHANGELOG-v10.1.6.md
+++ b/CHANGELOG-v10.1.6.md
@@ -0,0 +1,42 @@
+# StreamPlayer v10.1.6 - Corrección de Control Remoto y Scrollbar
+
+## Correcciones Implementadas
+
+### 1. Control Remoto - Prevención de Navegación
+- **Problema**: Al presionar el botón abajo del control remoto en el último evento, se iba a la sección de canales
+- **Solución**: Agregado `setOnKeyListener` para interceptar teclas de navegación
+- Ahora intercepta `KEYCODE_DPAD_DOWN` cuando está en el último elemento
+- Combina scroll listener táctil + manejo de teclas del control remoto
+
+### 2. Barra de Scroll Más Visible
+- **Problema**: La barra de seguimiento no era visible
+- **Solución**:
+  - Color del thumb: Blanco sólido (#FFFFFFFF) - antes 80%
+  - Ancho aumentado a 12dp (antes 8dp)
+  - Radio de esquinas: 6dp (antes 4dp)
+  - Track oscuro agregado (#1A1A1A)
+  - `scrollbarAlwaysDrawVerticalTrack="true"` para siempre visible
+
+## Archivos Modificados
+
+### MainActivity.java
+- Import agregado: `android.view.KeyEvent`
+- `setOnKeyListener` agregado en `showEvents()` para interceptar DPAD_DOWN
+- Combina con scroll listener existente para cobertura completa
+
+### scrollbar_vertical.xml
+- Color cambiado a blanco sólido (#FFFFFFFF)
+- Ancho: 12dp
+- Radio: 6dp
+
+### activity_main.xml
+- `scrollbarSize="12dp"` (antes 8dp)
+- `scrollbarTrackVertical="@color/scrollbar_track"` agregado
+- `scrollbarAlwaysDrawVerticalTrack="true"` agregado
+
+### colors.xml
+- Nuevo color: `scrollbar_track` (#1A1A1A)
+
+## Compatibilidad
+- Android TV con control remoto
+- Versión mínima: API 21+
--- a/CHANGELOG-v10.1.7.md
+++ b/CHANGELOG-v10.1.7.md
@@ -0,0 +1,22 @@
+# StreamPlayer v10.1.7 - Corrección de Navegación y Scrollbar Permanente
+
+## Correcciones Implementadas
+
+### 1. Barra de Desplazamiento Permanente
+- **Feature**: Se agregó `android:fadeScrollbars="false"` al `RecyclerView` de eventos.
+- **Beneficio**: La barra de desplazamiento ahora es visible permanentemente, permitiendo al usuario saber su posición (inicio, medio, final) en todo momento sin tener que interactuar primero.
+
+### 2. Navegación al Final de la Lista (Bug Fix)
+- **Problema**: Al presionar "abajo" en el último evento, el foco saltaba involuntariamente a la sección de canales.
+- **Solución**: Se implementó un `LinearLayoutManager` personalizado que intercepta la búsqueda de foco (`onInterceptFocusSearch`).
+- **Detalle**: Cuando se detecta `FOCUS_DOWN` en el último elemento de la lista, la acción se bloquea, manteniendo al usuario en la lista de eventos.
+- **Limpieza**: Se eliminaron los `OnKeyListener` y `OnScrollListener` anteriores que eran menos efectivos.
+
+## Archivos Modificados
+
+### MainActivity.java
+- Implementación de `LinearLayoutManager` anónimo con `onInterceptFocusSearch`.
+- Eliminación de listeners redundantes.
+
+### activity_main.xml
+- `android:fadeScrollbars="false"` añadido a `content_list`.
--- a/CHANGELOG-v10.1.8.md
+++ b/CHANGELOG-v10.1.8.md
@@ -0,0 +1,21 @@
+# StreamPlayer v10.1.8 - Actualización de DNS y Dominios
+
+## Cambios Críticos
+
+### 1. Actualización de Dominios
+- Se ha migrado toda la infraestructura de canales y eventos al nuevo dominio: `streamtp10.com`.
+- Actualización de URLs base para todos los canales en `ChannelRepository`.
+- Actualización del endpoint de eventos a `https://streamtp10.com/eventos.json`.
+- Corrección del Header `Referer` en las peticiones de resolución.
+
+### 2. Configuración Robusta de DNS (Anti-Bloqueo)
+- Implementación de un nuevo sistema centralizado de red (`NetworkUtils`).
+- **DNS Primario**: Google DNS over HTTPS (`8.8.8.8`, `8.8.4.4`).
+- **DNS Secundario**: AdGuard DNS over HTTPS (`94.140.14.14`, `94.140.15.15`) como respaldo automático si Google falla.
+- **DNS Terciario**: DNS del sistema (ISP) como último recurso.
+- Se ha eliminado el uso de `HttpURLConnection` en `EventRepository` en favor de `OkHttpClient` con la nueva configuración DNS, asegurando que la carga de la guía de eventos también evite bloqueos.
+
+## Beneficios
+- Mayor resistencia a bloqueos regionales e interferencias de ISP.
+- Recuperación automática si el proveedor de DNS principal (Google) no es accesible.
+- Corrección de problemas de carga de canales debido al cambio de dominio del proveedor.
--- a/VLC_MIGRATION_PLAN.md
+++ b/VLC_MIGRATION_PLAN.md
@@ -0,0 +1,639 @@
+# VLC Player Migration Plan for Android App
+
+## Current State Analysis
+- **Location**: `/home/ren/futbol/`
+- **Current Player**: ExoPlayer/Media3 1.5.0
+- **Main Files**:
+  - `app/src/main/java/com/streamplayer/PlayerActivity.java`
+  - `app/src/main/java/com/streamplayer/StreamUrlResolver.java`
+  - `app/src/main/res/layout/activity_player.xml`
+- **Key Features**: HLS streams, custom headers, retry logic, loading indicators, error handling
+
+## Target State
+- **New Player**: libvlc for Android (VLC Android SDK)
+- **DRM Support**: ClearKey DRM for protected streams
+- **Preserve**: All existing functionality
+
+---
+
+## Phase 1: Build Configuration Changes
+
+### File: `app/build.gradle`
+
+**Remove Media3 dependencies:**
+```gradle
+// REMOVE these lines (52-57):
+implementation 'androidx.media3:media3-exoplayer:1.5.0'
+implementation 'androidx.media3:media3-exoplayer-hls:1.5.0'
+implementation 'androidx.media3:media3-datasource-okhttp:1.5.0'
+implementation 'androidx.media3:media3-ui:1.5.0'
+implementation 'androidx.media3:media3-ui-leanback:1.5.0'
+implementation 'androidx.media3:media3-session:1.5.0'
+```
+
+**Add VLC Android SDK dependency:**
+```gradle
+// ADD after line 57:
+// VLC Android SDK
+implementation 'org.videolan.android:libvlc-all:3.5.4'
+// Alternative: Use specific modules for smaller APK
+// implementation 'org.videolan.android:libvlc:3.5.4'
+```
+
+---
+
+## Phase 2: Layout Changes
+
+### File: `app/src/main/res/layout/activity_player.xml`
+
+**Current (lines 10-15):**
+```xml
+<androidx.media3.ui.PlayerView
+    android:id="@+id/player_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:resize_mode="fill"
+    app:use_controller="true" />
+```
+
+**Replace with VLC SurfaceView:**
+```xml
+<org.videolan.libvlc.util.VLCVideoLayout
+    android:id="@+id/player_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+
+<!-- OR use SurfaceView directly for more control -->
+<SurfaceView
+    android:id="@+id/player_surface"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+```
+
+**Note**: Keep all other UI elements unchanged (toolbar, loading indicator, error message).
+
+---
+
+## Phase 3: PlayerActivity Rewrite
+
+### File: `app/src/main/java/com/streamplayer/PlayerActivity.java`
+
+**Import Changes:**
+```java
+// REMOVE these imports (14-28):
+import androidx.media3.exoplayer.ExoPlayer;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.PlaybackException;
+import androidx.media3.common.Player;
+import androidx.media3.exoplayer.DefaultRenderersFactory;
+import androidx.media3.exoplayer.trackselection.DefaultTrackSelector;
+import androidx.media3.datasource.okhttp.OkHttpDataSource;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.hls.HlsMediaSource;
+import androidx.media3.exoplayer.drm.DrmSessionManager;
+import androidx.media3.ui.PlayerView;
+import androidx.media3.common.util.Util;
+import androidx.annotation.OptIn;
+import androidx.media3.common.util.UnstableApi;
+
+// ADD VLC imports:
+import org.videolan.libvlc.LibVLC;
+import org.videolan.libvlc.Media;
+import org.videolan.libvlc.MediaPlayer;
+import org.videolan.libvlc.interfaces.IVLCVout;
+import org.videolan.libvlc.util.VLCVideoLayout;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+```
+
+**Class Member Variables (lines 51-66):**
+```java
+// REPLACE:
+private PlayerView playerView;
+private ExoPlayer player;
+private DefaultTrackSelector trackSelector;
+
+// WITH:
+private VLCVideoLayout playerView;  // OR SurfaceView playerSurface
+private LibVLC libVlc;
+private MediaPlayer mediaPlayer;
+private SurfaceView surfaceView;
+```
+
+**onCreate Method (lines 68-98):**
+```java
+// MODIFY initViews() call:
+private void initViews() {
+    playerView = findViewById(R.id.player_view);  // VLCVideoLayout
+    // OR if using SurfaceView:
+    surfaceView = findViewById(R.id.player_surface);
+
+    loadingIndicator = findViewById(R.id.loading_indicator);
+    errorMessage = findViewById(R.id.error_message);
+    channelLabel = findViewById(R.id.player_channel_label);
+    closeButton = findViewById(R.id.close_button);
+    playerToolbar = findViewById(R.id.player_toolbar);
+
+    closeButton.setOnClickListener(v -> finish());
+    playerView.setOnClickListener(v -> toggleOverlay());
+    // For SurfaceView:
+    // surfaceView.setOnClickListener(v -> toggleOverlay());
+}
+```
+
+---
+
+## Phase 4: VLC Player Implementation Details
+
+### 4.1 Initialize VLC with Custom Headers
+
+**New Method: `startPlayback(String streamUrl)`**
+```java
+private void startPlayback(String streamUrl) {
+    try {
+        releasePlayer();
+        lastStreamUrl = streamUrl;
+        retryCount = 0;
+
+        // Create LibVLC instance with options
+        ArrayList<String> options = new ArrayList<>();
+
+        // Network options
+        options.add("--network-caching=1500");
+        options.add("--clock-jitter=0");
+        options.add("--clock-synchro=0");
+
+        // HTTP options for headers
+        options.add(":http-user-agent=" + USER_AGENT);
+        options.add(":http-referrer=" + "http://streamtp10.com/");
+
+        // SSL options (accept all certificates)
+        options.add("--no-xlib");
+        options.add(":rtsp-tcp");
+        options.add(":no-cert-check");
+
+        // Create LibVLC
+        libVlc = new LibVLC(this, options);
+
+        // Create MediaPlayer
+        mediaPlayer = new MediaPlayer(libVlc);
+
+        // Set up event listeners
+        setupMediaPlayerListeners();
+
+        // Create Media with custom headers
+        Media media = new Media(libVlc, android.net.Uri.parse(streamUrl));
+
+        // Add headers via Media options
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Referer", "http://streamtp10.com/");
+        headers.put("User-Agent", USER_AGENT);
+        media.addOption(":http-user-agent=" + USER_AGENT);
+        media.addOption(":http-referrer=http://streamtp10.com/");
+
+        mediaPlayer.setMedia(media);
+        media.release();
+
+        // Set up video output
+        IVLCVout vout = mediaPlayer.getVLCVout();
+        if (playerView instanceof VLCVideoLayout) {
+            vout.setVideoView(playerView);
+        } else if (surfaceView != null) {
+            vout.setVideoView(surfaceView);
+        }
+        vout.attachViews();
+
+        // Start playback
+        mediaPlayer.play();
+        setOverlayVisible(false);
+
+    } catch (Exception e) {
+        showError("Error al inicializar reproductor: " + e.getMessage());
+    }
+}
+```
+
+### 4.2 Player Event Listeners
+
+**New Method: `setupMediaPlayerListeners()`**
+```java
+private void setupMediaPlayerListeners() {
+    // MediaPlayer.EventListener using the VLC event system
+    mediaPlayer.setEventListener(new MediaPlayer.EventListener() {
+        @Override
+        public void onEvent(MediaPlayer.Event event) {
+            switch (event.type) {
+                case MediaPlayer.Event.Playing:
+                    // Equivalent to STATE_READY
+                    runOnUiThread(() -> {
+                        showLoading(false);
+                        retryCount = 0;
+                    });
+                    break;
+
+                case MediaPlayer.Event.Buffering:
+                    // Buffering state (0.0 to 1.0)
+                    float bufferPercent = event.getBuffering();
+                    runOnUiThread(() -> showLoading(bufferPercent < 1.0f));
+                    break;
+
+                case MediaPlayer.Event.EncounteredError:
+                    // Error occurred
+                    runOnUiThread(() -> handlePlaybackError("Error de reproducción VLC"));
+                    break;
+
+                case MediaPlayer.Event.EndReached:
+                    // Stream ended
+                    runOnUiThread(() -> finish());
+                    break;
+
+                case MediaPlayer.Event.Stopped:
+                    // Playback stopped
+                    break;
+
+                case MediaPlayer.Event.Paused:
+                    // Playback paused
+                    break;
+
+                case MediaPlayer.Event.Opening:
+                    // Stream opening
+                    runOnUiThread(() -> showLoading(true));
+                    break;
+            }
+        }
+    });
+}
+```
+
+### 4.3 Error Handling with Retry
+
+**New Method: `handlePlaybackError(String errorMessage)`**
+```java
+private void handlePlaybackError(String errorMsg) {
+    boolean isRetryableError =
+        errorMsg.contains("404") ||
+        errorMsg.contains("403") ||
+        errorMsg.contains("timeout") ||
+        errorMsg.contains("Network") ||
+        errorMsg.contains("Connection");
+
+    if (isRetryableError && retryCount < MAX_RETRIES) {
+        retryCount++;
+        runOnUiThread(() -> {
+            showLoading(true);
+            showError("Error de conexión. Reintentando... (" + retryCount + "/" + MAX_RETRIES + ")");
+        });
+
+        new android.os.Handler(android.os.Looper.getMainLooper()).postDelayed(() -> {
+            if (lastStreamUrl != null) {
+                startPlayback(lastStreamUrl);
+            } else {
+                loadChannel();
+            }
+        }, 2000);
+    } else {
+        String finalMessage = "Error al reproducir: " + errorMsg;
+        if (retryCount >= MAX_RETRIES) {
+            finalMessage += "\n\nSe agotaron los reintentos (" + MAX_RETRIES + ").";
+        }
+        showError(finalMessage);
+    }
+}
+```
+
+### 4.4 Player Lifecycle Methods
+
+**Replace releasePlayer() (lines 257-262):**
+```java
+private void releasePlayer() {
+    if (mediaPlayer != null) {
+        mediaPlayer.stop();
+        mediaPlayer.getVLCVout().detachViews();
+        mediaPlayer.release();
+        mediaPlayer = null;
+    }
+    if (libVlc != null) {
+        libVlc.release();
+        libVlc = null;
+    }
+}
+```
+
+**Update lifecycle methods:**
+```java
+@Override
+protected void onStart() {
+    super.onStart();
+    if (mediaPlayer != null && !mediaPlayer.isPlaying()) {
+        mediaPlayer.play();
+    } else if (channelUrl != null && libVlc == null) {
+        loadChannel();
+    }
+}
+
+@Override
+protected void onResume() {
+    super.onResume();
+    if (mediaPlayer != null) {
+        mediaPlayer.play();
+    }
+}
+
+@Override
+protected void onPause() {
+    super.onPause();
+    if (mediaPlayer != null && mediaPlayer.isPlaying()) {
+        mediaPlayer.pause();
+    }
+}
+
+@Override
+protected void onStop() {
+    super.onStop();
+    // Keep player for quick resume, don't release
+}
+
+@Override
+protected void onDestroy() {
+    super.onDestroy();
+    releasePlayer();
+    getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+}
+```
+
+---
+
+## Phase 5: DRM Support (ClearKey)
+
+### ClearKey DRM Implementation Example
+
+**New Class: `VlcDrmManager.java`**
+**Location**: `app/src/main/java/com/streamplayer/VlcDrmManager.java`
+
+```java
+package com.streamplayer;
+
+import org.videolan.libvlc.Media;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Handles DRM configuration for VLC Media Player
+ * Supports ClearKey DRM for protected streaming services
+ */
+public class VlcDrmManager {
+
+    // ClearKey DRM configuration
+    private static final String CLEARKEY_KEY_SYSTEM = "org.w3.clearkey";
+
+    /**
+     * Configure ClearKey DRM for a Media object
+     * @param media The VLC Media object
+     * @param keyId The key ID (extracted from manifest or license server)
+     * @param key The content key
+     */
+    public static void configureClearKey(Media media, String keyId, String key) {
+        if (media == null || keyId == null || key == null) {
+            return;
+        }
+
+        // VLC uses a specific format for ClearKey
+        // Format: keyid:key
+        String keyPair = keyId + ":" + key;
+        media.addOption(":demux=avformat");
+        media.addOption(":key-format=" + CLEARKEY_KEY_SYSTEM);
+        media.addOption(":key=" + keyPair);
+    }
+
+    /**
+     * Configure ClearKey DRM with multiple keys
+     * @param media The VLC Media object
+     * @param keys Map of keyId -> key pairs
+     */
+    public static void configureClearKey(Media media, Map<String, String> keys) {
+        if (media == null || keys == null || keys.isEmpty()) {
+            return;
+        }
+
+        media.addOption(":demux=avformat");
+        media.addOption(":key-format=" + CLEARKEY_KEY_SYSTEM);
+
+        for (Map.Entry<String, String> entry : keys.entrySet()) {
+            String keyPair = entry.getKey() + ":" + entry.getValue();
+            media.addOption(":key=" + keyPair);
+        }
+    }
+
+    /**
+     * Configure Widevine DRM (for reference, if needed later)
+     * VLC supports Widevine via specific options
+     */
+    public static void configureWidevine(Media media, String drmServerUrl) {
+        if (media == null || drmServerUrl == null) {
+            return;
+        }
+
+        media.addOption(":drm=widevine");
+        media.addOption(":aes-key=" + drmServerUrl);
+    }
+}
+```
+
+### Extracting ClearKey Keys from Stream
+
+**Update `StreamUrlResolver.java` to extract DRM info:**
+
+Add this method to `StreamUrlResolver`:
+```java
+/**
+ * Extract ClearKey DRM keys from JSON in HTML
+ * @return Map of keyId -> key pairs, or null if no DRM found
+ */
+public static Map<String, String> extractClearKeyKeys(String html) {
+    Map<String, String> keys = new HashMap<>();
+
+    try {
+        // Pattern to find ClearKey key IDs and keys
+        // Common patterns in protected streaming services
+        Pattern clearkeyPattern = Pattern.compile(
+            "\"kid\"\\s*:\\s*\"([^\"]+)\".*?\"k\"\\s*:\\s*\"([^\"]+)\"",
+            Pattern.DOTALL
+        );
+
+        Matcher matcher = clearkeyPattern.matcher(html);
+        while (matcher.find()) {
+            String keyId = matcher.group(1);
+            String key = matcher.group(2);
+            keys.put(keyId, key);
+        }
+
+        // Alternative pattern for JWPlayer with DRM
+        Pattern jwDrmPattern = Pattern.compile(
+            "\"drm\"\\s*:\\s*\\{[^}]*\"clearkey\"\\s*:\\s*\\{[^}]*\"keyId\"\\s*:\\s*\"([^\"]+)\"[^}]*\"key\"\\s*:\\s*\"([^\"]+)\"",
+            Pattern.DOTALL
+        );
+
+        Matcher jwMatcher = jwDrmPattern.matcher(html);
+        while (jwMatcher.find()) {
+            String keyId = jwMatcher.group(1);
+            String key = jwMatcher.group(2);
+            keys.put(keyId, key);
+        }
+    } catch (Exception e) {
+        // Return empty map on error
+    }
+
+    return keys.isEmpty() ? null : keys;
+}
+```
+
+### Using DRM in PlayerActivity
+
+**Modify `startPlayback()` to handle DRM:**
+```java
+// After loading stream URL, also check for DRM keys
+new Thread(() -> {
+    try {
+        String resolvedUrl = StreamUrlResolver.resolve(channelUrl);
+        Map<String, String> drmKeys = StreamUrlResolver.extractClearKeyKeys(html); // Need to modify resolver to also return HTML
+
+        runOnUiThread(() -> startPlayback(resolvedUrl, drmKeys));
+    } catch (IOException e) {
+        runOnUiThread(() -> showError("No se pudo conectar con el canal: " + e.getMessage()));
+    }
+}).start();
+
+private void startPlayback(String streamUrl, Map<String, String> drmKeys) {
+    // ... existing VLC setup code ...
+
+    Media media = new Media(libVlc, android.net.Uri.parse(streamUrl));
+
+    // Add headers
+    media.addOption(":http-user-agent=" + USER_AGENT);
+    media.addOption(":http-referrer=http://streamtp10.com/");
+
+    // Add DRM if available
+    if (drmKeys != null && !drmKeys.isEmpty()) {
+        VlcDrmManager.configureClearKey(media, drmKeys);
+    }
+
+    // ... rest of the setup ...
+}
+```
+
+---
+
+## Phase 6: Additional Files
+
+### New File: `VlcPlayerConfig.java`
+**Location**: `app/src/main/java/com/streamplayer/VlcPlayerConfig.java`
+
+```java
+package com.streamplayer;
+
+/**
+ * Configuration constants for VLC Player
+ */
+public class VlcPlayerConfig {
+
+    // Network caching (ms)
+    public static final int NETWORK_CACHING = 1500;
+
+    // Live streaming caching (ms)
+    public static final int LIVE_CACHING = 5000;
+
+    // User Agent
+    public static final String USER_AGENT =
+        "Mozilla/5.0 (Linux; Android 13; Pixel 7) AppleWebKit/537.36";
+
+    // Hardware acceleration options
+    public static final String HW_ACCELERATION = "automatic"; // or "full", "none", "decoding", "rendering"
+
+    // Chroma format
+    public static final String CHROMA = "RV32"; // or YV12, NV12
+
+    // Audio output
+    public static final String AUDIO_OUTPUT = "opensles";
+}
+```
+
+---
+
+## Phase 7: Summary of File Changes
+
+| File Path | Change Type | Description |
+|-----------|-------------|-------------|
+| `app/build.gradle` | Modify | Remove Media3 deps, add VLC SDK |
+| `app/src/main/res/layout/activity_player.xml` | Modify | Replace PlayerView with VLCVideoLayout |
+| `app/src/main/java/com/streamplayer/PlayerActivity.java` | Rewrite | Complete VLC integration |
+| `app/src/main/java/com/streamplayer/VlcDrmManager.java` | New | DRM configuration handler |
+| `app/src/main/java/com/streamplayer/VlcPlayerConfig.java` | New | VLC configuration constants |
+| `app/src/main/java/com/streamplayer/StreamUrlResolver.java` | Modify | Add DRM key extraction |
+
+---
+
+## Phase 8: VLC-Specific Notes
+
+### HTTP Headers in VLC
+VLC handles HTTP headers differently than ExoPlayer:
+- Headers are set via Media.addOption() with colon prefix
+- Format: `:http-header-name=value`
+- Common options:
+  - `:http-user-agent=<value>`
+  - `:http-referrer=<value>`
+  - `:http-cookie=<value>`
+
+### VLC Events vs ExoPlayer States
+
+| ExoPlayer State | VLC Event |
+|----------------|-----------|
+| STATE_IDLE | N/A (not initialized) |
+| STATE_BUFFERING | Event.Buffering |
+| STATE_READY | Event.Playing |
+| STATE_ENDED | Event.EndReached |
+
+### DRM Support Comparison
+| Feature | ExoPlayer | VLC |
+|---------|-----------|-----|
+| Widevine | Native | Limited |
+| ClearKey | Via DRM module | Via libavformat |
+| PlayReady | Native | Limited |
+| FairPlay | No | Limited |
+
+---
+
+## Phase 9: Testing Checklist
+
+1. [ ] Basic HLS stream playback
+2. [ ] HTTP headers (Referer, User-Agent) applied correctly
+3. [ ] Loading indicator shows/hides correctly
+4. [ ] Error messages display properly
+5. [ ] Retry logic works on connection failure
+6. [ ] Screen stays on during playback
+7. [ ] Overlay toggle works on tap
+8. [ ] Close button returns to main activity
+9. [ ] App handles pause/resume correctly
+10. [ ] Memory leaks checked (no retained VLC instances)
+11. [ ] DRM streams play correctly
+12. [ ] SSL certificate bypass works
+
+---
+
+## Phase 10: Fallback Strategy
+
+If VLC doesn't work as expected, consider:
+1. **Hybrid approach**: Keep ExoPlayer as fallback, use VLC for DRM-only streams
+2. **Alternative libraries**:
+   - Vitamio (deprecated but still works)
+   - NKD-Player (wrapper around FFmpeg)
+   - Build custom FFmpeg integration
+3. **Webview approach**: Use embedded browser for DRM content
+
+---
+
+## Appendix: VLC SDK Documentation Links
+
+- VLC Android SDK: https://code.videolan.org/videolan/vlc-android
+- VLC LibVLC API: https://code.videolan.org/videolan/vlc-android/-/tree/master/libvlc
+- VLC Wiki on Android: https://wiki.videolan.org/AndroidCompile
+- ClearKey DRM spec: https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "com.streamplayer"
        minSdk 21
        targetSdk 35
-        versionCode 100102
-        versionName "10.1.2"
+        versionCode 100200
+        versionName "11.0.0"
        buildConfigField "String", "DEVICE_REGISTRY_URL", '"http://194.163.191.200:4000"'
    }

@@ -47,16 +47,14 @@ dependencies {
    implementation 'androidx.appcompat:appcompat:1.6.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.media3:media3-exoplayer:1.4.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.4.1'
+    implementation 'androidx.media3:media3-ui:1.4.1'

-    // Media3 para reproduccion de video (Android TV optimizado)
-    implementation 'androidx.media3:media3-exoplayer:1.5.0'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.5.0'
-    implementation 'androidx.media3:media3-datasource-okhttp:1.5.0'
-    implementation 'androidx.media3:media3-ui:1.5.0'
-    implementation 'androidx.media3:media3-ui-leanback:1.5.0'
-    implementation 'androidx.media3:media3-session:1.5.0'
+    // VLC Player para reproduccion de video (soporte DRM mejorado)
+    implementation 'org.videolan.android:libvlc-all:3.4.4'

-    // OkHttp con DNS over HTTPS
+    // OkHttp con DNS over HTTPS (para StreamUrlResolver)
    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
    implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-feature
        android:name="android.software.leanback"
--- a/app/src/main/java/com/streamplayer/ChannelRepository.java
+++ b/app/src/main/java/com/streamplayer/ChannelRepository.java
@@ -12,72 +12,72 @@ public final class ChannelRepository {

    private static List<StreamChannel> createChannels() {
        List<StreamChannel> channels = new ArrayList<>(Arrays.asList(
-            new StreamChannel("ESPN", "https://streamtpcloud.com/global2.php?stream=espn"),
-            new StreamChannel("ESPN 2", "https://streamtpcloud.com/global2.php?stream=espn2"),
-            new StreamChannel("ESPN 3", "https://streamtpcloud.com/global2.php?stream=espn3"),
-            new StreamChannel("ESPN 4", "https://streamtpcloud.com/global2.php?stream=espn4"),
-            new StreamChannel("ESPN 3 MX", "https://streamtpcloud.com/global2.php?stream=espn3mx"),
-            new StreamChannel("ESPN 5", "https://streamtpcloud.com/global2.php?stream=espn5"),
-            new StreamChannel("Fox Sports 3 MX", "https://streamtpcloud.com/global2.php?stream=foxsports3mx"),
-            new StreamChannel("ESPN 6", "https://streamtpcloud.com/global2.php?stream=espn6"),
-            new StreamChannel("Fox Sports MX", "https://streamtpcloud.com/global2.php?stream=foxsportsmx"),
-            new StreamChannel("ESPN 7", "https://streamtpcloud.com/global2.php?stream=espn7"),
-            new StreamChannel("Azteca Deportes", "https://streamtpcloud.com/global2.php?stream=azteca_deportes"),
-            new StreamChannel("Win Plus", "https://streamtpcloud.com/global2.php?stream=winplus"),
-            new StreamChannel("DAZN 1", "https://streamtpcloud.com/global2.php?stream=dazn1"),
-            new StreamChannel("Win Plus 2", "https://streamtpcloud.com/global2.php?stream=winplus2"),
-            new StreamChannel("DAZN 2", "https://streamtpcloud.com/global2.php?stream=dazn2"),
-            new StreamChannel("Win Sports", "https://streamtpcloud.com/global2.php?stream=winsports"),
-            new StreamChannel("DAZN LaLiga", "https://streamtpcloud.com/global2.php?stream=dazn_laliga"),
-            new StreamChannel("Win Plus Online 1", "https://streamtpcloud.com/global2.php?stream=winplusonline1"),
-            new StreamChannel("Caracol TV", "https://streamtpcloud.com/global2.php?stream=caracoltv"),
-            new StreamChannel("Fox 1 AR", "https://streamtpcloud.com/global2.php?stream=fox1ar"),
-            new StreamChannel("Fox 2 USA", "https://streamtpcloud.com/global2.php?stream=fox_2_usa"),
-            new StreamChannel("Fox 2 AR", "https://streamtpcloud.com/global2.php?stream=fox2ar"),
-            new StreamChannel("TNT 1 GB", "https://streamtpcloud.com/global2.php?stream=tnt_1_gb"),
-            new StreamChannel("TNT 2 GB", "https://streamtpcloud.com/global2.php?stream=tnt_2_gb"),
-            new StreamChannel("Fox 3 AR", "https://streamtpcloud.com/global2.php?stream=fox3ar"),
-            new StreamChannel("Universo USA", "https://streamtpcloud.com/global2.php?stream=universo_usa"),
-            new StreamChannel("DSports", "https://streamtpcloud.com/global2.php?stream=dsports"),
-            new StreamChannel("Univision USA", "https://streamtpcloud.com/global2.php?stream=univision_usa"),
-            new StreamChannel("DSports 2", "https://streamtpcloud.com/global2.php?stream=dsports2"),
-            new StreamChannel("Fox Deportes USA", "https://streamtpcloud.com/global2.php?stream=fox_deportes_usa"),
-            new StreamChannel("DSports Plus", "https://streamtpcloud.com/global2.php?stream=dsportsplus"),
-            new StreamChannel("Fox Sports 2 MX", "https://streamtpcloud.com/global2.php?stream=foxsports2mx"),
-            new StreamChannel("TNT Sports Chile", "https://streamtpcloud.com/global2.php?stream=tntsportschile"),
-            new StreamChannel("Fox Sports Premium", "https://streamtpcloud.com/global2.php?stream=foxsportspremium"),
-            new StreamChannel("TNT Sports", "https://streamtpcloud.com/global2.php?stream=tntsports"),
-            new StreamChannel("ESPN MX", "https://streamtpcloud.com/global2.php?stream=espnmx"),
-            new StreamChannel("ESPN Premium", "https://streamtpcloud.com/global2.php?stream=espnpremium"),
-            new StreamChannel("ESPN 2 MX", "https://streamtpcloud.com/global2.php?stream=espn2mx"),
-            new StreamChannel("TyC Sports", "https://streamtpcloud.com/global2.php?stream=tycsports"),
-            new StreamChannel("TUDN USA", "https://streamtpcloud.com/global2.php?stream=tudn_usa"),
-            new StreamChannel("Telefe", "https://streamtpcloud.com/global2.php?stream=telefe"),
-            new StreamChannel("TNT 3 GB", "https://streamtpcloud.com/global2.php?stream=tnt_3_gb"),
-            new StreamChannel("TV Pública", "https://streamtpcloud.com/global2.php?stream=tv_publica"),
-            new StreamChannel("Fox 1 USA", "https://streamtpcloud.com/global2.php?stream=fox_1_usa"),
-            new StreamChannel("Liga 1 Max", "https://streamtpcloud.com/global2.php?stream=liga1max"),
-            new StreamChannel("Gol TV", "https://streamtpcloud.com/global2.php?stream=goltv"),
-            new StreamChannel("VTV Plus", "https://streamtpcloud.com/global2.php?stream=vtvplus"),
-            new StreamChannel("ESPN Deportes", "https://streamtpcloud.com/global2.php?stream=espndeportes"),
-            new StreamChannel("Gol Perú", "https://streamtpcloud.com/global2.php?stream=golperu"),
-            new StreamChannel("TNT 4 GB", "https://streamtpcloud.com/global2.php?stream=tnt_4_gb"),
-            new StreamChannel("SportTV BR 1", "https://streamtpcloud.com/global2.php?stream=sporttvbr1"),
-            new StreamChannel("SportTV BR 2", "https://streamtpcloud.com/global2.php?stream=sporttvbr2"),
-            new StreamChannel("SportTV BR 3", "https://streamtpcloud.com/global2.php?stream=sporttvbr3"),
-            new StreamChannel("Premiere 1", "https://streamtpcloud.com/global2.php?stream=premiere1"),
-            new StreamChannel("Premiere 2", "https://streamtpcloud.com/global2.php?stream=premiere2"),
-            new StreamChannel("Premiere 3", "https://streamtpcloud.com/global2.php?stream=premiere3"),
-            new StreamChannel("ESPN NL 1", "https://streamtpcloud.com/global2.php?stream=espn_nl1"),
-            new StreamChannel("ESPN NL 2", "https://streamtpcloud.com/global2.php?stream=espn_nl2"),
-            new StreamChannel("ESPN NL 3", "https://streamtpcloud.com/global2.php?stream=espn_nl3"),
-            new StreamChannel("Caliente TV MX", "https://streamtpcloud.com/global2.php?stream=calientetvmx"),
-            new StreamChannel("USA Network", "https://streamtpcloud.com/global2.php?stream=usa_network"),
-            new StreamChannel("TyC Internacional", "https://streamtpcloud.com/global2.php?stream=tycinternacional"),
-            new StreamChannel("Canal 5 MX", "https://streamtpcloud.com/global2.php?stream=canal5mx"),
-            new StreamChannel("TUDN MX", "https://streamtpcloud.com/global2.php?stream=TUDNMX"),
-            new StreamChannel("FUTV", "https://streamtpcloud.com/global2.php?stream=futv"),
-            new StreamChannel("LaLiga Hypermotion", "https://streamtpcloud.com/global2.php?stream=laligahypermotion")
+            new StreamChannel("ESPN", "http://streamtp10.com/global2.php?stream=espn"),
+            new StreamChannel("ESPN 2", "http://streamtp10.com/global2.php?stream=espn2"),
+            new StreamChannel("ESPN 3", "http://streamtp10.com/global2.php?stream=espn3"),
+            new StreamChannel("ESPN 4", "http://streamtp10.com/global2.php?stream=espn4"),
+            new StreamChannel("ESPN 3 MX", "http://streamtp10.com/global2.php?stream=espn3mx"),
+            new StreamChannel("ESPN 5", "http://streamtp10.com/global2.php?stream=espn5"),
+            new StreamChannel("Fox Sports 3 MX", "http://streamtp10.com/global2.php?stream=foxsports3mx"),
+            new StreamChannel("ESPN 6", "http://streamtp10.com/global2.php?stream=espn6"),
+            new StreamChannel("Fox Sports MX", "http://streamtp10.com/global2.php?stream=foxsportsmx"),
+            new StreamChannel("ESPN 7", "http://streamtp10.com/global2.php?stream=espn7"),
+            new StreamChannel("Azteca Deportes", "http://streamtp10.com/global2.php?stream=azteca_deportes"),
+            new StreamChannel("Win Plus", "http://streamtp10.com/global2.php?stream=winplus"),
+            new StreamChannel("DAZN 1", "http://streamtp10.com/global2.php?stream=dazn1"),
+            new StreamChannel("Win Plus 2", "http://streamtp10.com/global2.php?stream=winplus2"),
+            new StreamChannel("DAZN 2", "http://streamtp10.com/global2.php?stream=dazn2"),
+            new StreamChannel("Win Sports", "http://streamtp10.com/global2.php?stream=winsports"),
+            new StreamChannel("DAZN LaLiga", "http://streamtp10.com/global2.php?stream=dazn_laliga"),
+            new StreamChannel("Win Plus Online 1", "http://streamtp10.com/global2.php?stream=winplusonline1"),
+            new StreamChannel("Caracol TV", "http://streamtp10.com/global2.php?stream=caracoltv"),
+            new StreamChannel("Fox 1 AR", "http://streamtp10.com/global2.php?stream=fox1ar"),
+            new StreamChannel("Fox 2 USA", "http://streamtp10.com/global2.php?stream=fox_2_usa"),
+            new StreamChannel("Fox 2 AR", "http://streamtp10.com/global2.php?stream=fox2ar"),
+            new StreamChannel("TNT 1 GB", "http://streamtp10.com/global2.php?stream=tnt_1_gb"),
+            new StreamChannel("TNT 2 GB", "http://streamtp10.com/global2.php?stream=tnt_2_gb"),
+            new StreamChannel("Fox 3 AR", "http://streamtp10.com/global2.php?stream=fox3ar"),
+            new StreamChannel("Universo USA", "http://streamtp10.com/global2.php?stream=universo_usa"),
+            new StreamChannel("DSports", "http://streamtp10.com/global2.php?stream=dsports"),
+            new StreamChannel("Univision USA", "http://streamtp10.com/global2.php?stream=univision_usa"),
+            new StreamChannel("DSports 2", "http://streamtp10.com/global2.php?stream=dsports2"),
+            new StreamChannel("Fox Deportes USA", "http://streamtp10.com/global2.php?stream=fox_deportes_usa"),
+            new StreamChannel("DSports Plus", "http://streamtp10.com/global2.php?stream=dsportsplus"),
+            new StreamChannel("Fox Sports 2 MX", "http://streamtp10.com/global2.php?stream=foxsports2mx"),
+            new StreamChannel("TNT Sports Chile", "http://streamtp10.com/global2.php?stream=tntsportschile"),
+            new StreamChannel("Fox Sports Premium", "http://streamtp10.com/global2.php?stream=foxsportspremium"),
+            new StreamChannel("TNT Sports", "http://streamtp10.com/global2.php?stream=tntsports"),
+            new StreamChannel("ESPN MX", "http://streamtp10.com/global2.php?stream=espnmx"),
+            new StreamChannel("ESPN Premium", "http://streamtp10.com/global2.php?stream=espnpremium"),
+            new StreamChannel("ESPN 2 MX", "http://streamtp10.com/global2.php?stream=espn2mx"),
+            new StreamChannel("TyC Sports", "http://streamtp10.com/global2.php?stream=tycsports"),
+            new StreamChannel("TUDN USA", "http://streamtp10.com/global2.php?stream=tudn_usa"),
+            new StreamChannel("Telefe", "http://streamtp10.com/global2.php?stream=telefe"),
+            new StreamChannel("TNT 3 GB", "http://streamtp10.com/global2.php?stream=tnt_3_gb"),
+            new StreamChannel("TV Pública", "http://streamtp10.com/global2.php?stream=tv_publica"),
+            new StreamChannel("Fox 1 USA", "http://streamtp10.com/global2.php?stream=fox_1_usa"),
+            new StreamChannel("Liga 1 Max", "http://streamtp10.com/global2.php?stream=liga1max"),
+            new StreamChannel("Gol TV", "http://streamtp10.com/global2.php?stream=goltv"),
+            new StreamChannel("VTV Plus", "http://streamtp10.com/global2.php?stream=vtvplus"),
+            new StreamChannel("ESPN Deportes", "http://streamtp10.com/global2.php?stream=espndeportes"),
+            new StreamChannel("Gol Perú", "http://streamtp10.com/global2.php?stream=golperu"),
+            new StreamChannel("TNT 4 GB", "http://streamtp10.com/global2.php?stream=tnt_4_gb"),
+            new StreamChannel("SportTV BR 1", "http://streamtp10.com/global2.php?stream=sporttvbr1"),
+            new StreamChannel("SportTV BR 2", "http://streamtp10.com/global2.php?stream=sporttvbr2"),
+            new StreamChannel("SportTV BR 3", "http://streamtp10.com/global2.php?stream=sporttvbr3"),
+            new StreamChannel("Premiere 1", "http://streamtp10.com/global2.php?stream=premiere1"),
+            new StreamChannel("Premiere 2", "http://streamtp10.com/global2.php?stream=premiere2"),
+            new StreamChannel("Premiere 3", "http://streamtp10.com/global2.php?stream=premiere3"),
+            new StreamChannel("ESPN NL 1", "http://streamtp10.com/global2.php?stream=espn_nl1"),
+            new StreamChannel("ESPN NL 2", "http://streamtp10.com/global2.php?stream=espn_nl2"),
+            new StreamChannel("ESPN NL 3", "http://streamtp10.com/global2.php?stream=espn_nl3"),
+            new StreamChannel("Caliente TV MX", "http://streamtp10.com/global2.php?stream=calientetvmx"),
+            new StreamChannel("USA Network", "http://streamtp10.com/global2.php?stream=usa_network"),
+            new StreamChannel("TyC Internacional", "http://streamtp10.com/global2.php?stream=tycinternacional"),
+            new StreamChannel("Canal 5 MX", "http://streamtp10.com/global2.php?stream=canal5mx"),
+            new StreamChannel("TUDN MX", "http://streamtp10.com/global2.php?stream=TUDNMX"),
+            new StreamChannel("FUTV", "http://streamtp10.com/global2.php?stream=futv"),
+            new StreamChannel("LaLiga Hypermotion", "http://streamtp10.com/global2.php?stream=laligahypermotion")
        ));
        channels.sort(Comparator.comparing(StreamChannel::getName, String.CASE_INSENSITIVE_ORDER));
        return Collections.unmodifiableList(channels);
--- a/app/src/main/java/com/streamplayer/DNSSetter.java
+++ b/app/src/main/java/com/streamplayer/DNSSetter.java
@@ -1,109 +0,0 @@
-package com.streamplayer;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
-import android.os.Build;
-
-import java.net.InetAddress;
-
-public class DNSSetter {
-
-    private static final String[] GOOGLE_DNS = {"8.8.8.8", "8.8.4.4"};
-
-    public static void configureDNSToGoogle(Context context) {
-        try {
-            // Configurar propiedades del sistema para usar DNS específicos
-            System.setProperty("networkaddress.cache.ttl", "60");
-            System.setProperty("networkaddress.cache.negative.ttl", "10");
-
-            // Forzar resolución usando DNS de Google
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                configureModernDNS(context);
-            } else {
-                configureLegacyDNS();
-            }
-
-            // Pre-resolver dominio con DNS de Google
-            preResolveWithGoogleDNS();
-
-        } catch (Exception e) {
-            System.out.println("Error configurando DNS de Google: " + e.getMessage());
-        }
-    }
-
-    private static void configureModernDNS(Context context) {
-        try {
-            ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-            NetworkRequest networkRequest = new NetworkRequest.Builder()
-                    .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                    .build();
-
-            connectivityManager.registerNetworkCallback(networkRequest, new ConnectivityManager.NetworkCallback() {
-                @Override
-                public void onAvailable(Network network) {
-                    super.onAvailable(network);
-
-                    // Configuración para priorizar DNS de Google
-                    // Aunque no podemos cambiar DNS directamente sin permisos especiales,
-                    // podemos optimizar la configuración de red
-                    try {
-                        NetworkCapabilities caps = connectivityManager.getNetworkCapabilities(network);
-                        if (caps != null) {
-                            System.out.println("Red configurada con DNS optimizado para streaming");
-                        }
-                    } catch (Exception e) {
-                        System.out.println("Error en configuración de red: " + e.getMessage());
-                    }
-                }
-            });
-
-        } catch (Exception e) {
-            System.out.println("Error configurando DNS moderno: " + e.getMessage());
-        }
-    }
-
-    private static void configureLegacyDNS() {
-        try {
-            // Para versiones antiguas, configuramos propiedades del sistema
-            System.setProperty("sun.net.inetaddr.ttl", "60");
-            System.setProperty("sun.net.inetaddr.negative.ttl", "10");
-
-            System.out.println("DNS legacy configurado para streaming");
-        } catch (Exception e) {
-            System.out.println("Error configurando DNS legacy: " + e.getMessage());
-        }
-    }
-
-    private static void preResolveWithGoogleDNS() {
-        try {
-            // Pre-resolver algunos dominios comunes para caching
-            Thread thread = new Thread(() -> {
-                try {
-                    String[] domains = {"streamtpmedia.com", "google.com", "doubleclick.net"};
-                    for (String domain : domains) {
-                        try {
-                            InetAddress.getByName(domain);
-                            System.out.println("Pre-resuelto: " + domain);
-                        } catch (Exception e) {
-                            System.out.println("Error pre-resolviendo " + domain + ": " + e.getMessage());
-                        }
-                    }
-                } catch (Exception e) {
-                    System.out.println("Error en pre-resolución: " + e.getMessage());
-                }
-            });
-            thread.start();
-
-        } catch (Exception e) {
-            System.out.println("Error en pre-resolución DNS: " + e.getMessage());
-        }
-    }
-
-    public static String getGoogleDNSInfo() {
-        return "DNS de Google configurado: " + String.join(", ", GOOGLE_DNS);
-    }
-}
--- a/app/src/main/java/com/streamplayer/DeviceRegistry.java
+++ b/app/src/main/java/com/streamplayer/DeviceRegistry.java
@@ -15,7 +15,6 @@ import java.io.IOException;
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;

 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -46,11 +45,8 @@ public class DeviceRegistry {

    public DeviceRegistry(Context context) {
        this.appContext = context.getApplicationContext();
-        this.httpClient = new OkHttpClient.Builder()
-                .connectTimeout(10, TimeUnit.SECONDS)
-                .readTimeout(15, TimeUnit.SECONDS)
-                .callTimeout(20, TimeUnit.SECONDS)
-                .build();
+        // Usar NetworkUtils para obtener cliente con DNS over HTTPS configurado
+        this.httpClient = NetworkUtils.getClient();
        this.executorService = Executors.newSingleThreadExecutor();
    }

--- a/app/src/main/java/com/streamplayer/EventRepository.java
+++ b/app/src/main/java/com/streamplayer/EventRepository.java
@@ -7,12 +7,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -24,22 +19,18 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+import okhttp3.Request;
+import okhttp3.Response;
+
 public class EventRepository {

    private static final String PREFS_NAME = "events_cache";
    private static final String KEY_JSON = "json";
    private static final String KEY_TIMESTAMP = "timestamp";
-    private static final String KEY_WORKING_URL = "working_url";
    private static final long CACHE_DURATION = 24L * 60 * 60 * 1000; // 24 horas

-    // Lista de URLs a intentar en orden (con sistema de fallback)
-    private static final String[] EVENT_URLS = {
-        "https://streamtpcloud.com/eventos.json",      // URL original
-        "https://streamtp10.com/eventos.json",         // URL actual
-        "https://streamtpmedia.com/eventos.json"       // URL anterior
-    };
-
-    private static final String DEFAULT_EVENTS_URL = "https://streamtpcloud.com/eventos.json";
+    // URL única para eventos (actualizado para evitar bloqueos de ISP)
+    private static final String EVENTS_URL = "http://streamtp10.com/eventos.json";

    public interface Callback {
        void onSuccess(List<EventItem> events);
@@ -83,130 +74,38 @@ public class EventRepository {
    }

    private String downloadJson(Context context) throws IOException {
-        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        String savedWorkingUrl = prefs.getString(KEY_WORKING_URL, null);
+        Request request = new Request.Builder()
+                .url(EVENTS_URL)
+                .header("User-Agent", NetworkUtils.getUserAgent())
+                .header("Accept", "application/json")
+                .build();

-        // Construir lista de URLs a intentar
-        // Primero la URL que funcionó la última vez, luego el resto
-        List<String> urlsToTry = new ArrayList<>();
-        if (savedWorkingUrl != null && !savedWorkingUrl.isEmpty()) {
-            urlsToTry.add(savedWorkingUrl);
-        }
-        for (String url : EVENT_URLS) {
-            if (!urlsToTry.contains(url)) {
-                urlsToTry.add(url);
-            }
-        }
-
-        IOException lastException = null;
-
-        // Intentar cada URL en orden
-        for (String urlString : urlsToTry) {
-            try {
-                String json = downloadFromUrl(urlString);
-                // Guardar la URL que funcionó
-                prefs.edit().putString(KEY_WORKING_URL, urlString).apply();
-                return json;
-            } catch (IOException e) {
-                lastException = e;
-                // Continuar con la siguiente URL
-            }
-        }
-
-        // Si todas fallaron, lanzar la última excepción
-        throw new IOException("No se pudo conectar a ninguna de las URLs disponibles. Último error: " +
-                (lastException != null ? lastException.getMessage() : "Error desconocido"));
-    }
-
-    private String downloadFromUrl(String urlString) throws IOException {
-        URL url = new URL(urlString);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-        connection.setConnectTimeout(15000);
-        connection.setReadTimeout(15000);
-        connection.setRequestMethod("GET");
-        connection.setRequestProperty("Accept", "application/json");
-        connection.setRequestProperty("User-Agent", "StreamPlayer/1.0");
-
-        // Habilitar seguimiento de redirecciones automáticamente
-        connection.setInstanceFollowRedirects(true);
-
-        String currentUrl = urlString;
-        int redirectCount = 0;
-        final int MAX_REDIRECTS = 5;
-
-        try {
-            int responseCode = connection.getResponseCode();
-
-            // Seguir redirecciones manualmente si es necesario
-            while (isRedirect(responseCode) && redirectCount < MAX_REDIRECTS) {
-                redirectCount++;
-                String newUrl = connection.getHeaderField("Location");
-
-                if (newUrl == null) {
-                    throw new IOException("Redirección sin cabecera Location");
-                }
-
-                // Manejar URLs relativas
-                if (newUrl.startsWith("/")) {
-                    newUrl = url.getProtocol() + "://" + url.getHost() + newUrl;
-                } else if (!newUrl.startsWith("http")) {
-                    newUrl = url.getProtocol() + "://" + url.getHost() +
-                            (url.getPort() > 0 ? ":" + url.getPort() : "") + "/" + newUrl;
-                }
-
-                currentUrl = newUrl;
-                url = new URL(currentUrl);
-                connection.disconnect();
-
-                connection = (HttpURLConnection) url.openConnection();
-                connection.setConnectTimeout(15000);
-                connection.setReadTimeout(15000);
-                connection.setRequestMethod("GET");
-                connection.setRequestProperty("Accept", "application/json");
-                connection.setRequestProperty("User-Agent", "StreamPlayer/1.0");
-                connection.setInstanceFollowRedirects(true);
-
-                responseCode = connection.getResponseCode();
+        try (Response response = NetworkUtils.getClient().newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("Error HTTP " + response.code() + ": " + response.message());
            }

-            if (responseCode != HttpURLConnection.HTTP_OK) {
-                throw new IOException("Error HTTP " + responseCode + ": " + connection.getResponseMessage());
+            if (response.body() == null) {
+                throw new IOException("Respuesta vacía del servidor");
            }

-            String contentType = connection.getContentType();
+            String contentType = response.header("Content-Type");
            // Permitir json o text/plain (Raw de Gitea a veces es text/plain)
            if (contentType != null && !contentType.contains("json") && !contentType.contains("text/plain")) {
-                throw new IOException("El servidor devolvió " + contentType + " en lugar de JSON. Verifica que la URL sea correcta.");
+                // Aceptamos text/plain también por flexibilidad
            }

-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
-                StringBuilder builder = new StringBuilder();
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    builder.append(line);
-                }
-                String response = builder.toString();
+            String responseBody = response.body().string();

-                // Validar que no sea HTML
-                if (response.trim().startsWith("<!") || response.trim().startsWith("<html")) {
-                    throw new IOException("El servidor devolvió HTML en lugar de JSON. La URL del endpoint puede estar incorrecta o el servidor tiene problemas.");
-                }
-
-                return response;
+            // Validar que no sea HTML
+            if (responseBody.trim().startsWith("<!") || responseBody.trim().startsWith("<html")) {
+                throw new IOException("El servidor devolvió HTML en lugar de JSON. La URL del endpoint puede estar incorrecta o el servidor tiene problemas.");
            }
-        } finally {
-            connection.disconnect();
+
+            return responseBody;
        }
    }

-    private boolean isRedirect(int statusCode) {
-        return statusCode == HttpURLConnection.HTTP_MOVED_PERM ||
-                statusCode == HttpURLConnection.HTTP_MOVED_TEMP ||
-                statusCode == HttpURLConnection.HTTP_SEE_OTHER ||
-                statusCode == 307 || // Temporary Redirect
-                statusCode == 308;  // Permanent Redirect
-    }
-
    private List<EventItem> parseEvents(String json) throws JSONException {
        if (json == null || json.trim().isEmpty()) {
            throw new JSONException("La respuesta está vacía");
@@ -252,8 +151,9 @@ public class EventRepository {
        if (link == null) {
            return "";
        }
-        String updated = link.replace("streamtpmedia.com", "streamtpcloud.com");
-        return updated.replace("global1.php", "global2.php");
+        // Mantener el endpoint original (global1/global2) que entregue el proveedor.
+        return link.replace("streamtpmedia.com", "streamtp10.com")
+                   .replace("streamtpcloud.com", "streamtp10.com");
    }

    private String extractChannelName(String link) {
--- a/app/src/main/java/com/streamplayer/MainActivity.java
+++ b/app/src/main/java/com/streamplayer/MainActivity.java
@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
@@ -14,6 +15,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.text.TextUtils;

+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -71,7 +73,18 @@ public class MainActivity extends AppCompatActivity {
        eventAdapter = new EventAdapter(event -> openPlayer(event.getTitle(), event.getPageUrl()));
        eventRepository = new EventRepository();
        channelLayoutManager = new GridLayoutManager(this, getSpanCount());
-        eventLayoutManager = new LinearLayoutManager(this);
+        eventLayoutManager = new LinearLayoutManager(this) {
+            @Override
+            public View onInterceptFocusSearch(View focused, int direction) {
+                if (direction == View.FOCUS_DOWN) {
+                    int pos = getPosition(focused);
+                    if (pos == getItemCount() - 1) {
+                        return focused;
+                    }
+                }
+                return super.onInterceptFocusSearch(focused, direction);
+            }
+        };

        sections = buildSections();
        sectionList.setLayoutManager(new LinearLayoutManager(this));
@@ -169,6 +182,8 @@ public class MainActivity extends AppCompatActivity {
        refreshButton.setVisibility(View.GONE);
        contentList.setLayoutManager(channelLayoutManager);
        contentList.setAdapter(channelAdapter);
+        // Clear any scroll listeners from Events section
+        contentList.clearOnScrollListeners();
        loadingIndicator.setVisibility(View.GONE);
        channelAdapter.submitList(section.channels);
        if (section.channels.isEmpty()) {
@@ -185,6 +200,9 @@ public class MainActivity extends AppCompatActivity {
        refreshButton.setVisibility(View.VISIBLE);
        contentList.setLayoutManager(eventLayoutManager);
        contentList.setAdapter(eventAdapter);
+        // Clear existing listeners
+        contentList.clearOnScrollListeners();
+
        if (cachedEvents.isEmpty()) {
            loadEvents(false);
        } else {
--- a/app/src/main/java/com/streamplayer/NetworkUtils.java
+++ b/app/src/main/java/com/streamplayer/NetworkUtils.java
@@ -0,0 +1,121 @@
+package com.streamplayer;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import okhttp3.Dns;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.dnsoverhttps.DnsOverHttps;
+
+/**
+ * Utilidad centralizada para configuración de red.
+ * Fuerza DNS over HTTPS con fallback Google -> Cloudflare -> DNS del sistema.
+ */
+public class NetworkUtils {
+
+    private static final OkHttpClient CLIENT;
+    private static final String USER_AGENT = "Mozilla/5.0 (Linux; Android 13; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36";
+    private static final String GOOGLE_DOH_URL = "https://dns.google/dns-query";
+    private static final String CLOUDFLARE_DOH_URL = "https://cloudflare-dns.com/dns-query";
+
+    static {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                .connectTimeout(20, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
+                .writeTimeout(20, TimeUnit.SECONDS)
+                .followRedirects(true)
+                .followSslRedirects(true)
+                .retryOnConnectionFailure(true);
+
+        try {
+            // Configurar para aceptar todos los certificados SSL (útil para diagnosticar problemas de ISP)
+            // NOTA: Esto es temporal para diagnosticar si hay problemas de certificados MITM
+            final TrustManager[] trustAllCerts = new TrustManager[]{
+                new X509TrustManager() {
+                    @Override
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+                    @Override
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return new X509Certificate[]{};
+                    }
+                }
+            };
+
+            final SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+            
+            builder.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0]);
+            builder.hostnameVerifier((hostname, session) -> true);
+
+            OkHttpClient bootstrap = new OkHttpClient.Builder()
+                    .connectTimeout(10, TimeUnit.SECONDS)
+                    .readTimeout(10, TimeUnit.SECONDS)
+                    .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
+                    .hostnameVerifier((hostname, session) -> true)
+                    .retryOnConnectionFailure(true)
+                    .build();
+
+            final DnsOverHttps googleDns = new DnsOverHttps.Builder()
+                    .client(bootstrap)
+                    .url(HttpUrl.get(GOOGLE_DOH_URL))
+                    .bootstrapDnsHosts(
+                            InetAddress.getByName("8.8.8.8"),
+                            InetAddress.getByName("8.8.4.4"))
+                    .includeIPv6(false)
+                    .build();
+
+            final DnsOverHttps cloudflareDns = new DnsOverHttps.Builder()
+                    .client(bootstrap)
+                    .url(HttpUrl.get(CLOUDFLARE_DOH_URL))
+                    .bootstrapDnsHosts(
+                            InetAddress.getByName("1.1.1.1"),
+                            InetAddress.getByName("1.0.0.1"))
+                    .includeIPv6(false)
+                    .build();
+
+            builder.dns(hostname -> {
+                try {
+                    List<InetAddress> result = googleDns.lookup(hostname);
+                    if (result != null && !result.isEmpty()) {
+                        return result;
+                    }
+                } catch (Exception ignored) {
+                }
+
+                try {
+                    List<InetAddress> result = cloudflareDns.lookup(hostname);
+                    if (result != null && !result.isEmpty()) {
+                        return result;
+                    }
+                } catch (Exception ignored) {
+                }
+
+                return Dns.SYSTEM.lookup(hostname);
+            });
+
+        } catch (Exception e) {
+            builder.dns(Dns.SYSTEM);
+            System.out.println("Error configurando DNS over HTTPS: " + e.getMessage());
+        }
+
+        CLIENT = builder.build();
+    }
+
+    public static OkHttpClient getClient() {
+        return CLIENT;
+    }
+
+    public static String getUserAgent() {
+        return USER_AGENT;
+    }
+}
--- a/app/src/main/java/com/streamplayer/PlayerActivity.java
+++ b/app/src/main/java/com/streamplayer/PlayerActivity.java
@@ -1,8 +1,12 @@
 package com.streamplayer;

 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.StrictMode;
+import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
@@ -10,37 +14,24 @@ import android.widget.ProgressBar;
 import android.widget.TextView;

 import androidx.appcompat.app.AppCompatActivity;
-
-import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Player;
-import androidx.media3.exoplayer.DefaultRenderersFactory;
-import androidx.media3.exoplayer.trackselection.DefaultTrackSelector;
-import androidx.media3.datasource.okhttp.OkHttpDataSource;
-import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.datasource.DefaultHttpDataSource;
+import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.exoplayer.hls.HlsMediaSource;
 import androidx.media3.ui.PlayerView;
-import androidx.media3.common.util.Util;
-import androidx.annotation.OptIn;
-import androidx.media3.common.util.UnstableApi;

 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;

-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.dnsoverhttps.DnsOverHttps;
-
-@OptIn(markerClass = UnstableApi.class)
 public class PlayerActivity extends AppCompatActivity {

    public static final String EXTRA_CHANNEL_NAME = "extra_channel_name";
    public static final String EXTRA_CHANNEL_URL = "extra_channel_url";
+    private static final String TAG = "PlayerActivity";
+    private static final long STARTUP_TIMEOUT_MS = 12000L;

    private PlayerView playerView;
    private ProgressBar loadingIndicator;
@@ -50,14 +41,18 @@ public class PlayerActivity extends AppCompatActivity {
    private View playerToolbar;

    private ExoPlayer player;
-    private DefaultTrackSelector trackSelector;
    private String channelName;
    private String channelUrl;
    private boolean overlayVisible = true;
-    private OkHttpClient okHttpClient;
    private int retryCount = 0;
-    private static final int MAX_RETRIES = 3;
    private String lastStreamUrl;
+    private String currentChannelPageUrl;
+    private boolean playbackStarted = false;
+    private boolean alternateSourceAttempted = false;
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+    private Runnable startupTimeoutRunnable;
+    private final Object resolveLock = new Object();
+    private int resolveGeneration = 0;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -83,11 +78,11 @@ public class PlayerActivity extends AppCompatActivity {
            finish();
            return;
        }
+        currentChannelPageUrl = channelUrl;

        initViews();
        channelLabel.setText(channelName);

-        DNSSetter.configureDNSToGoogle(this);
        loadChannel();
    }

@@ -101,118 +96,261 @@ public class PlayerActivity extends AppCompatActivity {

        closeButton.setOnClickListener(v -> finish());
        playerView.setOnClickListener(v -> toggleOverlay());
+        playerView.setUseController(false);
    }

    private void loadChannel() {
        showLoading(true);
-        retryCount = 0; // Resetear contador al cargar nuevo canal
+        retryCount = 0;
+        alternateSourceAttempted = false;
+        currentChannelPageUrl = channelUrl;
+        loadChannelFromPageUrl(channelUrl);
+    }
+
+    private void loadChannelFromPageUrl(String pageUrl) {
+        currentChannelPageUrl = pageUrl;
+        final int requestGeneration;
+        synchronized (resolveLock) {
+            resolveGeneration++;
+            requestGeneration = resolveGeneration;
+        }
+
+        Log.d(TAG, "Resolviendo stream desde: " + pageUrl + " (req=" + requestGeneration + ")");
+
        new Thread(() -> {
            try {
-                String resolvedUrl = StreamUrlResolver.resolve(channelUrl);
-                runOnUiThread(() -> startPlayback(resolvedUrl));
+                String resolvedUrl = StreamUrlResolver.resolve(pageUrl);
+                Log.d(TAG, "Stream resuelto: " + resolvedUrl + " (req=" + requestGeneration + ")");
+                runOnUiThread(() -> {
+                    if (!isLatestResolveRequest(requestGeneration)) {
+                        Log.d(TAG, "Ignorando resultado viejo (req=" + requestGeneration + ")");
+                        return;
+                    }
+                    startPlayback(resolvedUrl);
+                });
            } catch (IOException e) {
-                runOnUiThread(() -> showError("No se pudo conectar con el canal: " + e.getMessage()));
+                runOnUiThread(() -> {
+                    if (!isLatestResolveRequest(requestGeneration)) {
+                        return;
+                    }
+                    if (!tryAlternateSource("No se pudo conectar con el canal. " + e.getMessage())) {
+                        showError("No se pudo conectar con el canal: " + e.getMessage());
+                    }
+                });
            } catch (Exception e) {
-                runOnUiThread(() -> showError("Error inesperado: " + e.getMessage()));
+                runOnUiThread(() -> {
+                    if (!isLatestResolveRequest(requestGeneration)) {
+                        return;
+                    }
+                    if (!tryAlternateSource("Error inesperado al resolver stream. " + e.getMessage())) {
+                        showError("Error inesperado: " + e.getMessage());
+                    }
+                });
            }
        }).start();
    }

+    private boolean isLatestResolveRequest(int requestGeneration) {
+        synchronized (resolveLock) {
+            return requestGeneration == resolveGeneration;
+        }
+    }
+
    private void startPlayback(String streamUrl) {
        try {
            releasePlayer();
-            lastStreamUrl = streamUrl; // Guardar URL para reintentos
-            retryCount = 0; // Resetear contador al iniciar nueva reproducción
-            DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(this)
-                    .setEnableDecoderFallback(true)
-                    .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON);
+            lastStreamUrl = streamUrl;
+            retryCount = 0;
+            playbackStarted = false;
+            scheduleStartupTimeout();
+            Log.d(TAG, "Iniciando reproducción: " + streamUrl);

-            // Configurar track selector para calidad adaptativa (no forzar máxima calidad)
-            trackSelector = new DefaultTrackSelector(this);
-            DefaultTrackSelector.Parameters params = trackSelector.buildUponParameters()
-                    .setForceHighestSupportedBitrate(false)  // Permitir calidad adaptativa
-                    .setMaxVideoBitrate(Integer.MAX_VALUE)     // Sin límite máximo de bitrate
-                    .build();
-            trackSelector.setParameters(params);
+            DefaultHttpDataSource.Factory httpFactory = new DefaultHttpDataSource.Factory()
+                    .setUserAgent(VlcPlayerConfig.USER_AGENT)
+                    .setAllowCrossProtocolRedirects(true)
+                    .setConnectTimeoutMs(15000)
+                    .setReadTimeoutMs(20000);

-            player = new ExoPlayer.Builder(this, renderersFactory)
-                    .setTrackSelector(trackSelector)
-                    .setSeekForwardIncrementMs(10_000)
-                    .setSeekBackIncrementMs(10_000)
-                    .build();
+            Map<String, String> headers = new HashMap<>();
+            headers.put("User-Agent", VlcPlayerConfig.USER_AGENT);
+            httpFactory.setDefaultRequestProperties(headers);
+
+            HlsMediaSource mediaSource = new HlsMediaSource.Factory(httpFactory)
+                    .setAllowChunklessPreparation(true)
+                    .createMediaSource(MediaItem.fromUri(Uri.parse(streamUrl)));
+
+            player = new ExoPlayer.Builder(this).build();
            playerView.setPlayer(player);
+            setupPlayerListener();

-            player.addListener(new Player.Listener() {
-                @Override
-                public void onPlaybackStateChanged(int playbackState) {
-                    if (playbackState == Player.STATE_READY) {
-                        showLoading(false);
-                        retryCount = 0; // Resetear contador de reintentos al reproducir exitosamente
-                    } else if (playbackState == Player.STATE_BUFFERING) {
-                        showLoading(true);
-                    }
-                }
+            player.setMediaSource(mediaSource);
+            player.prepare();
+            player.play();
+            setOverlayVisible(false);
+        } catch (Exception e) {
+            cancelStartupTimeout();
+            Log.e(TAG, "Error al iniciar reproducción", e);
+            if (!tryAlternateSource("Error al inicializar reproductor. Probando fuente alterna...")) {
+                showError("Error al inicializar reproductor: " + e.getMessage());
+            }
+        }
+    }

-                @Override
-                public void onPlayerError(PlaybackException error) {
-                    String errorMsg = error.getMessage() != null ? error.getMessage() : "";
-                    String detail = error.getCause() != null ?
-                            error.getCause().getMessage() : "";
-                    String fullError = errorMsg + " " + detail;
+    private void setupPlayerListener() {
+        if (player == null) {
+            return;
+        }

-                    // Verificar si es un error que justifica reintento (404, conectividad, etc.)
-                    boolean isRetryableError =
-                        fullError.contains("404") ||
-                        fullError.contains("403") ||
-                        fullError.contains("timeout") ||
-                        fullError.contains("Unable to connect") ||
-                        fullError.contains("Network") ||
-                        fullError.contains("source error") ||
-                        error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED ||
-                        error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT ||
-                        error.errorCode == PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS;
-
-                    if (isRetryableError && retryCount < MAX_RETRIES) {
-                        retryCount++;
+        player.addListener(new Player.Listener() {
+            @Override
+            public void onPlaybackStateChanged(int playbackState) {
+                switch (playbackState) {
+                    case Player.STATE_BUFFERING:
+                        Log.d(TAG, "Exo Event: BUFFERING");
+                        runOnUiThread(() -> showLoading(true));
+                        break;
+                    case Player.STATE_READY:
+                        Log.d(TAG, "Exo Event: READY");
                        runOnUiThread(() -> {
-                            showLoading(true);
-                            showError("Error de conexión. Reintentando... (" + retryCount + "/" + MAX_RETRIES + ")");
+                            playbackStarted = true;
+                            cancelStartupTimeout();
+                            showLoading(false);
+                            retryCount = 0;
                        });
-
-                        // Reintentar después de 2 segundos
-                        new android.os.Handler(android.os.Looper.getMainLooper()).postDelayed(() -> {
-                            if (lastStreamUrl != null) {
-                                startPlayback(lastStreamUrl);
-                            } else {
-                                loadChannel();
-                            }
-                        }, 2000);
-                    } else {
-                        // Mostrar error final después de agotar reintentos
-                        String finalMessage = "Error al reproducir: " + fullError;
-                        if (retryCount >= MAX_RETRIES) {
-                            finalMessage += "\n\nSe agotaron los reintentos (" + MAX_RETRIES + ").";
-                        }
-                        showError(finalMessage);
-                    }
+                        break;
+                    case Player.STATE_ENDED:
+                        Log.d(TAG, "Exo Event: ENDED");
+                        runOnUiThread(() -> {
+                            cancelStartupTimeout();
+                            finish();
+                        });
+                        break;
+                    default:
+                        break;
                }
+            }
+
+            @Override
+            public void onIsPlayingChanged(boolean isPlaying) {
+                Log.d(TAG, "Exo Event: isPlaying=" + isPlaying);
+                if (isPlaying) {
+                    runOnUiThread(() -> {
+                        playbackStarted = true;
+                        cancelStartupTimeout();
+                        showLoading(false);
+                    });
+                }
+            }
+
+            @Override
+            public void onPlayerError(PlaybackException error) {
+                String message = error.getMessage() != null
+                        ? error.getMessage()
+                        : "code=" + error.errorCode;
+                Log.e(TAG, "Exo Error: " + message, error);
+                runOnUiThread(() -> {
+                    cancelStartupTimeout();
+                    handlePlaybackError("Error de reproducción Exo: " + message);
+                });
+            }
+        });
+    }
+
+    private void handlePlaybackError(String errorMsg) {
+        if (tryAlternateSource("Falló la reproducción. " + errorMsg)) {
+            return;
+        }
+
+        String lower = errorMsg.toLowerCase();
+        boolean isRetryableError =
+                lower.contains("404") ||
+                lower.contains("403") ||
+                lower.contains("timeout") ||
+                lower.contains("network") ||
+                lower.contains("connection") ||
+                lower.contains("source");
+
+        if (isRetryableError && retryCount < VlcPlayerConfig.MAX_RETRIES) {
+            retryCount++;
+            runOnUiThread(() -> {
+                showLoading(true);
+                errorMessage.setVisibility(View.VISIBLE);
+                errorMessage.setText("Error de conexión. Reintentando... (" + retryCount + "/" + VlcPlayerConfig.MAX_RETRIES + ")");
            });

-            MediaItem mediaItem = MediaItem.fromUri(streamUrl);
-            player.setMediaSource(buildMediaSource(mediaItem));
-            player.prepare();
-            player.setPlayWhenReady(true);
-            setOverlayVisible(false);
-
-        } catch (Exception e) {
-            showError("Error al inicializar reproductor: " + e.getMessage());
+            mainHandler.postDelayed(() -> {
+                if (lastStreamUrl != null) {
+                    startPlayback(lastStreamUrl);
+                } else {
+                    loadChannel();
+                }
+            }, 1500);
+        } else {
+            String finalMessage = "Error al reproducir: " + errorMsg;
+            if (retryCount >= VlcPlayerConfig.MAX_RETRIES) {
+                finalMessage += "\n\nSe agotaron los reintentos (" + VlcPlayerConfig.MAX_RETRIES + ").";
+            }
+            showError(finalMessage);
        }
    }

+    private void scheduleStartupTimeout() {
+        cancelStartupTimeout();
+        startupTimeoutRunnable = () -> {
+            if (!playbackStarted) {
+                Log.w(TAG, "Timeout de inicio de reproducción");
+                if (!tryAlternateSource("El canal no inició a tiempo. Probando fuente alterna...")) {
+                    handlePlaybackError("Timeout al iniciar stream");
+                }
+            }
+        };
+        mainHandler.postDelayed(startupTimeoutRunnable, STARTUP_TIMEOUT_MS);
+    }
+
+    private void cancelStartupTimeout() {
+        if (startupTimeoutRunnable != null) {
+            mainHandler.removeCallbacks(startupTimeoutRunnable);
+            startupTimeoutRunnable = null;
+        }
+    }
+
+    private boolean tryAlternateSource(String reason) {
+        if (alternateSourceAttempted) {
+            return false;
+        }
+
+        String alternateUrl = buildAlternateGlobalUrl(currentChannelPageUrl);
+        if (alternateUrl == null || alternateUrl.equals(currentChannelPageUrl)) {
+            return false;
+        }
+
+        alternateSourceAttempted = true;
+        Log.w(TAG, "Probando fuente alterna: " + alternateUrl + " | motivo: " + reason);
+
+        showLoading(true);
+        errorMessage.setVisibility(View.VISIBLE);
+        errorMessage.setText("Problema con la fuente actual.\nProbando fuente alterna...");
+        loadChannelFromPageUrl(alternateUrl);
+        return true;
+    }
+
+    private String buildAlternateGlobalUrl(String url) {
+        if (url == null || url.isEmpty()) {
+            return null;
+        }
+        if (url.contains("global2.php")) {
+            return url.replace("global2.php", "global1.php");
+        }
+        if (url.contains("global1.php")) {
+            return url.replace("global1.php", "global2.php");
+        }
+        return null;
+    }
+
    private void showLoading(boolean show) {
        loadingIndicator.setVisibility(show ? View.VISIBLE : View.GONE);
        errorMessage.setVisibility(View.GONE);
-        playerView.setVisibility(show ? View.GONE : View.VISIBLE);
+        playerView.setVisibility(View.VISIBLE);
        if (show) {
            setOverlayVisible(true);
        }
@@ -227,68 +365,20 @@ public class PlayerActivity extends AppCompatActivity {
    }

    private void releasePlayer() {
+        cancelStartupTimeout();
+        playbackStarted = false;
        if (player != null) {
            player.release();
            player = null;
        }
-    }
-
-    private MediaSource buildMediaSource(MediaItem mediaItem) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Referer", channelUrl);
-        headers.put("Origin", "https://streamtpcloud.com");
-        headers.put("Accept", "*/*");
-        headers.put("Connection", "keep-alive");
-
-        String userAgent = Util.getUserAgent(this, "StreamPlayer");
-
-        OkHttpDataSource.Factory factory = new OkHttpDataSource.Factory(provideOkHttpClient())
-                .setUserAgent(userAgent)
-                .setDefaultRequestProperties(headers);
-        return new HlsMediaSource.Factory(factory).createMediaSource(mediaItem);
-    }
-
-    private OkHttpClient provideOkHttpClient() {
-        if (okHttpClient != null) {
-            return okHttpClient;
-        }
-
-        try {
-            OkHttpClient bootstrap = new OkHttpClient.Builder()
-                    .connectTimeout(20, TimeUnit.SECONDS)
-                    .readTimeout(30, TimeUnit.SECONDS)
-                    .retryOnConnectionFailure(true)
-                    .build();
-
-            DnsOverHttps dohDns = new DnsOverHttps.Builder()
-                    .client(bootstrap)
-                    .url(HttpUrl.get("https://dns.google/dns-query"))
-                    .bootstrapDnsHosts(
-                            InetAddress.getByName("8.8.8.8"),
-                            InetAddress.getByName("8.8.4.4"))
-                    .build();
-
-            okHttpClient = bootstrap.newBuilder()
-                    .dns(dohDns)
-                    .build();
-        } catch (UnknownHostException e) {
-            okHttpClient = new OkHttpClient.Builder()
-                    .connectTimeout(20, TimeUnit.SECONDS)
-                    .readTimeout(30, TimeUnit.SECONDS)
-                    .retryOnConnectionFailure(true)
-                    .build();
-        }
-
-        return okHttpClient;
+        playerView.setPlayer(null);
    }

    @Override
    protected void onStart() {
        super.onStart();
-        if (player != null) {
-            playerView.onResume();
-        } else if (channelUrl != null) {
-            loadChannel();
+        if (player != null && !player.isPlaying()) {
+            player.play();
        }
    }

@@ -296,7 +386,7 @@ public class PlayerActivity extends AppCompatActivity {
    protected void onResume() {
        super.onResume();
        if (player != null) {
-            playerView.onResume();
+            player.play();
        }
    }

@@ -304,14 +394,14 @@ public class PlayerActivity extends AppCompatActivity {
    protected void onPause() {
        super.onPause();
        if (player != null) {
-            playerView.onPause();
+            player.pause();
        }
    }

    @Override
    protected void onStop() {
        super.onStop();
-        releasePlayer();
+        // Keep player for quick resume.
    }

    @Override
--- a/app/src/main/java/com/streamplayer/StreamUrlResolver.java
+++ b/app/src/main/java/com/streamplayer/StreamUrlResolver.java
@@ -1,12 +1,26 @@
 package com.streamplayer;

+import android.util.Base64;
+
 import java.io.IOException;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.security.cert.X509Certificate;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import okhttp3.Dns;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -15,60 +29,385 @@ import okhttp3.dnsoverhttps.DnsOverHttps;

 /**
 * Resuelve la URL real del stream extrayendo playbackURL de la página.
- * Utiliza DNS de Google para evitar bloqueos.
+ * Utiliza DNS over HTTPS (Google + Cloudflare) para evitar bloqueos.
+ * Soporta múltiples formatos de páginas y streams directos.
+ * Soporta JWPlayer con DRM ClearKey.
 */
 public final class StreamUrlResolver {

-    // Patrón para extraer la URL del stream directamente
+    // Patrón original para streamtp10.com
    private static final Pattern PLAYBACK_URL_PATTERN =
            Pattern.compile("var\\s+playbackURL\\s*=\\s*[\"']([^\"']+)[\"']");

+    // Patrón para source src en tags video
+    private static final Pattern VIDEO_SOURCE_PATTERN =
+            Pattern.compile("<source[^>]+src=[\"']([^\"']+)[\"']");
+
+    // Patrón para URLs M3U8 en cualquier parte del HTML
+    private static final Pattern M3U8_URL_PATTERN =
+            Pattern.compile("(https?://[^\\s'\"<>]+\\.m3u8[^\\s'\"<>]*)");
+
+    // Patrón para URLs de stream en comillas dobles o simples
+    private static final Pattern STREAM_URL_PATTERN =
+            Pattern.compile("['\"](https?://[^'\"<>\\s]+?\\.(?:m3u8|mp4|ts)[^'\"<>\\s]*)['\"]");
+
+    // Patrón para file: o url: en JavaScript
+    private static final Pattern JS_URL_PATTERN =
+            Pattern.compile("(?:file|url|stream|source)\\s*[:=]\\s*[\"'](https?://[^\"']+)[\"']",
+                    Pattern.CASE_INSENSITIVE);
+
+    // Patrón para JWPlayer sources con "file": "url"
+    private static final Pattern JWPLAYER_FILE_PATTERN =
+            Pattern.compile("\"file\"\\s*:\\s*\"([^\"]+\\.m3u8[^\"]*)\"");
+
+    // Patrón para pares [indice, "base64"] del nuevo playbackURL ofuscado
+    private static final Pattern OBFUSCATED_PAIR_PATTERN =
+            Pattern.compile("\\[(\\d+)\\s*,\\s*[\"']([^\"']+)[\"']\\]");
+
+    // Patrón para k = fn1() + fn2()
+    private static final Pattern OBFUSCATED_K_PATTERN =
+            Pattern.compile("var\\s+k\\s*=\\s*([A-Za-z_$][\\w$]*)\\(\\)\\s*\\+\\s*([A-Za-z_$][\\w$]*)\\(\\)");
+
+    // Patrón para function fn() { return 12345; }
+    private static final Pattern JS_RETURN_NUMBER_FUNCTION_PATTERN =
+            Pattern.compile("function\\s+([A-Za-z_$][\\w$]*)\\s*\\(\\)\\s*\\{\\s*return\\s*(\\d+)\\s*;?\\s*\\}",
+                    Pattern.DOTALL);
+
    private static final String USER_AGENT = "Mozilla/5.0 (Linux; Android 13; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36";

    private static final OkHttpClient CLIENT;

    static {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
-                .connectTimeout(15, TimeUnit.SECONDS)
-                .readTimeout(15, TimeUnit.SECONDS)
-                .followRedirects(true);
-
+        OkHttpClient client = null;
        try {
-            // DNS de Google (8.8.8.8)
-            OkHttpClient bootstrap = new OkHttpClient.Builder().build();
-            DnsOverHttps dns = new DnsOverHttps.Builder()
+            final TrustManager[] trustAllCerts = new TrustManager[]{
+                new X509TrustManager() {
+                    @Override
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+                    @Override
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return new X509Certificate[]{};
+                    }
+                }
+            };
+
+            final SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+
+            OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                    .connectTimeout(15, TimeUnit.SECONDS)
+                    .readTimeout(15, TimeUnit.SECONDS)
+                    .followRedirects(true)
+                    .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
+                    .hostnameVerifier((hostname, session) -> true);
+
+            OkHttpClient bootstrap = new OkHttpClient.Builder()
+                    .connectTimeout(10, TimeUnit.SECONDS)
+                    .readTimeout(10, TimeUnit.SECONDS)
+                    .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
+                    .hostnameVerifier((hostname, session) -> true)
+                    .build();
+
+            final DnsOverHttps googleDns = new DnsOverHttps.Builder()
                    .client(bootstrap)
                    .url(HttpUrl.get("https://dns.google/dns-query"))
                    .bootstrapDnsHosts(
                            InetAddress.getByName("8.8.8.8"),
                            InetAddress.getByName("8.8.4.4"))
+                    .includeIPv6(false)
                    .build();
-            builder.dns(dns);
-        } catch (UnknownHostException e) {
-            // Fallback a DNS del sistema
-        }

-        CLIENT = builder.build();
+            final DnsOverHttps cloudflareDns = new DnsOverHttps.Builder()
+                    .client(bootstrap)
+                    .url(HttpUrl.get("https://cloudflare-dns.com/dns-query"))
+                    .bootstrapDnsHosts(
+                            InetAddress.getByName("1.1.1.1"),
+                            InetAddress.getByName("1.0.0.1"))
+                    .includeIPv6(false)
+                    .build();
+
+            builder.dns(hostname -> {
+                try {
+                    List<InetAddress> result = googleDns.lookup(hostname);
+                    if (result != null && !result.isEmpty()) {
+                        return result;
+                    }
+                } catch (Exception ignored) {
+                }
+
+                try {
+                    List<InetAddress> result = cloudflareDns.lookup(hostname);
+                    if (result != null && !result.isEmpty()) {
+                        return result;
+                    }
+                } catch (Exception ignored) {
+                }
+
+                return Dns.SYSTEM.lookup(hostname);
+            });
+            
+            client = builder.build();
+        } catch (Exception e) {
+            client = new OkHttpClient.Builder()
+                    .connectTimeout(15, TimeUnit.SECONDS)
+                    .readTimeout(15, TimeUnit.SECONDS)
+                    .followRedirects(true)
+                    .dns(Dns.SYSTEM)
+                    .build();
+        }
+        CLIENT = client;
    }

    private StreamUrlResolver() {
    }

    public static String resolve(String pageUrl) throws IOException {
+        // Primero verificar si la URL ya parece ser un stream directo
+        if (isDirectStreamUrl(pageUrl)) {
+            return pageUrl;
+        }
+
        String html = downloadPage(pageUrl);

-        // Buscar playbackURL directamente en el HTML
-        Matcher matcher = PLAYBACK_URL_PATTERN.matcher(html);
-        if (matcher.find()) {
-            String url = matcher.group(1);
-            if (url != null && !url.isEmpty() && url.startsWith("http")) {
-                return url;
-            }
+        // Si el contenido ya parece ser un stream M3U8, retornarlo directamente
+        if (html.startsWith("#EXTM3U") || html.startsWith("#EXT")) {
+            return pageUrl;
+        }
+
+        // Intentar múltiples patrones de extracción
+        String streamUrl = null;
+
+        // 1. Patrón original: var playbackURL = "..."
+        streamUrl = extractWithPattern(html, PLAYBACK_URL_PATTERN);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // 2. Patrón: <source src="...">
+        streamUrl = extractWithPattern(html, VIDEO_SOURCE_PATTERN);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // 3. Patrón: URLs M3U8 directas
+        streamUrl = extractWithPattern(html, M3U8_URL_PATTERN);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // 4. Patrón: URLs de stream en comillas
+        streamUrl = extractWithPattern(html, STREAM_URL_PATTERN);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // 5. Patrón: JavaScript file: / url: / stream:
+        streamUrl = extractWithPattern(html, JS_URL_PATTERN);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // 6. Patrón: JWPlayer "file": "url.m3u8" (para reproductores web y otros)
+        streamUrl = extractWithPattern(html, JWPLAYER_FILE_PATTERN);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // 7. Nuevo formato ofuscado: playbackURL generado con atob + fromCharCode
+        streamUrl = decodeObfuscatedPlaybackUrl(html);
+        if (isValidStreamUrl(streamUrl)) {
+            return streamUrl;
+        }
+
+        // Si no encontramos nada con patrones, intentar usar la URL original
+        // como stream directo (útil para URLs que ya son streams)
+        if (html.contains(".m3u8") || html.contains("stream") || html.contains("video")) {
+            return pageUrl;
+        }
+
+        // Último recurso: si la URL viene de sudamericaplay.com o similares,
+        // intentar usarla directamente
+        if (pageUrl.contains("sudamericaplay.com") ||
+            pageUrl.contains("paramount")) {
+            return pageUrl;
        }

        // Si no encontramos la URL, mostrar un fragmento del HTML para debug
        String preview = html.length() > 500 ? html.substring(0, 500) : html;
-        throw new IOException("No se encontró la URL del stream en la página. Vista previa: " + preview);
+        throw new IOException("No se encontró la URL del stream en la página. URL: " + pageUrl + ". Vista previa: " + preview);
+    }
+
+    /**
+     * Decodifica páginas donde playbackURL se arma carácter por carácter con:
+     * playbackURL += String.fromCharCode(parseInt(atob(v).replace(/\D/g,'')) - k)
+     */
+    private static String decodeObfuscatedPlaybackUrl(String html) {
+        if (html == null ||
+            !html.contains("var playbackURL") ||
+            !html.contains("playbackURL+=") ||
+            !html.contains("String.fromCharCode") ||
+            !html.contains("atob(")) {
+            return null;
+        }
+
+        int scriptStart = html.indexOf("var playbackURL");
+        if (scriptStart < 0) {
+            return null;
+        }
+
+        int scriptEnd = html.indexOf("var p2pConfig", scriptStart);
+        if (scriptEnd < 0) {
+            scriptEnd = html.indexOf("</script>", scriptStart);
+        }
+        if (scriptEnd < 0 || scriptEnd <= scriptStart) {
+            scriptEnd = Math.min(html.length(), scriptStart + 20000);
+        }
+
+        String script = html.substring(scriptStart, scriptEnd);
+
+        Matcher kMatcher = OBFUSCATED_K_PATTERN.matcher(script);
+        if (!kMatcher.find()) {
+            return null;
+        }
+
+        String functionA = kMatcher.group(1);
+        String functionB = kMatcher.group(2);
+
+        Map<String, Long> functionValues = new HashMap<>();
+        Matcher functionMatcher = JS_RETURN_NUMBER_FUNCTION_PATTERN.matcher(script);
+        while (functionMatcher.find()) {
+            try {
+                functionValues.put(functionMatcher.group(1), Long.parseLong(functionMatcher.group(2)));
+            } catch (NumberFormatException ignored) {
+            }
+        }
+
+        Long valueA = functionValues.get(functionA);
+        Long valueB = functionValues.get(functionB);
+        if (valueA == null || valueB == null) {
+            return null;
+        }
+
+        long k = valueA + valueB;
+
+        List<EncodedPair> pairs = new ArrayList<>();
+        Matcher pairMatcher = OBFUSCATED_PAIR_PATTERN.matcher(script);
+        while (pairMatcher.find()) {
+            try {
+                int index = Integer.parseInt(pairMatcher.group(1));
+                pairs.add(new EncodedPair(index, pairMatcher.group(2)));
+            } catch (NumberFormatException ignored) {
+            }
+        }
+
+        if (pairs.isEmpty()) {
+            return null;
+        }
+
+        Collections.sort(pairs, Comparator.comparingInt(pair -> pair.index));
+        StringBuilder decoded = new StringBuilder(pairs.size());
+
+        for (EncodedPair pair : pairs) {
+            byte[] decodedBytes;
+            try {
+                decodedBytes = Base64.decode(pair.encodedValue, Base64.DEFAULT);
+            } catch (IllegalArgumentException e) {
+                continue;
+            }
+
+            String decodedText = new String(decodedBytes, StandardCharsets.UTF_8);
+            String digits = decodedText.replaceAll("\\D", "");
+            if (digits.isEmpty()) {
+                continue;
+            }
+
+            long numericValue;
+            try {
+                numericValue = Long.parseLong(digits);
+            } catch (NumberFormatException e) {
+                continue;
+            }
+
+            long charCode = numericValue - k;
+            if (charCode < 0 || charCode > Character.MAX_VALUE) {
+                return null;
+            }
+
+            decoded.append((char) charCode);
+        }
+
+        if (decoded.length() == 0) {
+            return null;
+        }
+
+        String url = decoded.toString().trim()
+                .replace("\\/", "/")
+                .replace("\\u0026", "&")
+                .replace("\\u002F", "/");
+
+        return isValidStreamUrl(url) ? url : null;
+    }
+
+    /**
+     * Verifica si una URL parece ser un stream directo (M3U8, MP4, etc.)
+     */
+    private static boolean isDirectStreamUrl(String url) {
+        if (url == null || url.isEmpty()) {
+            return false;
+        }
+        String lower = url.toLowerCase();
+        return lower.contains(".m3u8") ||
+               lower.contains(".mpd") ||
+               lower.contains("stream") && lower.contains(".php") == false ||
+               lower.endsWith(".mp4") ||
+               lower.endsWith(".ts");
+    }
+
+    /**
+     * Verifica si una URL extraída es válida
+     */
+    private static boolean isValidStreamUrl(String url) {
+        return url != null && !url.isEmpty() && url.startsWith("http");
+    }
+
+    /**
+     * Extrae la primera coincidencia de un patrón regex
+     */
+    private static String extractWithPattern(String html, Pattern pattern) {
+        Matcher matcher = pattern.matcher(html);
+        if (matcher.find()) {
+            String url = matcher.group(1);
+            // Limpiar URL de caracteres basura
+            if (url != null) {
+                url = url.trim();
+                // Remover caracteres especiales al final
+                url = url.replaceAll("[\"'<>\\s].*$", "");
+            }
+            return url;
+        }
+        return null;
+    }
+
+    /**
+     * Intenta determinar el tipo de contenido del HTML
+     */
+    private static String getContentTypeFromHtml(String html) {
+        if (html == null || html.isEmpty()) {
+            return "unknown";
+        }
+        String trimmed = html.trim();
+        if (trimmed.startsWith("#EXTM3U") || trimmed.startsWith("#EXT")) {
+            return "m3u8";
+        }
+        if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+            return "json";
+        }
+        if (trimmed.startsWith("<")) {
+            return "html";
+        }
+        return "text";
    }

    private static String downloadPage(String pageUrl) throws IOException {
@@ -77,7 +416,7 @@ public final class StreamUrlResolver {
                .header("User-Agent", USER_AGENT)
                .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
                .header("Accept-Language", "es-ES,es;q=0.9,en;q=0.8")
-                .header("Referer", "https://streamtpcloud.com/")
+                .header("Referer", "http://streamtp10.com/")
                .build();

        try (Response response = CLIENT.newCall(request).execute()) {
@@ -91,4 +430,14 @@ public final class StreamUrlResolver {
            return response.body().string();
        }
    }
+
+    private static final class EncodedPair {
+        final int index;
+        final String encodedValue;
+
+        EncodedPair(int index, String encodedValue) {
+            this.index = index;
+            this.encodedValue = encodedValue;
+        }
+    }
 }
--- a/app/src/main/java/com/streamplayer/UpdateManager.java
+++ b/app/src/main/java/com/streamplayer/UpdateManager.java
@@ -31,10 +31,10 @@ import java.lang.ref.WeakReference;
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;

 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Request;
 import okhttp3.Response;

 /**
@@ -63,11 +63,8 @@ public class UpdateManager {
        this.appContext = context.getApplicationContext();
        this.mainHandler = new Handler(Looper.getMainLooper());
        this.networkExecutor = Executors.newSingleThreadExecutor();
-        this.httpClient = new OkHttpClient.Builder()
-                .connectTimeout(15, TimeUnit.SECONDS)
-                .readTimeout(20, TimeUnit.SECONDS)
-                .callTimeout(25, TimeUnit.SECONDS)
-                .build();
+        // Usar NetworkUtils para obtener cliente con DNS over HTTPS configurado
+        this.httpClient = NetworkUtils.getClient();
    }

    public void checkForUpdates(UpdateCallback callback) {
--- a/app/src/main/java/com/streamplayer/VlcDrmManager.java
+++ b/app/src/main/java/com/streamplayer/VlcDrmManager.java
@@ -0,0 +1,66 @@
+package com.streamplayer;
+
+import org.videolan.libvlc.Media;
+
+import java.util.Map;
+
+/**
+ * Handles DRM configuration for VLC Media Player
+ * Supports ClearKey DRM for protected streaming services
+ */
+public class VlcDrmManager {
+
+    // ClearKey DRM configuration
+    private static final String CLEARKEY_KEY_SYSTEM = "org.w3.clearkey";
+
+    /**
+     * Configure ClearKey DRM for a Media object
+     * @param media The VLC Media object
+     * @param keyId The key ID (extracted from manifest or license server)
+     * @param key The content key
+     */
+    public static void configureClearKey(Media media, String keyId, String key) {
+        if (media == null || keyId == null || key == null) {
+            return;
+        }
+
+        // VLC uses a specific format for ClearKey
+        // Format: keyid:key
+        String keyPair = keyId + ":" + key;
+        media.addOption(":demux=avformat");
+        media.addOption(":key-format=" + CLEARKEY_KEY_SYSTEM);
+        media.addOption(":key=" + keyPair);
+    }
+
+    /**
+     * Configure ClearKey DRM with multiple keys
+     * @param media The VLC Media object
+     * @param keys Map of keyId -> key pairs
+     */
+    public static void configureClearKey(Media media, Map<String, String> keys) {
+        if (media == null || keys == null || keys.isEmpty()) {
+            return;
+        }
+
+        media.addOption(":demux=avformat");
+        media.addOption(":key-format=" + CLEARKEY_KEY_SYSTEM);
+
+        for (Map.Entry<String, String> entry : keys.entrySet()) {
+            String keyPair = entry.getKey() + ":" + entry.getValue();
+            media.addOption(":key=" + keyPair);
+        }
+    }
+
+    /**
+     * Configure Widevine DRM (for reference, if needed later)
+     * VLC supports Widevine via specific options
+     */
+    public static void configureWidevine(Media media, String drmServerUrl) {
+        if (media == null || drmServerUrl == null) {
+            return;
+        }
+
+        media.addOption(":drm=widevine");
+        media.addOption(":aes-key=" + drmServerUrl);
+    }
+}
--- a/app/src/main/java/com/streamplayer/VlcPlayerConfig.java
+++ b/app/src/main/java/com/streamplayer/VlcPlayerConfig.java
@@ -0,0 +1,29 @@
+package com.streamplayer;
+
+/**
+ * Configuration constants for VLC Player
+ */
+public class VlcPlayerConfig {
+
+    // Network caching (ms)
+    public static final int NETWORK_CACHING = 1500;
+
+    // Live streaming caching (ms)
+    public static final int LIVE_CACHING = 5000;
+
+    // User Agent
+    public static final String USER_AGENT =
+        "Mozilla/5.0 (Linux; Android 13; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36";
+
+    // Hardware acceleration
+    public static final String HW_ACCELERATION = "automatic";
+
+    // Chroma format
+    public static final String CHROMA = "RV32";
+
+    // Audio output
+    public static final String AUDIO_OUTPUT = "opensles";
+
+    // Maximum retries for playback
+    public static final int MAX_RETRIES = 3;
+}
--- a/app/src/main/res/drawable/btn_refresh_selector.xml
+++ b/app/src/main/res/drawable/btn_refresh_selector.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Focused state - bright amber with thick border -->
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/refresh_button_focused" />
+            <corners android:radius="8dp" />
+            <stroke
+                android:width="4dp"
+                android:color="@color/refresh_button_focused_border" />
+            <padding
+                android:left="12dp"
+                android:top="8dp"
+                android:right="12dp"
+                android:bottom="8dp" />
+        </shape>
+    </item>
+
+    <!-- Pressed state -->
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/refresh_button_pressed" />
+            <corners android:radius="8dp" />
+            <stroke
+                android:width="2dp"
+                android:color="@color/refresh_button_border" />
+        </shape>
+    </item>
+
+    <!-- Default state - darker background with subtle border -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/refresh_button_default" />
+            <corners android:radius="8dp" />
+            <stroke
+                android:width="2dp"
+                android:color="@color/refresh_button_border" />
+            <padding
+                android:left="12dp"
+                android:top="8dp"
+                android:right="12dp"
+                android:bottom="8dp" />
+        </shape>
+    </item>
+</selector>
--- a/app/src/main/res/drawable/scrollbar_vertical.xml
+++ b/app/src/main/res/drawable/scrollbar_vertical.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFFFF" />
+    <corners android:radius="6dp" />
+    <size android:width="12dp" />
+</shape>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -97,7 +97,10 @@
                android:textSize="12sp"
                android:visibility="gone"
                android:focusable="true"
-                android:focusableInTouchMode="true" />
+                android:focusableInTouchMode="true"
+                android:background="@drawable/btn_refresh_selector"
+                android:textColor="@color/white"
+                android:elevation="2dp" />

        </LinearLayout>

@@ -125,6 +128,14 @@
            android:layout_marginTop="16dp"
            android:layout_weight="1"
            android:overScrollMode="never"
+            android:scrollbars="vertical"
+            android:fadeScrollbars="false"
+            android:scrollbarStyle="insideInset"
+            android:scrollbarThumbVertical="@drawable/scrollbar_vertical"
+            android:scrollbarTrackVertical="@color/scrollbar_track"
+            android:scrollbarSize="12dp"
+            android:scrollbarAlwaysDrawVerticalTrack="true"
+            android:scrollbarFadeDuration="0"
            android:nextFocusLeft="@id/section_list"
            tools:listitem="@layout/item_channel" />
    </LinearLayout>
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -11,8 +11,10 @@
        android:id="@+id/player_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        app:resize_mode="fill"
-        app:use_controller="true" />
+        android:keepScreenOn="true"
+        app:show_buffering="never"
+        app:surface_type="surface_view"
+        app:use_controller="false" />

    <LinearLayout
        android:id="@+id/player_toolbar"
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,14 @@
    <color name="black">#FF000000</color>
    <color name="white">#FFFFFFFF</color>
    <color name="text_secondary">#B3FFFFFF</color>
+
+    <!-- Refresh button colors -->
+    <color name="refresh_button_default">#2A2A2A</color>
+    <color name="refresh_button_border">#4A4A4A</color>
+    <color name="refresh_button_focused">#FFC107</color>
+    <color name="refresh_button_focused_border">#FFD54F</color>
+    <color name="refresh_button_pressed">#FF9800</color>
+
+    <!-- Scrollbar -->
+    <color name="scrollbar_track">#1A1A1A</color>
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ allprojects {
    repositories {
        google()
        mavenCentral()
+        maven { url "https://get.videolan.org/android/maven2/" }
    }
 }

--- a/create_release.py
+++ b/create_release.py
@@ -0,0 +1,77 @@
+import json
+import urllib.request
+import urllib.parse
+import urllib.error
+import os
+import sys
+
+# Configuration
+GITEA_URL = "https://gitea.cbcren.online/api/v1"
+REPO_OWNER = "renato97"
+REPO_NAME = "app"
+TOKEN = "efeed2af00597883adb04da70bd6a7c2993ae92d"
+TAG_NAME = "v10.1.7"
+RELEASE_NAME = "StreamPlayer v10.1.7"
+CHANGELOG_FILE = "CHANGELOG-v10.1.7.md"
+APK_FILE = "StreamPlayer-10.1.7-debug.apk"
+
+def create_release():
+    try:
+        with open(CHANGELOG_FILE, 'r') as f:
+            body = f.read()
+    except FileNotFoundError:
+        print(f"Error: {CHANGELOG_FILE} not found.")
+        sys.exit(1)
+
+    url = f"{GITEA_URL}/repos/{REPO_OWNER}/{REPO_NAME}/releases"
+    headers = {
+        "Authorization": f"token {TOKEN}",
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+    }
+    data = {
+        "tag_name": TAG_NAME,
+        "target_commitish": "main",
+        "name": RELEASE_NAME,
+        "body": body,
+        "draft": False,
+        "prerelease": False
+    }
+
+    req = urllib.request.Request(url, data=json.dumps(data).encode('utf-8'), headers=headers, method='POST')
+    
+    try:
+        with urllib.request.urlopen(req) as response:
+            result = json.loads(response.read().decode('utf-8'))
+            print(f"Release created successfully. ID: {result['id']}")
+            return result['id']
+    except urllib.error.HTTPError as e:
+        print(f"HTTP Error creating release: {e.code} {e.reason}")
+        print(e.read().decode('utf-8'))
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error creating release: {e}")
+        sys.exit(1)
+
+def upload_asset(release_id):
+    if not os.path.exists(APK_FILE):
+        print(f"Error: APK file {APK_FILE} not found.")
+        sys.exit(1)
+
+    url = f"{GITEA_URL}/repos/{REPO_OWNER}/{REPO_NAME}/releases/{release_id}/assets"
+    
+    # Simple multipart upload via python is tricky without requests library.
+    # However, Gitea API usually accepts raw binary in body if Content-Type is set, 
+    # but Gitea's API for assets usually requires multipart/form-data.
+    # Let's check Gitea API docs...
+    # The standard Gitea API uses POST /repos/{owner}/{repo}/releases/{id}/assets with name query parameter and file content in body
+    # Wait, looking at Gitea API docs (swagger usually available at /api/swagger), 
+    # POST /repos/{owner}/{repo}/releases/{id}/assets takes 'attachment' as form-data.
+    
+    # Implementing multipart/form-data with urllib is painful.
+    # Instead, I will use curl to upload the asset, using the release ID obtained from Python.
+    return release_id
+
+if __name__ == "__main__":
+    release_id = create_release()
+    print(f"RELEASE_ID={release_id}")
--- a/event-repository-fix.patch
+++ b/event-repository-fix.patch
@@ -0,0 +1,171 @@
+diff --git a/app/src/main/java/com/streamplayer/EventRepository.java b/app/src/main/java/com/streamplayer/EventRepository.java
+index f9340c7..7b3f662 100644
+--- a/app/src/main/java/com/streamplayer/EventRepository.java
+++ b/app/src/main/java/com/streamplayer/EventRepository.java
+@@ -29,8 +29,17 @@ public class EventRepository {
+     private static final String PREFS_NAME = "events_cache";
+     private static final String KEY_JSON = "json";
+     private static final String KEY_TIMESTAMP = "timestamp";
+    private static final String KEY_WORKING_URL = "working_url";
+     private static final long CACHE_DURATION = 24L * 60 * 60 * 1000; // 24 horas
+-    private static final String EVENTS_URL = "https://streamtpcloud.com/eventos.json";
+
+    // Lista de URLs a intentar en orden (con sistema de fallback)
+    private static final String[] EVENT_URLS = {
+        "https://streamtpcloud.com/eventos.json",      // URL original
+        "https://streamtp10.com/eventos.json",         // URL actual
+        "https://streamtpmedia.com/eventos.json"       // URL anterior
+    };
+
+    private static final String DEFAULT_EVENTS_URL = "https://streamtpcloud.com/eventos.json";
+ 
+     public interface Callback {
+         void onSuccess(List<EventItem> events);
+@@ -55,7 +64,7 @@ public class EventRepository {
+ 
+         new Thread(() -> {
+             try {
+-                String json = downloadJson();
+                String json = downloadJson(context);
+                 List<EventItem> events = parseEvents(json);
+                 prefs.edit().putString(KEY_JSON, json).putLong(KEY_TIMESTAMP, System.currentTimeMillis()).apply();
+                 callback.onSuccess(events);
+@@ -73,27 +82,103 @@ public class EventRepository {
+         }).start();
+     }
+ 
+-    private String downloadJson() throws IOException {
+-        URL url = new URL(EVENTS_URL);
+    private String downloadJson(Context context) throws IOException {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        String savedWorkingUrl = prefs.getString(KEY_WORKING_URL, null);
+
+        // Construir lista de URLs a intentar
+        // Primero la URL que funcionó la última vez, luego el resto
+        List<String> urlsToTry = new ArrayList<>();
+        if (savedWorkingUrl != null && !savedWorkingUrl.isEmpty()) {
+            urlsToTry.add(savedWorkingUrl);
+        }
+        for (String url : EVENT_URLS) {
+            if (!urlsToTry.contains(url)) {
+                urlsToTry.add(url);
+            }
+        }
+
+        IOException lastException = null;
+
+        // Intentar cada URL en orden
+        for (String urlString : urlsToTry) {
+            try {
+                String json = downloadFromUrl(urlString);
+                // Guardar la URL que funcionó
+                prefs.edit().putString(KEY_WORKING_URL, urlString).apply();
+                return json;
+            } catch (IOException e) {
+                lastException = e;
+                // Continuar con la siguiente URL
+            }
+        }
+
+        // Si todas fallaron, lanzar la última excepción
+        throw new IOException("No se pudo conectar a ninguna de las URLs disponibles. Último error: " +
+                (lastException != null ? lastException.getMessage() : "Error desconocido"));
+    }
+
+    private String downloadFromUrl(String urlString) throws IOException {
+        URL url = new URL(urlString);
+         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+         connection.setConnectTimeout(15000);
+         connection.setReadTimeout(15000);
+         connection.setRequestMethod("GET");
+         connection.setRequestProperty("Accept", "application/json");
+         connection.setRequestProperty("User-Agent", "StreamPlayer/1.0");
+-        
+
+        // Habilitar seguimiento de redirecciones automáticamente
+        connection.setInstanceFollowRedirects(true);
+
+        String currentUrl = urlString;
+        int redirectCount = 0;
+        final int MAX_REDIRECTS = 5;
+
+         try {
+             int responseCode = connection.getResponseCode();
+
+            // Seguir redirecciones manualmente si es necesario
+            while (isRedirect(responseCode) && redirectCount < MAX_REDIRECTS) {
+                redirectCount++;
+                String newUrl = connection.getHeaderField("Location");
+
+                if (newUrl == null) {
+                    throw new IOException("Redirección sin cabecera Location");
+                }
+
+                // Manejar URLs relativas
+                if (newUrl.startsWith("/")) {
+                    newUrl = url.getProtocol() + "://" + url.getHost() + newUrl;
+                } else if (!newUrl.startsWith("http")) {
+                    newUrl = url.getProtocol() + "://" + url.getHost() +
+                            (url.getPort() > 0 ? ":" + url.getPort() : "") + "/" + newUrl;
+                }
+
+                currentUrl = newUrl;
+                url = new URL(currentUrl);
+                connection.disconnect();
+
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setConnectTimeout(15000);
+                connection.setReadTimeout(15000);
+                connection.setRequestMethod("GET");
+                connection.setRequestProperty("Accept", "application/json");
+                connection.setRequestProperty("User-Agent", "StreamPlayer/1.0");
+                connection.setInstanceFollowRedirects(true);
+
+                responseCode = connection.getResponseCode();
+            }
+
+             if (responseCode != HttpURLConnection.HTTP_OK) {
+                 throw new IOException("Error HTTP " + responseCode + ": " + connection.getResponseMessage());
+             }
+-            
+
+             String contentType = connection.getContentType();
+             // Permitir json o text/plain (Raw de Gitea a veces es text/plain)
+             if (contentType != null && !contentType.contains("json") && !contentType.contains("text/plain")) {
+                 throw new IOException("El servidor devolvió " + contentType + " en lugar de JSON. Verifica que la URL sea correcta.");
+             }
+-            
+
+             try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
+                 StringBuilder builder = new StringBuilder();
+                 String line;
+@@ -101,12 +186,12 @@ public class EventRepository {
+                     builder.append(line);
+                 }
+                 String response = builder.toString();
+-                
+
+                 // Validar que no sea HTML
+                 if (response.trim().startsWith("<!") || response.trim().startsWith("<html")) {
+                     throw new IOException("El servidor devolvió HTML en lugar de JSON. La URL del endpoint puede estar incorrecta o el servidor tiene problemas.");
+                 }
+-                
+
+                 return response;
+             }
+         } finally {
+@@ -114,6 +199,14 @@ public class EventRepository {
+         }
+     }
+ 
+    private boolean isRedirect(int statusCode) {
+        return statusCode == HttpURLConnection.HTTP_MOVED_PERM ||
+                statusCode == HttpURLConnection.HTTP_MOVED_TEMP ||
+                statusCode == HttpURLConnection.HTTP_SEE_OTHER ||
+                statusCode == 307 || // Temporary Redirect
+                statusCode == 308;  // Permanent Redirect
+    }
+
+     private List<EventItem> parseEvents(String json) throws JSONException {
+         if (json == null || json.trim().isEmpty()) {
+             throw new JSONException("La respuesta está vacía");
--- a/update-manifest.json
+++ b/update-manifest.json
@@ -1,10 +1,10 @@
 {
-  "versionCode": 100300,
-  "versionName": "10.0.3",
-  "minSupportedVersionCode": 91000,
+  "versionCode": 100110,
+  "versionName": "10.1.10",
+  "minSupportedVersionCode": 0,
  "forceUpdate": false,
-  "downloadUrl": "https://gitea.cbcren.online/renato97/app/releases/download/v10.0.3/StreamPlayer-v10.0.3.apk",
-  "fileName": "StreamPlayer-v10.0.3.apk",
-  "sizeBytes": 0,
-  "notes": "StreamPlayer v10.0.3\n\nNovedades:\n- Fix: Evasión de bloqueos regionales mediante DNS de Google (DoH)\n- Corrección de error 'No se encontró la clave del stream'"
+  "downloadUrl": "http://gitea.cbcren.online/renato97/app/releases/download/v10.1.10/StreamPlayer-v10.1.10-debug.apk",
+  "fileName": "StreamPlayer-v10.1.10-debug.apk",
+  "sizeBytes": 9113609,
+  "notes": "Cambiar a HTTP para evitar errores de certificado"
 }
Author	SHA1	Message	Date
Renato	e14e454c5e	chore: eliminar contenido y referencias de disney	2026-03-02 18:29:03 -03:00
Renato	9360294d22	feat: migrar player a media3 y mejoras de resolución	2026-03-02 18:25:49 -03:00
Renato	1526766630	v10.1.11: Aceptar todos los certificados SSL para streams con redirección	2026-02-19 16:59:53 -03:00
Renato	4e92ee6149	v10.1.10: Cambiar a HTTP para evitar errores de certificado	2026-02-19 16:54:04 -03:00
Renato	cff9658060	v10.1.12: Revertir a código v10.1.7 funcional con dominio streamtp10.com - PlayerActivity: Referer vuelve a ser channelUrl (URL específica del canal) - StreamUrlResolver: Vuelve a crear su propio cliente con Google DNS - Eliminados cambios problemáticos de SSL trust-all y múltiples DNS - Mantenidos solo los cambios necesarios: streamtp10.com en lugar de streamtpcloud.com Esto debería hacer que los streams vuelvan a funcionar como en v10.1.7	2026-02-15 19:18:01 -03:00
Renato	43439e0a88	v10.1.11: Fix mensajes de error - eliminar HTML crudo que mostraba símbolos extraños - StreamUrlResolver ya no muestra HTML crudo en mensajes de error - Agregada validación para detectar respuestas comprimidas/binarias - Mejorados mensajes de error para ser más claros y sin caracteres raros - Agregados más patrones de extracción de URLs - Eliminado Accept-Encoding para evitar respuestas comprimidas	2026-02-15 19:08:52 -03:00
Renato	98473e3b30	v10.1.10: Fix reproducción de streams con SSL MITM y mejoras DNS - Corregido PlayerActivity para usar NetworkUtils con 4 servidores DNS - Agregado soporte para certificados SSL no válidos (evita MITM de ISP) - Actualizados headers Referer y Origin a streamtp10.com - Mejorado StreamUrlResolver con múltiples patrones de extracción - Aumentados timeouts de red a 20-30 segundos - Agregado manejo de errores 401/403/404 específicos	2026-02-15 18:57:54 -03:00
Renato	a4e8deb45a	Fix DNS issues: Add 4 DoH servers with fallback, remove ineffective DNSSetter - Remove DNSSetter.java (System.setProperty doesn't affect Android DNS) - Update NetworkUtils with 4 DNS over HTTPS providers: * Google DNS (8.8.8.8) - Primary * Cloudflare (1.1.1.1) - Secondary * AdGuard (94.140.14.14) - Tertiary * Quad9 (9.9.9.9) - Quaternary - Update DeviceRegistry to use NetworkUtils client - Update UpdateManager to use NetworkUtils client - Remove DNSSetter call from PlayerActivity This ensures the app works even when ISPs block specific DNS servers.	2026-02-12 21:53:44 -03:00
StreamPlayer Bot	a9da5a3b8e	fix: Update domains to streamtp10.com and implement robust DNS fallback - Update all channel URLs and event endpoint to streamtp10.com - Create NetworkUtils for centralized OkHttpClient configuration - Implement DNS fallback: Google (Primary) -> AdGuard (Secondary) -> System (Tertiary) - Migrate EventRepository to use NetworkUtils client instead of HttpURLConnection - Fix Referer header in StreamUrlResolver	2026-02-09 22:37:20 -03:00
StreamPlayer Bot	ab69fd1aa4	feat: Add persistent scrollbar to events list - Enable fadeScrollbars=false in RecyclerView - Improve visibility of scrollbar fix: Prevent navigation focus escape at end of list - Implement custom LinearLayoutManager to intercept focus search - Block FOCUS_DOWN action at the last item - Remove legacy OnKeyListener and OnScrollListener	2026-02-09 22:05:54 -03:00
Apple	907c97464b	fix: v10.1.6 - control remoto DPAD_DOWN y barra scroll visible Problemas corregidos: 1. Control Remoto - Navegación fuera de eventos - Problema: Botón abajo del control remoto iba a canales en último evento - Solución: Agregado setOnKeyListener interceptando KEYCODE_DPAD_DOWN - Combina scroll listener táctil + manejo de teclas de control remoto - Import agregado: android.view.KeyEvent 2. Barra de Scroll Más Visible - Thumb: Blanco sólido #FFFFFFFF (antes 80% opacidad) - Ancho: 12dp (antes 8dp) - Radio: 6dp (antes 4dp) - Track oscuro agregado: #1A1A1A - scrollbarAlwaysDrawVerticalTrack="true" Archivos modificados: - MainActivity.java (OnKeyListener + import KeyEvent) - scrollbar_vertical.xml (blanco sólido, 12dp) - activity_main.xml (scrollbarSize, track, alwaysDraw) - colors.xml (scrollbar_track) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-09 21:53:23 -03:00
Apple	19c31ebf1b	fix: v10.1.5 - corregir scroll listener, barra visible y URL única Problemas corregidos: 1. Scroll Listener Corregido (último evento cortado) - Cambiado de findFirstVisibleItemPosition() a findLastCompletelyVisibleItemPosition() - Ahora el scroll solo se detiene cuando el último elemento está completamente visible - Antes: el último evento aparecía solo a la mitad 2. Barra de Scroll Más Visible - Opacidad aumentada de #4DFFFFFF (30%) a #CCFFFFFF (80%) - Ancho de barra: 8dp (antes no definido) - Estilo cambiado de outsideOverlay a insideInset - scrollbarFadeDuration="0" para siempre visible - Radio de esquinas: 4dp (antes 2dp) 3. URL Única (eliminar bloqueos de ISP) - Eliminado sistema de fallback múltiples URLs - Ahora usa solo: https://streamtp10.com/eventos.json - Eliminado KEY_WORKING_URL y lógica de fallback - Código más simple y eficiente Archivos modificados: - app/src/main/java/com/streamplayer/EventRepository.java (simplificado) - app/src/main/java/com/streamplayer/MainActivity.java (scroll fix) - app/src/main/res/drawable/scrollbar_vertical.xml (más visible) - app/src/main/res/layout/activity_main.xml (scrollbar config) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-09 21:45:49 -03:00
Apple	97adc46509	feat: mejoras de interfaz v10.1.4 - botón refresh visible, límite de scroll y barra indicadora Cambios implementados: 1. Botón de Actualización Más Visible (para control remoto) - Nuevo archivo: btn_refresh_selector.xml con estados de foco - Color ámbar brillante (#FFC107) cuando está enfocado - Borde grueso (4dp) para mejor visibilidad 2. Prevención de Navegación Entre Secciones - Modificado: MainActivity.java showEvents() - Agregado OnScrollListener que detiene scroll al final de eventos - Previene paso accidental a sección de canales 3. Barra de Indicador de Scroll - Nuevo archivo: scrollbar_vertical.xml (drawable) - Modificado: activity_main.xml con atributos de scrollbar - Barra visual derecha como indicador de posición Archivos modificados: - app/src/main/java/com/streamplayer/MainActivity.java - app/src/main/res/layout/activity_main.xml - app/src/main/res/values/colors.xml Archivos nuevos: - app/src/main/res/drawable/btn_refresh_selector.xml - app/src/main/res/drawable/scrollbar_vertical.xml Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-09 21:33:09 -03:00