refactor: optimizar app sin cambios funcionales y publicar v11.0.1

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

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.streamplayer"
         minSdk 21
         targetSdk 35
-        versionCode 100108
+        versionCode 100201
-        versionName "10.1.8"
+        versionName "11.0.1"
         buildConfigField "String", "DEVICE_REGISTRY_URL", '"http://194.163.191.200:4000"'
     }
 
@@ -47,16 +47,11 @@ 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)
+    // OkHttp con DNS over HTTPS (para StreamUrlResolver)
-    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'
-
-    // OkHttp con DNS over HTTPS
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
 

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"

app/src/main/java/com/streamplayer/ChannelAdapter.java

@@ -7,21 +7,37 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.ChannelViewHolder> {
+public class ChannelAdapter extends ListAdapter<StreamChannel, ChannelAdapter.ChannelViewHolder> {
 
     public interface OnChannelClickListener {
         void onChannelClick(StreamChannel channel);
     }
 
-    private final List<StreamChannel> channels = new ArrayList<>();
+    private static final DiffUtil.ItemCallback<StreamChannel> DIFF_CALLBACK =
+            new DiffUtil.ItemCallback<StreamChannel>() {
+                @Override
+                public boolean areItemsTheSame(@NonNull StreamChannel oldItem, @NonNull StreamChannel newItem) {
+                    return oldItem.getPageUrl().equals(newItem.getPageUrl());
+                }
+
+                @Override
+                public boolean areContentsTheSame(@NonNull StreamChannel oldItem, @NonNull StreamChannel newItem) {
+                    return oldItem.getName().equals(newItem.getName())
+                            && oldItem.getPageUrl().equals(newItem.getPageUrl());
+                }
+            };
+
     private final OnChannelClickListener listener;
 
     public ChannelAdapter(OnChannelClickListener listener) {
+        super(DIFF_CALLBACK);
         this.listener = listener;
     }
 
@@ -35,7 +51,7 @@ public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.ChannelV
 
     @Override
     public void onBindViewHolder(@NonNull ChannelViewHolder holder, int position) {
-        StreamChannel channel = channels.get(position);
+        StreamChannel channel = getItem(position);
         holder.name.setText(channel.getName());
         holder.icon.setImageResource(R.drawable.ic_channel_default);
         holder.itemView.setOnClickListener(v -> {
@@ -52,7 +68,7 @@ public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.ChannelV
 
     @Override
     public int getItemCount() {
-        return channels.size();
+        return super.getItemCount();
     }
 
     static class ChannelViewHolder extends RecyclerView.ViewHolder {
@@ -67,10 +83,10 @@ public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.ChannelV
     }
 
     public void submitList(List<StreamChannel> newChannels) {
-        channels.clear();
+        if (newChannels == null) {
-        if (newChannels != null) {
+            super.submitList(null);
-            channels.addAll(newChannels);
+            return;
         }
-        notifyDataSetChanged();
+        super.submitList(new ArrayList<>(newChannels));
     }
 }

app/src/main/java/com/streamplayer/ChannelRepository.java

@@ -9,77 +9,84 @@ import java.util.List;
 public final class ChannelRepository {
 
     private static final List<StreamChannel> CHANNELS = createChannels();
+    private static final Comparator<StreamChannel> CHANNEL_NAME_COMPARATOR =
+            new Comparator<StreamChannel>() {
+                @Override
+                public int compare(StreamChannel left, StreamChannel right) {
+                    return String.CASE_INSENSITIVE_ORDER.compare(left.getName(), right.getName());
+                }
+            };
 
     private static List<StreamChannel> createChannels() {
         List<StreamChannel> channels = new ArrayList<>(Arrays.asList(
-            new StreamChannel("ESPN", "https://streamtp10.com/global2.php?stream=espn"),
+            new StreamChannel("ESPN", "http://streamtp10.com/global2.php?stream=espn"),
-            new StreamChannel("ESPN 2", "https://streamtp10.com/global2.php?stream=espn2"),
+            new StreamChannel("ESPN 2", "http://streamtp10.com/global2.php?stream=espn2"),
-            new StreamChannel("ESPN 3", "https://streamtp10.com/global2.php?stream=espn3"),
+            new StreamChannel("ESPN 3", "http://streamtp10.com/global2.php?stream=espn3"),
-            new StreamChannel("ESPN 4", "https://streamtp10.com/global2.php?stream=espn4"),
+            new StreamChannel("ESPN 4", "http://streamtp10.com/global2.php?stream=espn4"),
-            new StreamChannel("ESPN 3 MX", "https://streamtp10.com/global2.php?stream=espn3mx"),
+            new StreamChannel("ESPN 3 MX", "http://streamtp10.com/global2.php?stream=espn3mx"),
-            new StreamChannel("ESPN 5", "https://streamtp10.com/global2.php?stream=espn5"),
+            new StreamChannel("ESPN 5", "http://streamtp10.com/global2.php?stream=espn5"),
-            new StreamChannel("Fox Sports 3 MX", "https://streamtp10.com/global2.php?stream=foxsports3mx"),
+            new StreamChannel("Fox Sports 3 MX", "http://streamtp10.com/global2.php?stream=foxsports3mx"),
-            new StreamChannel("ESPN 6", "https://streamtp10.com/global2.php?stream=espn6"),
+            new StreamChannel("ESPN 6", "http://streamtp10.com/global2.php?stream=espn6"),
-            new StreamChannel("Fox Sports MX", "https://streamtp10.com/global2.php?stream=foxsportsmx"),
+            new StreamChannel("Fox Sports MX", "http://streamtp10.com/global2.php?stream=foxsportsmx"),
-            new StreamChannel("ESPN 7", "https://streamtp10.com/global2.php?stream=espn7"),
+            new StreamChannel("ESPN 7", "http://streamtp10.com/global2.php?stream=espn7"),
-            new StreamChannel("Azteca Deportes", "https://streamtp10.com/global2.php?stream=azteca_deportes"),
+            new StreamChannel("Azteca Deportes", "http://streamtp10.com/global2.php?stream=azteca_deportes"),
-            new StreamChannel("Win Plus", "https://streamtp10.com/global2.php?stream=winplus"),
+            new StreamChannel("Win Plus", "http://streamtp10.com/global2.php?stream=winplus"),
-            new StreamChannel("DAZN 1", "https://streamtp10.com/global2.php?stream=dazn1"),
+            new StreamChannel("DAZN 1", "http://streamtp10.com/global2.php?stream=dazn1"),
-            new StreamChannel("Win Plus 2", "https://streamtp10.com/global2.php?stream=winplus2"),
+            new StreamChannel("Win Plus 2", "http://streamtp10.com/global2.php?stream=winplus2"),
-            new StreamChannel("DAZN 2", "https://streamtp10.com/global2.php?stream=dazn2"),
+            new StreamChannel("DAZN 2", "http://streamtp10.com/global2.php?stream=dazn2"),
-            new StreamChannel("Win Sports", "https://streamtp10.com/global2.php?stream=winsports"),
+            new StreamChannel("Win Sports", "http://streamtp10.com/global2.php?stream=winsports"),
-            new StreamChannel("DAZN LaLiga", "https://streamtp10.com/global2.php?stream=dazn_laliga"),
+            new StreamChannel("DAZN LaLiga", "http://streamtp10.com/global2.php?stream=dazn_laliga"),
-            new StreamChannel("Win Plus Online 1", "https://streamtp10.com/global2.php?stream=winplusonline1"),
+            new StreamChannel("Win Plus Online 1", "http://streamtp10.com/global2.php?stream=winplusonline1"),
-            new StreamChannel("Caracol TV", "https://streamtp10.com/global2.php?stream=caracoltv"),
+            new StreamChannel("Caracol TV", "http://streamtp10.com/global2.php?stream=caracoltv"),
-            new StreamChannel("Fox 1 AR", "https://streamtp10.com/global2.php?stream=fox1ar"),
+            new StreamChannel("Fox 1 AR", "http://streamtp10.com/global2.php?stream=fox1ar"),
-            new StreamChannel("Fox 2 USA", "https://streamtp10.com/global2.php?stream=fox_2_usa"),
+            new StreamChannel("Fox 2 USA", "http://streamtp10.com/global2.php?stream=fox_2_usa"),
-            new StreamChannel("Fox 2 AR", "https://streamtp10.com/global2.php?stream=fox2ar"),
+            new StreamChannel("Fox 2 AR", "http://streamtp10.com/global2.php?stream=fox2ar"),
-            new StreamChannel("TNT 1 GB", "https://streamtp10.com/global2.php?stream=tnt_1_gb"),
+            new StreamChannel("TNT 1 GB", "http://streamtp10.com/global2.php?stream=tnt_1_gb"),
-            new StreamChannel("TNT 2 GB", "https://streamtp10.com/global2.php?stream=tnt_2_gb"),
+            new StreamChannel("TNT 2 GB", "http://streamtp10.com/global2.php?stream=tnt_2_gb"),
-            new StreamChannel("Fox 3 AR", "https://streamtp10.com/global2.php?stream=fox3ar"),
+            new StreamChannel("Fox 3 AR", "http://streamtp10.com/global2.php?stream=fox3ar"),
-            new StreamChannel("Universo USA", "https://streamtp10.com/global2.php?stream=universo_usa"),
+            new StreamChannel("Universo USA", "http://streamtp10.com/global2.php?stream=universo_usa"),
-            new StreamChannel("DSports", "https://streamtp10.com/global2.php?stream=dsports"),
+            new StreamChannel("DSports", "http://streamtp10.com/global2.php?stream=dsports"),
-            new StreamChannel("Univision USA", "https://streamtp10.com/global2.php?stream=univision_usa"),
+            new StreamChannel("Univision USA", "http://streamtp10.com/global2.php?stream=univision_usa"),
-            new StreamChannel("DSports 2", "https://streamtp10.com/global2.php?stream=dsports2"),
+            new StreamChannel("DSports 2", "http://streamtp10.com/global2.php?stream=dsports2"),
-            new StreamChannel("Fox Deportes USA", "https://streamtp10.com/global2.php?stream=fox_deportes_usa"),
+            new StreamChannel("Fox Deportes USA", "http://streamtp10.com/global2.php?stream=fox_deportes_usa"),
-            new StreamChannel("DSports Plus", "https://streamtp10.com/global2.php?stream=dsportsplus"),
+            new StreamChannel("DSports Plus", "http://streamtp10.com/global2.php?stream=dsportsplus"),
-            new StreamChannel("Fox Sports 2 MX", "https://streamtp10.com/global2.php?stream=foxsports2mx"),
+            new StreamChannel("Fox Sports 2 MX", "http://streamtp10.com/global2.php?stream=foxsports2mx"),
-            new StreamChannel("TNT Sports Chile", "https://streamtp10.com/global2.php?stream=tntsportschile"),
+            new StreamChannel("TNT Sports Chile", "http://streamtp10.com/global2.php?stream=tntsportschile"),
-            new StreamChannel("Fox Sports Premium", "https://streamtp10.com/global2.php?stream=foxsportspremium"),
+            new StreamChannel("Fox Sports Premium", "http://streamtp10.com/global2.php?stream=foxsportspremium"),
-            new StreamChannel("TNT Sports", "https://streamtp10.com/global2.php?stream=tntsports"),
+            new StreamChannel("TNT Sports", "http://streamtp10.com/global2.php?stream=tntsports"),
-            new StreamChannel("ESPN MX", "https://streamtp10.com/global2.php?stream=espnmx"),
+            new StreamChannel("ESPN MX", "http://streamtp10.com/global2.php?stream=espnmx"),
-            new StreamChannel("ESPN Premium", "https://streamtp10.com/global2.php?stream=espnpremium"),
+            new StreamChannel("ESPN Premium", "http://streamtp10.com/global2.php?stream=espnpremium"),
-            new StreamChannel("ESPN 2 MX", "https://streamtp10.com/global2.php?stream=espn2mx"),
+            new StreamChannel("ESPN 2 MX", "http://streamtp10.com/global2.php?stream=espn2mx"),
-            new StreamChannel("TyC Sports", "https://streamtp10.com/global2.php?stream=tycsports"),
+            new StreamChannel("TyC Sports", "http://streamtp10.com/global2.php?stream=tycsports"),
-            new StreamChannel("TUDN USA", "https://streamtp10.com/global2.php?stream=tudn_usa"),
+            new StreamChannel("TUDN USA", "http://streamtp10.com/global2.php?stream=tudn_usa"),
-            new StreamChannel("Telefe", "https://streamtp10.com/global2.php?stream=telefe"),
+            new StreamChannel("Telefe", "http://streamtp10.com/global2.php?stream=telefe"),
-            new StreamChannel("TNT 3 GB", "https://streamtp10.com/global2.php?stream=tnt_3_gb"),
+            new StreamChannel("TNT 3 GB", "http://streamtp10.com/global2.php?stream=tnt_3_gb"),
-            new StreamChannel("TV Pública", "https://streamtp10.com/global2.php?stream=tv_publica"),
+            new StreamChannel("TV Pública", "http://streamtp10.com/global2.php?stream=tv_publica"),
-            new StreamChannel("Fox 1 USA", "https://streamtp10.com/global2.php?stream=fox_1_usa"),
+            new StreamChannel("Fox 1 USA", "http://streamtp10.com/global2.php?stream=fox_1_usa"),
-            new StreamChannel("Liga 1 Max", "https://streamtp10.com/global2.php?stream=liga1max"),
+            new StreamChannel("Liga 1 Max", "http://streamtp10.com/global2.php?stream=liga1max"),
-            new StreamChannel("Gol TV", "https://streamtp10.com/global2.php?stream=goltv"),
+            new StreamChannel("Gol TV", "http://streamtp10.com/global2.php?stream=goltv"),
-            new StreamChannel("VTV Plus", "https://streamtp10.com/global2.php?stream=vtvplus"),
+            new StreamChannel("VTV Plus", "http://streamtp10.com/global2.php?stream=vtvplus"),
-            new StreamChannel("ESPN Deportes", "https://streamtp10.com/global2.php?stream=espndeportes"),
+            new StreamChannel("ESPN Deportes", "http://streamtp10.com/global2.php?stream=espndeportes"),
-            new StreamChannel("Gol Perú", "https://streamtp10.com/global2.php?stream=golperu"),
+            new StreamChannel("Gol Perú", "http://streamtp10.com/global2.php?stream=golperu"),
-            new StreamChannel("TNT 4 GB", "https://streamtp10.com/global2.php?stream=tnt_4_gb"),
+            new StreamChannel("TNT 4 GB", "http://streamtp10.com/global2.php?stream=tnt_4_gb"),
-            new StreamChannel("SportTV BR 1", "https://streamtp10.com/global2.php?stream=sporttvbr1"),
+            new StreamChannel("SportTV BR 1", "http://streamtp10.com/global2.php?stream=sporttvbr1"),
-            new StreamChannel("SportTV BR 2", "https://streamtp10.com/global2.php?stream=sporttvbr2"),
+            new StreamChannel("SportTV BR 2", "http://streamtp10.com/global2.php?stream=sporttvbr2"),
-            new StreamChannel("SportTV BR 3", "https://streamtp10.com/global2.php?stream=sporttvbr3"),
+            new StreamChannel("SportTV BR 3", "http://streamtp10.com/global2.php?stream=sporttvbr3"),
-            new StreamChannel("Premiere 1", "https://streamtp10.com/global2.php?stream=premiere1"),
+            new StreamChannel("Premiere 1", "http://streamtp10.com/global2.php?stream=premiere1"),
-            new StreamChannel("Premiere 2", "https://streamtp10.com/global2.php?stream=premiere2"),
+            new StreamChannel("Premiere 2", "http://streamtp10.com/global2.php?stream=premiere2"),
-            new StreamChannel("Premiere 3", "https://streamtp10.com/global2.php?stream=premiere3"),
+            new StreamChannel("Premiere 3", "http://streamtp10.com/global2.php?stream=premiere3"),
-            new StreamChannel("ESPN NL 1", "https://streamtp10.com/global2.php?stream=espn_nl1"),
+            new StreamChannel("ESPN NL 1", "http://streamtp10.com/global2.php?stream=espn_nl1"),
-            new StreamChannel("ESPN NL 2", "https://streamtp10.com/global2.php?stream=espn_nl2"),
+            new StreamChannel("ESPN NL 2", "http://streamtp10.com/global2.php?stream=espn_nl2"),
-            new StreamChannel("ESPN NL 3", "https://streamtp10.com/global2.php?stream=espn_nl3"),
+            new StreamChannel("ESPN NL 3", "http://streamtp10.com/global2.php?stream=espn_nl3"),
-            new StreamChannel("Caliente TV MX", "https://streamtp10.com/global2.php?stream=calientetvmx"),
+            new StreamChannel("Caliente TV MX", "http://streamtp10.com/global2.php?stream=calientetvmx"),
-            new StreamChannel("USA Network", "https://streamtp10.com/global2.php?stream=usa_network"),
+            new StreamChannel("USA Network", "http://streamtp10.com/global2.php?stream=usa_network"),
-            new StreamChannel("TyC Internacional", "https://streamtp10.com/global2.php?stream=tycinternacional"),
+            new StreamChannel("TyC Internacional", "http://streamtp10.com/global2.php?stream=tycinternacional"),
-            new StreamChannel("Canal 5 MX", "https://streamtp10.com/global2.php?stream=canal5mx"),
+            new StreamChannel("Canal 5 MX", "http://streamtp10.com/global2.php?stream=canal5mx"),
-            new StreamChannel("TUDN MX", "https://streamtp10.com/global2.php?stream=TUDNMX"),
+            new StreamChannel("TUDN MX", "http://streamtp10.com/global2.php?stream=TUDNMX"),
-            new StreamChannel("FUTV", "https://streamtp10.com/global2.php?stream=futv"),
+            new StreamChannel("FUTV", "http://streamtp10.com/global2.php?stream=futv"),
-            new StreamChannel("LaLiga Hypermotion", "https://streamtp10.com/global2.php?stream=laligahypermotion")
+            new StreamChannel("LaLiga Hypermotion", "http://streamtp10.com/global2.php?stream=laligahypermotion")
         ));
-        channels.sort(Comparator.comparing(StreamChannel::getName, String.CASE_INSENSITIVE_ORDER));
+        Collections.sort(channels, CHANNEL_NAME_COMPARATOR);
         return Collections.unmodifiableList(channels);
     }
 

app/src/main/java/com/streamplayer/DeviceRegistry.java

@@ -136,7 +136,7 @@ public class DeviceRegistry {
         if (TextUtils.isEmpty(value)) {
             return "";
         }
-        return value.substring(0, 1).toUpperCase(Locale.getDefault())
+        return value.substring(0, 1).toUpperCase(Locale.ROOT)
                 + value.substring(1);
     }
 

app/src/main/java/com/streamplayer/EventAdapter.java

@@ -6,29 +6,53 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventViewHolder> {
+public class EventAdapter extends ListAdapter<EventItem, EventAdapter.EventViewHolder> {
 
     public interface OnEventClickListener {
         void onEventClick(EventItem event);
     }
 
-    private final List<EventItem> events = new ArrayList<>();
+    private static final DiffUtil.ItemCallback<EventItem> DIFF_CALLBACK =
+            new DiffUtil.ItemCallback<EventItem>() {
+                @Override
+                public boolean areItemsTheSame(@NonNull EventItem oldItem, @NonNull EventItem newItem) {
+                    return oldItem.getPageUrl().equals(newItem.getPageUrl())
+                            && oldItem.getStartMillis() == newItem.getStartMillis();
+                }
+
+                @Override
+                public boolean areContentsTheSame(@NonNull EventItem oldItem, @NonNull EventItem newItem) {
+                    return oldItem.getTitle().equals(newItem.getTitle())
+                            && oldItem.getTime().equals(newItem.getTime())
+                            && oldItem.getCategory().equals(newItem.getCategory())
+                            && oldItem.getStatus().equals(newItem.getStatus())
+                            && oldItem.getPageUrl().equals(newItem.getPageUrl())
+                            && oldItem.getChannelName().equals(newItem.getChannelName())
+                            && oldItem.getStartMillis() == newItem.getStartMillis();
+                }
+            };
+
     private final OnEventClickListener listener;
 
     public EventAdapter(OnEventClickListener listener) {
+        super(DIFF_CALLBACK);
         this.listener = listener;
     }
 
     public void submitList(List<EventItem> newEvents) {
-        events.clear();
+        if (newEvents == null) {
-        events.addAll(newEvents);
+            super.submitList(null);
-        notifyDataSetChanged();
+            return;
+        }
+        super.submitList(new ArrayList<>(newEvents));
     }
 
     @NonNull
@@ -41,7 +65,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventViewHol
 
     @Override
     public void onBindViewHolder(@NonNull EventViewHolder holder, int position) {
-        EventItem event = events.get(position);
+        EventItem event = getItem(position);
         holder.title.setText(event.getTitle());
         holder.time.setText(event.getTime());
         holder.channel.setText(event.getChannelName());
@@ -55,7 +79,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventViewHol
 
     @Override
     public int getItemCount() {
-        return events.size();
+        return super.getItemCount();
     }
 
     static class EventViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/com/streamplayer/EventRepository.java

@@ -8,16 +8,14 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 
 import okhttp3.Request;
 import okhttp3.Response;
@@ -28,9 +26,13 @@ public class EventRepository {
     private static final String KEY_JSON = "json";
     private static final String KEY_TIMESTAMP = "timestamp";
     private static final long CACHE_DURATION = 24L * 60 * 60 * 1000; // 24 horas
+    private static final String ARGENTINA_TIMEZONE_ID = "America/Argentina/Buenos_Aires";
+    private static final TimeZone ARGENTINA_TIMEZONE = TimeZone.getTimeZone(ARGENTINA_TIMEZONE_ID);
+    private static final int ARGENTINA_OFFSET_HOURS = 2;
+    private static final long EVENT_ROLLOVER_WINDOW_MS = 12L * 60 * 60 * 1000;
 
     // URL única para eventos (actualizado para evitar bloqueos de ISP)
-    private static final String EVENTS_URL = "https://streamtp10.com/eventos.json";
+    private static final String EVENTS_URL = "http://streamtp10.com/eventos.json";
 
     public interface Callback {
         void onSuccess(List<EventItem> events);
@@ -89,12 +91,6 @@ public class EventRepository {
                 throw new IOException("Respuesta vacía del servidor");
             }
 
-            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")) {
-                // Aceptamos text/plain también por flexibilidad
-            }
-
             String responseBody = response.body().string();
 
             // Validar que no sea HTML
@@ -119,7 +115,6 @@ public class EventRepository {
         
         JSONArray array = new JSONArray(json);
         List<EventItem> events = new ArrayList<>();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
         
         for (int i = 0; i < array.length(); i++) {
             JSONObject obj = array.getJSONObject(i);
@@ -130,18 +125,9 @@ public class EventRepository {
             String link = obj.optString("link");
             String normalized = normalizeLink(link);
 
-            // Ajustar hora: la web muestra hora de España, Argentina es +2 horas
+            EventSchedule schedule = computeEventSchedule(time);
-            String displayTime = time;
+            String displayTime = schedule.displayTime;
-            try {
+            long startMillis = schedule.startMillis;
-                if (time != null && !time.isEmpty()) {
-                    LocalTime localTime = LocalTime.parse(time.trim(), formatter);
-                    LocalTime adjustedTime = localTime.plusHours(2);
-                    displayTime = adjustedTime.format(formatter);
-                }
-            } catch (DateTimeParseException ignored) {
-            }
-            
-            long startMillis = parseEventTime(time);
             events.add(new EventItem(title, displayTime, category, status, normalized, extractChannelName(link), startMillis));
         }
         return Collections.unmodifiableList(events);
@@ -151,10 +137,9 @@ public class EventRepository {
         if (link == null) {
             return "";
         }
-        // Actualizado a streamtp10.com
+        // Mantener el endpoint original (global1/global2) que entregue el proveedor.
-        String updated = link.replace("streamtpmedia.com", "streamtp10.com")
+        return link.replace("streamtpmedia.com", "streamtp10.com")
-                             .replace("streamtpcloud.com", "streamtp10.com");
+                   .replace("streamtpcloud.com", "streamtp10.com");
-        return updated.replace("global1.php", "global2.php");
     }
 
     private String extractChannelName(String link) {
@@ -165,28 +150,69 @@ public class EventRepository {
         if (idx == -1) {
             return "";
         }
-        return link.substring(idx + 7).replace("_", " ").toUpperCase();
+        return link.substring(idx + 7).replace("_", " ").toUpperCase(Locale.ROOT);
     }
 
-    private long parseEventTime(String time) {
+    private EventSchedule computeEventSchedule(String time) {
-        if (time == null || time.isEmpty()) {
+        if (time == null || time.trim().isEmpty()) {
-            return -1;
+            return new EventSchedule(time == null ? "" : time, -1L);
         }
+
         try {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+            Calendar adjustedTime = parseAdjustedTime(time);
-            LocalTime localTime = LocalTime.parse(time.trim(), formatter);
+            String displayTime = formatTime(adjustedTime);
-            // Ajustar hora: la web muestra hora de España, Argentina es +2 horas
+
-            LocalTime adjustedTime = localTime.plusHours(2);
+            Calendar now = Calendar.getInstance(ARGENTINA_TIMEZONE, Locale.US);
-            ZoneId zone = ZoneId.of("America/Argentina/Buenos_Aires");
+            Calendar start = Calendar.getInstance(ARGENTINA_TIMEZONE, Locale.US);
-            LocalDate today = LocalDate.now(zone);
+            start.set(Calendar.YEAR, now.get(Calendar.YEAR));
-            ZonedDateTime start = ZonedDateTime.of(LocalDateTime.of(today, adjustedTime), zone);
+            start.set(Calendar.MONTH, now.get(Calendar.MONTH));
-            ZonedDateTime now = ZonedDateTime.now(zone);
+            start.set(Calendar.DAY_OF_MONTH, now.get(Calendar.DAY_OF_MONTH));
-            if (start.isBefore(now.minusHours(12))) {
+            start.set(Calendar.HOUR_OF_DAY, adjustedTime.get(Calendar.HOUR_OF_DAY));
-                start = start.plusDays(1);
+            start.set(Calendar.MINUTE, adjustedTime.get(Calendar.MINUTE));
+            start.set(Calendar.SECOND, 0);
+            start.set(Calendar.MILLISECOND, 0);
+
+            long nowMillis = now.getTimeInMillis();
+            long startMillis = start.getTimeInMillis();
+            if (startMillis < nowMillis - EVENT_ROLLOVER_WINDOW_MS) {
+                start.add(Calendar.DAY_OF_MONTH, 1);
+                startMillis = start.getTimeInMillis();
             }
-            return start.toInstant().toEpochMilli();
+
-        } catch (DateTimeParseException e) {
+            return new EventSchedule(displayTime, startMillis);
-            return -1;
+        } catch (ParseException ignored) {
+            return new EventSchedule(time, -1L);
+        }
+    }
+
+    private Calendar parseAdjustedTime(String time) throws ParseException {
+        SimpleDateFormat parser = new SimpleDateFormat("HH:mm", Locale.US);
+        parser.setLenient(false);
+        parser.setTimeZone(ARGENTINA_TIMEZONE);
+        java.util.Date parsedDate = parser.parse(time.trim());
+        if (parsedDate == null) {
+            throw new ParseException("Hora inválida: " + time, 0);
+        }
+
+        Calendar adjusted = Calendar.getInstance(ARGENTINA_TIMEZONE, Locale.US);
+        adjusted.setTime(parsedDate);
+        adjusted.add(Calendar.HOUR_OF_DAY, ARGENTINA_OFFSET_HOURS);
+        return adjusted;
+    }
+
+    private String formatTime(Calendar calendar) {
+        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm", Locale.US);
+        formatter.setTimeZone(ARGENTINA_TIMEZONE);
+        return formatter.format(calendar.getTime());
+    }
+
+    private static final class EventSchedule {
+        final String displayTime;
+        final long startMillis;
+
+        EventSchedule(String displayTime, long startMillis) {
+            this.displayTime = displayTime;
+            this.startMillis = startMillis;
         }
     }
 }

app/src/main/java/com/streamplayer/MainActivity.java

@@ -1,6 +1,7 @@
 package com.streamplayer;
 
 import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -333,7 +334,7 @@ public class MainActivity extends AppCompatActivity {
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         try {
             startActivity(intent);
-        } catch (Exception e) {
+        } catch (ActivityNotFoundException e) {
             Toast.makeText(this, R.string.update_error_open_release, Toast.LENGTH_SHORT).show();
         }
     }
@@ -398,7 +399,12 @@ public class MainActivity extends AppCompatActivity {
         List<StreamChannel> allChannels = ChannelRepository.getChannels();
         for (StreamChannel channel : allChannels) {
             String key = deriveGroupName(channel.getName());
-            grouped.computeIfAbsent(key, k -> new ArrayList<>()).add(channel);
+            List<StreamChannel> group = grouped.get(key);
+            if (group == null) {
+                group = new ArrayList<>();
+                grouped.put(key, group);
+            }
+            group.add(channel);
         }
 
         List<StreamChannel> espnChannels = grouped.remove("ESPN");

app/src/main/java/com/streamplayer/NetworkUtils.java

@@ -1,8 +1,9 @@
 package com.streamplayer;
 
-import java.security.cert.X509Certificate;
+import android.util.Log;
+
 import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.security.cert.X509Certificate;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -16,19 +17,16 @@ import okhttp3.OkHttpClient;
 import okhttp3.dnsoverhttps.DnsOverHttps;
 
 /**
- * Utilidad centralizada para configuración de red con múltiples servidores DNS over HTTPS.
+ * Utilidad centralizada para configuración de red.
- * Implementa fallback progresivo: Google -> Cloudflare -> AdGuard -> Quad9 -> Sistema
+ * Fuerza DNS over HTTPS con fallback Google -> Cloudflare -> DNS del sistema.
  */
-public class NetworkUtils {
+public final class NetworkUtils {
 
+    private static final String TAG = "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";
-
-    // URLs de servidores DNS over HTTPS
     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";
-    private static final String ADGUARD_DOH_URL = "https://dns.adguard-dns.com/dns-query";
-    private static final String QUAD9_DOH_URL = "https://dns.quad9.net/dns-query";
 
     static {
         OkHttpClient.Builder builder = new OkHttpClient.Builder()
@@ -55,113 +53,67 @@ public class NetworkUtils {
                 }
             };
 
-            final SSLContext sslContext = SSLContext.getInstance("SSL");
+            final SSLContext sslContext = SSLContext.getInstance("TLS");
             sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
             
             builder.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0]);
             builder.hostnameVerifier((hostname, session) -> true);
 
-            // Cliente bootstrap para resolver los dominios de DNS
             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();
 
-            // 1. Google DNS over HTTPS (Primario)
             final DnsOverHttps googleDns = new DnsOverHttps.Builder()
                     .client(bootstrap)
                     .url(HttpUrl.get(GOOGLE_DOH_URL))
                     .bootstrapDnsHosts(
-                            getByIp("8.8.8.8"),
+                            InetAddress.getByName("8.8.8.8"),
-                            getByIp("8.8.4.4"))
+                            InetAddress.getByName("8.8.4.4"))
                     .includeIPv6(false)
                     .build();
 
-            // 2. Cloudflare DNS over HTTPS (Secundario)
             final DnsOverHttps cloudflareDns = new DnsOverHttps.Builder()
                     .client(bootstrap)
                     .url(HttpUrl.get(CLOUDFLARE_DOH_URL))
                     .bootstrapDnsHosts(
-                            getByIp("1.1.1.1"),
+                            InetAddress.getByName("1.1.1.1"),
-                            getByIp("1.0.0.1"))
+                            InetAddress.getByName("1.0.0.1"))
                     .includeIPv6(false)
                     .build();
 
-            // 3. AdGuard DNS over HTTPS (Terciario)
+            builder.dns(hostname -> {
-            final DnsOverHttps adGuardDns = new DnsOverHttps.Builder()
+                try {
-                    .client(bootstrap)
+                    List<InetAddress> result = googleDns.lookup(hostname);
-                    .url(HttpUrl.get(ADGUARD_DOH_URL))
+                    if (result != null && !result.isEmpty()) {
-                    .bootstrapDnsHosts(
+                        return result;
-                            getByIp("94.140.14.14"),
-                            getByIp("94.140.15.15"))
-                    .includeIPv6(false)
-                    .build();
-
-            // 4. Quad9 DNS over HTTPS (Cuaternario)
-            final DnsOverHttps quad9Dns = new DnsOverHttps.Builder()
-                    .client(bootstrap)
-                    .url(HttpUrl.get(QUAD9_DOH_URL))
-                    .bootstrapDnsHosts(
-                            getByIp("9.9.9.9"),
-                            getByIp("149.112.112.112"))
-                    .includeIPv6(false)
-                    .build();
-
-            // Configurar DNS con fallback: Google -> Cloudflare -> AdGuard -> Quad9 -> Sistema
-            builder.dns(new Dns() {
-                @Override
-                public List<InetAddress> lookup(String hostname) throws UnknownHostException {
-                    // Intento 1: Google DNS
-                    try {
-                        List<InetAddress> result = googleDns.lookup(hostname);
-                        if (result != null && !result.isEmpty()) return result;
-                    } catch (Exception ignored) {
-                        // Falló Google, continuar
-                    }
-
-                    // Intento 2: Cloudflare DNS
-                    try {
-                        List<InetAddress> result = cloudflareDns.lookup(hostname);
-                        if (result != null && !result.isEmpty()) return result;
-                    } catch (Exception ignored) {
-                        // Falló Cloudflare, continuar
-                    }
-
-                    // Intento 3: AdGuard DNS
-                    try {
-                        List<InetAddress> result = adGuardDns.lookup(hostname);
-                        if (result != null && !result.isEmpty()) return result;
-                    } catch (Exception ignored) {
-                        // Falló AdGuard, continuar
-                    }
-
-                    // Intento 4: Quad9 DNS
-                    try {
-                        List<InetAddress> result = quad9Dns.lookup(hostname);
-                        if (result != null && !result.isEmpty()) return result;
-                    } catch (Exception ignored) {
-                        // Falló Quad9, continuar
-                    }
-
-                    // Intento 5: DNS del Sistema (Fallback final)
-                    try {
-                        return Dns.SYSTEM.lookup(hostname);
-                    } catch (UnknownHostException e) {
-                        throw e;
                     }
+                } 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) {
-            // Si algo falla en la configuración DNS, usamos por defecto (implícito en el builder)
+            builder.dns(Dns.SYSTEM);
-            System.out.println("Error configurando DNS over HTTPS: " + e.getMessage());
+            Log.w(TAG, "Error configurando DNS over HTTPS", e);
         }
 
         CLIENT = builder.build();
     }
 
-    private static InetAddress getByIp(String ip) throws UnknownHostException {
+    private NetworkUtils() {
-        return InetAddress.getByName(ip);
     }
 
     public static OkHttpClient getClient() {

app/src/main/java/com/streamplayer/PlayerActivity.java

@@ -1,46 +1,40 @@
 package com.streamplayer;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.os.StrictMode;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.OptIn;
 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.common.util.UnstableApi;
-import androidx.media3.exoplayer.trackselection.DefaultTrackSelector;
+import androidx.media3.datasource.DefaultHttpDataSource;
-import androidx.media3.datasource.okhttp.OkHttpDataSource;
+import androidx.media3.exoplayer.ExoPlayer;
-import androidx.media3.exoplayer.source.MediaSource;
 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.Locale;
 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,23 +44,23 @@ 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) {
         super.onCreate(savedInstanceState);
 
-        StrictMode.setThreadPolicy(
-                new StrictMode.ThreadPolicy.Builder().permitAll().build()
-        );
-
         setContentView(R.layout.activity_player);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
@@ -83,11 +77,11 @@ public class PlayerActivity extends AppCompatActivity {
             finish();
             return;
         }
+        currentChannelPageUrl = channelUrl;
 
         initViews();
         channelLabel.setText(channelName);
 
-        // DNS configurado en StreamUrlResolver
         loadChannel();
     }
 
@@ -101,118 +95,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);
+                String resolvedUrl = StreamUrlResolver.resolve(pageUrl);
-                runOnUiThread(() -> startPlayback(resolvedUrl));
+                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
+            lastStreamUrl = streamUrl;
-            retryCount = 0; // Resetear contador al iniciar nueva reproducción
+            retryCount = 0;
-            DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(this)
+            playbackStarted = false;
-                    .setEnableDecoderFallback(true)
+            scheduleStartupTimeout();
-                    .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON);
+            Log.d(TAG, "Iniciando reproducción: " + streamUrl);
 
-            // Configurar track selector para calidad adaptativa (no forzar máxima calidad)
+            DefaultHttpDataSource.Factory httpFactory = new DefaultHttpDataSource.Factory()
-            trackSelector = new DefaultTrackSelector(this);
+                    .setUserAgent(VlcPlayerConfig.USER_AGENT)
-            DefaultTrackSelector.Parameters params = trackSelector.buildUponParameters()
+                    .setAllowCrossProtocolRedirects(true)
-                    .setForceHighestSupportedBitrate(false)  // Permitir calidad adaptativa
+                    .setConnectTimeoutMs(15000)
-                    .setMaxVideoBitrate(Integer.MAX_VALUE)     // Sin límite máximo de bitrate
+                    .setReadTimeoutMs(20000);
-                    .build();
-            trackSelector.setParameters(params);
 
-            player = new ExoPlayer.Builder(this, renderersFactory)
+            Map<String, String> headers = new HashMap<>();
-                    .setTrackSelector(trackSelector)
+            headers.put("User-Agent", VlcPlayerConfig.USER_AGENT);
-                    .setSeekForwardIncrementMs(10_000)
+            httpFactory.setDefaultRequestProperties(headers);
-                    .setSeekBackIncrementMs(10_000)
+
-                    .build();
+            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() {
+            player.setMediaSource(mediaSource);
-                @Override
+            player.prepare();
-                public void onPlaybackStateChanged(int playbackState) {
+            player.play();
-                    if (playbackState == Player.STATE_READY) {
+            setOverlayVisible(false);
-                        showLoading(false);
+        } catch (Exception e) {
-                        retryCount = 0; // Resetear contador de reintentos al reproducir exitosamente
+            cancelStartupTimeout();
-                    } else if (playbackState == Player.STATE_BUFFERING) {
+            Log.e(TAG, "Error al iniciar reproducción", e);
-                        showLoading(true);
+            if (!tryAlternateSource("Error al inicializar reproductor. Probando fuente alterna...")) {
-                    }
+                showError("Error al inicializar reproductor: " + e.getMessage());
-                }
+            }
+        }
+    }
 
-                @Override
+    private void setupPlayerListener() {
-                public void onPlayerError(PlaybackException error) {
+        if (player == null) {
-                    String errorMsg = error.getMessage() != null ? error.getMessage() : "";
+            return;
-                    String detail = error.getCause() != null ?
+        }
-                            error.getCause().getMessage() : "";
-                    String fullError = errorMsg + " " + detail;
 
-                    // Verificar si es un error que justifica reintento (404, conectividad, etc.)
+        player.addListener(new Player.Listener() {
-                    boolean isRetryableError =
+            @Override
-                        fullError.contains("404") ||
+            public void onPlaybackStateChanged(int playbackState) {
-                        fullError.contains("403") ||
+                switch (playbackState) {
-                        fullError.contains("timeout") ||
+                    case Player.STATE_BUFFERING:
-                        fullError.contains("Unable to connect") ||
+                        Log.d(TAG, "Exo Event: BUFFERING");
-                        fullError.contains("Network") ||
+                        runOnUiThread(() -> showLoading(true));
-                        fullError.contains("source error") ||
+                        break;
-                        error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED ||
+                    case Player.STATE_READY:
-                        error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT ||
+                        Log.d(TAG, "Exo Event: READY");
-                        error.errorCode == PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS;
-
-                    if (isRetryableError && retryCount < MAX_RETRIES) {
-                        retryCount++;
                         runOnUiThread(() -> {
-                            showLoading(true);
+                            playbackStarted = true;
-                            showError("Error de conexión. Reintentando... (" + retryCount + "/" + MAX_RETRIES + ")");
+                            cancelStartupTimeout();
+                            showLoading(false);
+                            retryCount = 0;
                         });
-
+                        break;
-                        // Reintentar después de 2 segundos
+                    case Player.STATE_ENDED:
-                        new android.os.Handler(android.os.Looper.getMainLooper()).postDelayed(() -> {
+                        Log.d(TAG, "Exo Event: ENDED");
-                            if (lastStreamUrl != null) {
+                        runOnUiThread(() -> {
-                                startPlayback(lastStreamUrl);
+                            cancelStartupTimeout();
-                            } else {
+                            finish();
-                                loadChannel();
+                        });
-                            }
+                        break;
-                        }, 2000);
+                    default:
-                    } else {
+                        break;
-                        // 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);
-                    }
                 }
+            }
+
+            @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(Locale.ROOT);
+        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(getString(R.string.player_retrying, retryCount, VlcPlayerConfig.MAX_RETRIES));
             });
 
-            MediaItem mediaItem = MediaItem.fromUri(streamUrl);
+            mainHandler.postDelayed(() -> {
-            player.setMediaSource(buildMediaSource(mediaItem));
+                if (lastStreamUrl != null) {
-            player.prepare();
+                    startPlayback(lastStreamUrl);
-            player.setPlayWhenReady(true);
+                } else {
-            setOverlayVisible(false);
+                    loadChannel();
-
+                }
-        } catch (Exception e) {
+            }, 1500);
-            showError("Error al inicializar reproductor: " + e.getMessage());
+        } 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 +364,20 @@ public class PlayerActivity extends AppCompatActivity {
     }
 
     private void releasePlayer() {
+        cancelStartupTimeout();
+        playbackStarted = false;
         if (player != null) {
             player.release();
             player = null;
         }
-    }
+        playerView.setPlayer(null);
-
-    private MediaSource buildMediaSource(MediaItem mediaItem) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Referer", channelUrl);
-        headers.put("Origin", "https://streamtp10.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;
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        if (player != null) {
+        if (player != null && !player.isPlaying()) {
-            playerView.onResume();
+            player.play();
-        } else if (channelUrl != null) {
-            loadChannel();
         }
     }
 
@@ -296,7 +385,7 @@ public class PlayerActivity extends AppCompatActivity {
     protected void onResume() {
         super.onResume();
         if (player != null) {
-            playerView.onResume();
+            player.play();
         }
     }
 
@@ -304,18 +393,19 @@ 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
     protected void onDestroy() {
+        mainHandler.removeCallbacksAndMessages(null);
         super.onDestroy();
         releasePlayer();
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

app/src/main/java/com/streamplayer/StreamUrlResolver.java

@@ -1,86 +1,312 @@
 package com.streamplayer;
 
+import android.util.Base64;
+
 import java.io.IOException;
-import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
-import java.net.UnknownHostException;
+import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-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.
+ * Incluye fallback para páginas con JWPlayer y formatos ofuscados.
  */
 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*[\"']([^\"']+)[\"']");
 
-    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";
+    // Patrón para source src en tags video
+    private static final Pattern VIDEO_SOURCE_PATTERN =
+            Pattern.compile("<source[^>]+src=[\"']([^\"']+)[\"']");
 
-    private static final OkHttpClient CLIENT;
+    // Patrón para URLs M3U8 en cualquier parte del HTML
+    private static final Pattern M3U8_URL_PATTERN =
+            Pattern.compile("(https?://[^\\s'\"<>]+\\.m3u8[^\\s'\"<>]*)");
 
-    static {
+    // Patrón para URLs de stream en comillas dobles o simples
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+    private static final Pattern STREAM_URL_PATTERN =
-                .connectTimeout(15, TimeUnit.SECONDS)
+            Pattern.compile("['\"](https?://[^'\"<>\\s]+?\\.(?:m3u8|mp4|ts)[^'\"<>\\s]*)['\"]");
-                .readTimeout(15, TimeUnit.SECONDS)
-                .followRedirects(true);
 
-        try {
+    // Patrón para file: o url: en JavaScript
-            // DNS de Google (8.8.8.8)
+    private static final Pattern JS_URL_PATTERN =
-            OkHttpClient bootstrap = new OkHttpClient.Builder().build();
+            Pattern.compile("(?:file|url|stream|source)\\s*[:=]\\s*[\"'](https?://[^\"']+)[\"']",
-            DnsOverHttps dns = new DnsOverHttps.Builder()
+                    Pattern.CASE_INSENSITIVE);
-                    .client(bootstrap)
-                    .url(HttpUrl.get("https://dns.google/dns-query"))
-                    .bootstrapDnsHosts(
-                            InetAddress.getByName("8.8.8.8"),
-                            InetAddress.getByName("8.8.4.4"))
-                    .build();
-            builder.dns(dns);
-        } catch (UnknownHostException e) {
-            // Fallback a DNS del sistema
-        }
 
-        CLIENT = builder.build();
+    // 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 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
+        // Si el contenido ya parece ser un stream M3U8, retornarlo directamente
-        Matcher matcher = PLAYBACK_URL_PATTERN.matcher(html);
+        if (html.startsWith("#EXTM3U") || html.startsWith("#EXT")) {
-        if (matcher.find()) {
+            return pageUrl;
-            String url = matcher.group(1);
+        }
-            if (url != null && !url.isEmpty() && url.startsWith("http")) {
+
-                return url;
+        // 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, new Comparator<EncodedPair>() {
+            @Override
+            public int compare(EncodedPair left, EncodedPair right) {
+                return Integer.compare(left.index, right.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(Locale.ROOT);
+        return lower.contains(".m3u8") ||
+               lower.contains(".mpd") ||
+               (lower.contains("stream") && !lower.contains(".php")) ||
+               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;
     }
 
     private static String downloadPage(String pageUrl) throws IOException {
         Request request = new Request.Builder()
                 .url(pageUrl)
-                .header("User-Agent", USER_AGENT)
+                .header("User-Agent", NetworkUtils.getUserAgent())
                 .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://streamtp10.com/")
+                .header("Referer", "http://streamtp10.com/")
                 .build();
 
-        try (Response response = CLIENT.newCall(request).execute()) {
+        try (Response response = NetworkUtils.getClient().newCall(request).execute()) {
             if (!response.isSuccessful()) {
                 throw new IOException("Error HTTP " + response.code() + " al cargar la página del stream");
             }
@@ -91,4 +317,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;
+        }
+    }
 }

app/src/main/java/com/streamplayer/UpdateManager.java

@@ -20,6 +20,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import androidx.core.content.FileProvider;
+import androidx.core.content.ContextCompat;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -34,7 +35,6 @@ import java.util.concurrent.Executors;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Request;
 import okhttp3.Response;
 
 /**
@@ -117,7 +117,7 @@ public class UpdateManager {
             return;
         }
         File targetDir = appContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-        if (targetDir == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (targetDir == null) {
             targetDir = appContext.getExternalFilesDir(null);
         }
         if (targetDir == null) {
@@ -273,21 +273,27 @@ public class UpdateManager {
         if (assets == null) {
             return null;
         }
-        JSONObject fallback = null;
+        JSONObject firstApk = null;
+        JSONObject debugApk = null;
         for (int i = 0; i < assets.length(); i++) {
             JSONObject asset = assets.optJSONObject(i);
             if (asset == null) {
                 continue;
             }
-            if (fallback == null) {
-                fallback = asset;
-            }
             String name = asset.optString("name", "").toLowerCase(Locale.US);
             if (name.endsWith(".apk")) {
-                return asset;
+                if (name.contains("release")) {
+                    return asset;
+                }
+                if (firstApk == null) {
+                    firstApk = asset;
+                }
+                if (name.contains("debug") && debugApk == null) {
+                    debugApk = asset;
+                }
             }
         }
-        return fallback;
+        return firstApk != null ? firstApk : debugApk;
     }
 
     private String deriveVersionName(String tagName, String fallback) {
@@ -363,7 +369,12 @@ public class UpdateManager {
         }
         downloadReceiver = new DownloadReceiver();
         IntentFilter filter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
-        appContext.registerReceiver(downloadReceiver, filter);
+        ContextCompat.registerReceiver(
+                appContext,
+                downloadReceiver,
+                filter,
+                ContextCompat.RECEIVER_NOT_EXPORTED
+        );
     }
 
     private void unregisterDownloadReceiver() {
@@ -440,7 +451,10 @@ public class UpdateManager {
         if (callback == null) {
             return;
         }
-        mainHandler.post(() -> callback.onError(message));
+        String safeMessage = TextUtils.isEmpty(message)
+                ? appContext.getString(R.string.update_error_unknown)
+                : message;
+        mainHandler.post(() -> callback.onError(safeMessage));
     }
 
     private void showToast(String message) {
@@ -533,4 +547,3 @@ public class UpdateManager {
         }
     }
 }
-

app/src/main/java/com/streamplayer/VlcPlayerConfig.java

@@ -0,0 +1,14 @@
+package com.streamplayer;
+
+public final class VlcPlayerConfig {
+
+    // 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";
+
+    // Maximum retries for playback
+    public static final int MAX_RETRIES = 3;
+
+    private VlcPlayerConfig() {
+    }
+}

app/src/main/res/drawable/bg_tab_selector.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#18d763" />
-            <corners android:radius="20dp" />
-        </shape>
-    </item>
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#5522c1ff" />
-            <corners android:radius="20dp" />
-            <stroke
-                android:width="2dp"
-                android:color="#88FFFFFF" />
-        </shape>
-    </item>
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#3322c1ff" />
-            <corners android:radius="20dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#222222" />
-            <corners android:radius="20dp" />
-            <stroke
-                android:width="1dp"
-                android:color="#44FFFFFF" />
-        </shape>
-    </item>
-</selector>

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"
+        android:keepScreenOn="true"
-        app:use_controller="true" />
+        app:show_buffering="never"
+        app:surface_type="surface_view"
+        app:use_controller="false" />
 
     <LinearLayout
         android:id="@+id/player_toolbar"
@@ -32,7 +34,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Canal"
+            android:text="@string/player_channel_default"
             android:textColor="@color/white"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -41,7 +43,7 @@
             android:id="@+id/close_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Elegir otro"
+            android:text="@string/player_action_choose_other"
             android:textAllCaps="false" />
     </LinearLayout>
 

app/src/main/res/layout/item_channel.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="6dp"
@@ -16,8 +17,8 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:contentDescription="@string/app_name"
-        android:tint="@color/white"
+        android:src="@drawable/ic_channel_default"
-        android:src="@drawable/ic_channel_default" />
+        app:tint="@color/white" />
 
     <TextView
         android:id="@+id/channel_name"

app/src/main/res/layout/item_event.xml

@@ -47,6 +47,7 @@
             android:id="@+id/event_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingEnd="8dp"
             android:paddingStart="8dp"
             android:textColor="#18d763"
             android:textSize="14sp"

app/src/main/res/values/arrays.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="channel_entries">
-        <item>Azteca Deportes</item>
-        <item>Canal 5 MX</item>
-        <item>Caliente TV MX</item>
-        <item>DAZN 1</item>
-        <item>DAZN 2</item>
-        <item>DAZN LaLiga</item>
-        <item>DSports</item>
-        <item>DSports 2</item>
-        <item>DSports Plus</item>
-        <item>ESPN</item>
-    </string-array>
-</resources>

app/src/main/res/values/strings.xml

@@ -1,13 +1,15 @@
 <resources>
     <string name="app_name">StreamPlayer</string>
     <string name="home_tagline">Todo el deporte en un solo lugar</string>
-    <string name="section_channels">Canales</string>
     <string name="section_events">Eventos</string>
     <string name="section_all_channels">Todos los canales</string>
     <string name="message_no_channels">No hay canales disponibles</string>
     <string name="message_no_events">No hay eventos disponibles</string>
     <string name="action_refresh">Actualizar</string>
     <string name="message_events_error">No se pudieron cargar los eventos: %1$s</string>
+    <string name="player_channel_default">Canal</string>
+    <string name="player_action_choose_other">Elegir otro</string>
+    <string name="player_retrying">Error de conexión. Reintentando... (%1$d/%2$d)</string>
     <string name="update_required_title">Actualización obligatoria</string>
     <string name="update_available_title">Actualización disponible</string>
     <string name="update_action_download">Actualizar</string>
@@ -22,6 +24,7 @@
     <string name="update_release_notes_title">Novedades</string>
     <string name="update_optional_hint">Puedes continuar usando la app, pero recomendamos instalar la actualización para obtener el mejor rendimiento.</string>
     <string name="update_error_checking">No se pudo verificar actualizaciones (%1$s)</string>
+    <string name="update_error_unknown">Error desconocido</string>
     <string name="update_error_open_release">No se pudo abrir el detalle de la versión</string>
     <string name="update_error_empty_response">Respuesta vacía del servidor de releases</string>
     <string name="update_error_http">Error de red (%1$d)</string>
@@ -40,7 +43,6 @@
     <string name="device_blocked_title">Dispositivo bloqueado</string>
     <string name="device_blocked_message">Este dispositivo fue bloqueado desde el panel de control. Motivo: %1$s</string>
     <string name="device_blocked_default_reason">Sin motivo especificado.</string>
-    <string name="device_blocked_token_hint">Comparte este código con el administrador para solicitar acceso: %1$s</string>
     <string name="device_blocked_token_label">Código de verificación</string>
     <string name="device_blocked_close">Salir</string>
     <string name="device_blocked_copy_token">Copiar código</string>

app/src/main/res/xml/backup_rules.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample backup rules file; uncomment and customize as necessary.
-   See https://developer.android.com/guide/topics/data/autobackup
-   for details.
-   Note: This file is ignored for devices older that API 23, even
-   if they have auto backup available.
--->
-<full-backup-content>
-    <!--
-   <include domain="sharedpref" path="."/>
-   <exclude domain="sharedpref" path="device.xml"/>
--->
-    <exclude domain="sharedpref" path="." />
-</full-backup-content>

app/src/main/res/xml/data_extraction_rules.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
-<data-extraction-rules>
-    <cloud-backup>
-        <!--
-        <include domain="file" path="."/>
-        <exclude domain="file" path="no_backup/"/>
-        -->
-        <exclude domain="sharedpref" path="." />
-    </cloud-backup>
-    <!--
-    <device-transfer>
-        <include domain="file" path="."/>
-        <exclude domain="file" path="no_backup/"/>
-    </device-transfer>
-    -->
-</data-extraction-rules>

update-manifest.json

@@ -1,10 +1,10 @@
 {
-  "versionCode": 100300,
+  "versionCode": 100110,
-  "versionName": "10.0.3",
+  "versionName": "10.1.10",
-  "minSupportedVersionCode": 91000,
+  "minSupportedVersionCode": 0,
   "forceUpdate": false,
-  "downloadUrl": "https://gitea.cbcren.online/renato97/app/releases/download/v10.0.3/StreamPlayer-v10.0.3.apk",
+  "downloadUrl": "http://gitea.cbcren.online/renato97/app/releases/download/v10.1.10/StreamPlayer-v10.1.10-debug.apk",
-  "fileName": "StreamPlayer-v10.0.3.apk",
+  "fileName": "StreamPlayer-v10.1.10-debug.apk",
-  "sizeBytes": 0,
+  "sizeBytes": 9113609,
-  "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'"
+  "notes": "Cambiar a HTTP para evitar errores de certificado"
 }