v10.1.12: Revertir a código v10.1.7 funcional con dominio streamtp10.com
- PlayerActivity: Referer vuelve a ser channelUrl (URL específica del canal) - StreamUrlResolver: Vuelve a crear su propio cliente con Google DNS - Eliminados cambios problemáticos de SSL trust-all y múltiples DNS - Mantenidos solo los cambios necesarios: streamtp10.com en lugar de streamtpcloud.com Esto debería hacer que los streams vuelvan a funcionar como en v10.1.7
This commit is contained in:
@@ -25,10 +25,16 @@ import androidx.media3.common.util.Util;
|
||||
import androidx.annotation.OptIn;
|
||||
import androidx.media3.common.util.UnstableApi;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.InetAddress;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import okhttp3.HttpUrl;
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.dnsoverhttps.DnsOverHttps;
|
||||
|
||||
@OptIn(markerClass = UnstableApi.class)
|
||||
public class PlayerActivity extends AppCompatActivity {
|
||||
@@ -48,6 +54,7 @@ public class PlayerActivity extends AppCompatActivity {
|
||||
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;
|
||||
@@ -80,7 +87,7 @@ public class PlayerActivity extends AppCompatActivity {
|
||||
initViews();
|
||||
channelLabel.setText(channelName);
|
||||
|
||||
// DNS over HTTPS ya está configurado en NetworkUtils
|
||||
// DNS configurado en StreamUrlResolver
|
||||
loadChannel();
|
||||
}
|
||||
|
||||
@@ -103,8 +110,10 @@ public class PlayerActivity extends AppCompatActivity {
|
||||
try {
|
||||
String resolvedUrl = StreamUrlResolver.resolve(channelUrl);
|
||||
runOnUiThread(() -> startPlayback(resolvedUrl));
|
||||
} catch (Exception e) {
|
||||
} catch (IOException e) {
|
||||
runOnUiThread(() -> showError("No se pudo conectar con el canal: " + e.getMessage()));
|
||||
} catch (Exception e) {
|
||||
runOnUiThread(() -> showError("Error inesperado: " + e.getMessage()));
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
@@ -155,17 +164,13 @@ public class PlayerActivity extends AppCompatActivity {
|
||||
boolean isRetryableError =
|
||||
fullError.contains("404") ||
|
||||
fullError.contains("403") ||
|
||||
fullError.contains("401") ||
|
||||
fullError.contains("timeout") ||
|
||||
fullError.contains("Unable to connect") ||
|
||||
fullError.contains("Network") ||
|
||||
fullError.contains("source error") ||
|
||||
fullError.contains("SSL") ||
|
||||
fullError.contains("Certificate") ||
|
||||
error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED ||
|
||||
error.errorCode == PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT ||
|
||||
error.errorCode == PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS ||
|
||||
error.errorCode == PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE;
|
||||
error.errorCode == PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS;
|
||||
|
||||
if (isRetryableError && retryCount < MAX_RETRIES) {
|
||||
retryCount++;
|
||||
@@ -174,12 +179,14 @@ public class PlayerActivity extends AppCompatActivity {
|
||||
showError("Error de conexión. Reintentando... (" + retryCount + "/" + MAX_RETRIES + ")");
|
||||
});
|
||||
|
||||
// Reintentar después de 3 segundos
|
||||
// Reintentar después de 2 segundos
|
||||
new android.os.Handler(android.os.Looper.getMainLooper()).postDelayed(() -> {
|
||||
if (lastStreamUrl != null) {
|
||||
loadChannel(); // Recargar desde la página para obtener URL fresca
|
||||
startPlayback(lastStreamUrl);
|
||||
} else {
|
||||
loadChannel();
|
||||
}
|
||||
}, 3000);
|
||||
}, 2000);
|
||||
} else {
|
||||
// Mostrar error final después de agotar reintentos
|
||||
String finalMessage = "Error al reproducir: " + fullError;
|
||||
@@ -228,27 +235,53 @@ public class PlayerActivity extends AppCompatActivity {
|
||||
|
||||
private MediaSource buildMediaSource(MediaItem mediaItem) {
|
||||
Map<String, String> headers = new HashMap<>();
|
||||
|
||||
// Headers críticos para que el servidor acepte la petición
|
||||
headers.put("Referer", "https://streamtp10.com/");
|
||||
headers.put("Referer", channelUrl);
|
||||
headers.put("Origin", "https://streamtp10.com");
|
||||
headers.put("Accept", "*/*");
|
||||
headers.put("Accept-Language", "es-ES,es;q=0.9");
|
||||
headers.put("Accept-Encoding", "gzip, deflate, br");
|
||||
|
||||
// Usar el User-Agent estándar de NetworkUtils que funciona mejor
|
||||
String userAgent = NetworkUtils.getUserAgent();
|
||||
headers.put("Connection", "keep-alive");
|
||||
|
||||
// Usar NetworkUtils.getClient() que tiene los 4 servidores DNS configurados
|
||||
OkHttpClient client = NetworkUtils.getClient();
|
||||
String userAgent = Util.getUserAgent(this, "StreamPlayer");
|
||||
|
||||
OkHttpDataSource.Factory factory = new OkHttpDataSource.Factory(client)
|
||||
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();
|
||||
|
||||
Reference in New Issue
Block a user