v10.1.11: Aceptar todos los certificados SSL para streams con redirección
This commit is contained in:
@@ -8,8 +8,8 @@ android {
|
|||||||
applicationId "com.streamplayer"
|
applicationId "com.streamplayer"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 35
|
targetSdk 35
|
||||||
versionCode 100110
|
versionCode 100111
|
||||||
versionName "10.1.10"
|
versionName "10.1.11"
|
||||||
buildConfigField "String", "DEVICE_REGISTRY_URL", '"http://194.163.191.200:4000"'
|
buildConfigField "String", "DEVICE_REGISTRY_URL", '"http://194.163.191.200:4000"'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,10 +28,15 @@ import androidx.media3.common.util.UnstableApi;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
|
import java.security.cert.X509Certificate;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLContext;
|
||||||
|
import javax.net.ssl.TrustManager;
|
||||||
|
import javax.net.ssl.X509TrustManager;
|
||||||
|
|
||||||
import okhttp3.HttpUrl;
|
import okhttp3.HttpUrl;
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.dnsoverhttps.DnsOverHttps;
|
import okhttp3.dnsoverhttps.DnsOverHttps;
|
||||||
@@ -254,11 +259,30 @@ public class PlayerActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
OkHttpClient bootstrap = new OkHttpClient.Builder()
|
final TrustManager[] trustAllCerts = new TrustManager[]{
|
||||||
|
new X509TrustManager() {
|
||||||
|
@Override
|
||||||
|
public void checkClientTrusted(X509Certificate[] chain, String authType) {}
|
||||||
|
@Override
|
||||||
|
public void checkServerTrusted(X509Certificate[] chain, String authType) {}
|
||||||
|
@Override
|
||||||
|
public X509Certificate[] getAcceptedIssuers() {
|
||||||
|
return new X509Certificate[]{};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
final SSLContext sslContext = SSLContext.getInstance("SSL");
|
||||||
|
sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
|
||||||
|
|
||||||
|
OkHttpClient.Builder builder = new OkHttpClient.Builder()
|
||||||
.connectTimeout(20, TimeUnit.SECONDS)
|
.connectTimeout(20, TimeUnit.SECONDS)
|
||||||
.readTimeout(30, TimeUnit.SECONDS)
|
.readTimeout(30, TimeUnit.SECONDS)
|
||||||
.retryOnConnectionFailure(true)
|
.retryOnConnectionFailure(true)
|
||||||
.build();
|
.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
|
||||||
|
.hostnameVerifier((hostname, session) -> true);
|
||||||
|
|
||||||
|
OkHttpClient bootstrap = builder.build();
|
||||||
|
|
||||||
DnsOverHttps dohDns = new DnsOverHttps.Builder()
|
DnsOverHttps dohDns = new DnsOverHttps.Builder()
|
||||||
.client(bootstrap)
|
.client(bootstrap)
|
||||||
@@ -268,10 +292,8 @@ public class PlayerActivity extends AppCompatActivity {
|
|||||||
InetAddress.getByName("8.8.4.4"))
|
InetAddress.getByName("8.8.4.4"))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
okHttpClient = bootstrap.newBuilder()
|
okHttpClient = builder.dns(dohDns).build();
|
||||||
.dns(dohDns)
|
} catch (Exception e) {
|
||||||
.build();
|
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
okHttpClient = new OkHttpClient.Builder()
|
okHttpClient = new OkHttpClient.Builder()
|
||||||
.connectTimeout(20, TimeUnit.SECONDS)
|
.connectTimeout(20, TimeUnit.SECONDS)
|
||||||
.readTimeout(30, TimeUnit.SECONDS)
|
.readTimeout(30, TimeUnit.SECONDS)
|
||||||
|
|||||||
@@ -2,11 +2,15 @@ package com.streamplayer;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.security.cert.X509Certificate;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLContext;
|
||||||
|
import javax.net.ssl.TrustManager;
|
||||||
|
import javax.net.ssl.X509TrustManager;
|
||||||
|
|
||||||
import okhttp3.HttpUrl;
|
import okhttp3.HttpUrl;
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.Request;
|
import okhttp3.Request;
|
||||||
@@ -28,14 +32,36 @@ public final class StreamUrlResolver {
|
|||||||
private static final OkHttpClient CLIENT;
|
private static final OkHttpClient CLIENT;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
OkHttpClient.Builder builder = new OkHttpClient.Builder()
|
OkHttpClient client = null;
|
||||||
.connectTimeout(15, TimeUnit.SECONDS)
|
|
||||||
.readTimeout(15, TimeUnit.SECONDS)
|
|
||||||
.followRedirects(true);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// DNS de Google (8.8.8.8)
|
final TrustManager[] trustAllCerts = new TrustManager[]{
|
||||||
OkHttpClient bootstrap = new OkHttpClient.Builder().build();
|
new X509TrustManager() {
|
||||||
|
@Override
|
||||||
|
public void checkClientTrusted(X509Certificate[] chain, String authType) {}
|
||||||
|
@Override
|
||||||
|
public void checkServerTrusted(X509Certificate[] chain, String authType) {}
|
||||||
|
@Override
|
||||||
|
public X509Certificate[] getAcceptedIssuers() {
|
||||||
|
return new X509Certificate[]{};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
final SSLContext sslContext = SSLContext.getInstance("SSL");
|
||||||
|
sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
|
||||||
|
|
||||||
|
OkHttpClient.Builder builder = new OkHttpClient.Builder()
|
||||||
|
.connectTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.readTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.followRedirects(true)
|
||||||
|
.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
|
||||||
|
.hostnameVerifier((hostname, session) -> true);
|
||||||
|
|
||||||
|
OkHttpClient bootstrap = new OkHttpClient.Builder()
|
||||||
|
.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
|
||||||
|
.hostnameVerifier((hostname, session) -> true)
|
||||||
|
.build();
|
||||||
|
|
||||||
DnsOverHttps dns = new DnsOverHttps.Builder()
|
DnsOverHttps dns = new DnsOverHttps.Builder()
|
||||||
.client(bootstrap)
|
.client(bootstrap)
|
||||||
.url(HttpUrl.get("https://dns.google/dns-query"))
|
.url(HttpUrl.get("https://dns.google/dns-query"))
|
||||||
@@ -44,11 +70,16 @@ public final class StreamUrlResolver {
|
|||||||
InetAddress.getByName("8.8.4.4"))
|
InetAddress.getByName("8.8.4.4"))
|
||||||
.build();
|
.build();
|
||||||
builder.dns(dns);
|
builder.dns(dns);
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
// Fallback a DNS del sistema
|
client = builder.build();
|
||||||
|
} catch (Exception e) {
|
||||||
|
client = new OkHttpClient.Builder()
|
||||||
|
.connectTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.readTimeout(15, TimeUnit.SECONDS)
|
||||||
|
.followRedirects(true)
|
||||||
|
.build();
|
||||||
}
|
}
|
||||||
|
CLIENT = client;
|
||||||
CLIENT = builder.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private StreamUrlResolver() {
|
private StreamUrlResolver() {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versionCode": 100300,
|
"versionCode": 100110,
|
||||||
"versionName": "10.0.3",
|
"versionName": "10.1.10",
|
||||||
"minSupportedVersionCode": 91000,
|
"minSupportedVersionCode": 0,
|
||||||
"forceUpdate": false,
|
"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"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user