history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-14 08:45:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTPDownloader: Fix user agent sending on Windows/Android

Browse Source
This commit is contained in:
Connor McLaughlin
2021-04-04 12:55:03 +10:00
parent 251043f11a
commit d41b5be908
10 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/app/src/cpp/android_http_downloader.cpp
View File

@ -19,16 +19,16 @@ AndroidHTTPDownloader::~AndroidHTTPDownloader()
env->DeleteGlobalRef(m_URLDownloader_class);
}
std::unique_ptr<HTTPDownloader> HTTPDownloader::Create()
std::unique_ptr<HTTPDownloader> HTTPDownloader::Create(const char* user_agent)
{
std::unique_ptr<AndroidHTTPDownloader> instance(std::make_unique<AndroidHTTPDownloader>());
if (!instance->Initialize())
if (!instance->Initialize(user_agent))
return {};
return instance;
}
bool AndroidHTTPDownloader::Initialize()
bool AndroidHTTPDownloader::Initialize(const char* user_agent)
{
JNIEnv* env = AndroidHelpers::GetJNIEnv();
jclass klass = env->FindClass("com/github/stenzek/duckstation/URLDownloader");
@ -39,7 +39,7 @@ bool AndroidHTTPDownloader::Initialize()
if (!m_URLDownloader_class)
return false;
m_URLDownloader_constructor = env->GetMethodID(klass, "<init>", "()V");
m_URLDownloader_constructor = env->GetMethodID(klass, "<init>", "(Ljava/lang/String;)V");
m_URLDownloader_get = env->GetMethodID(klass, "get", "(Ljava/lang/String;)Z");
m_URLDownloader_post = env->GetMethodID(klass, "post", "(Ljava/lang/String;[B)Z");
m_URLDownloader_getStatusCode = env->GetMethodID(klass, "getStatusCode", "()I");
@ -50,6 +50,7 @@ bool AndroidHTTPDownloader::Initialize()
return false;
}
m_user_agent = user_agent;
m_thread_pool = std::make_unique<cb::ThreadPool>(m_max_active_requests);
return true;
}
@ -68,8 +69,10 @@ void AndroidHTTPDownloader::ProcessRequest(Request* req)
JNIEnv* env;
if (AndroidHelpers::GetJavaVM()->AttachCurrentThread(&env, nullptr) == JNI_OK)
{
jobject obj = env->NewObject(m_URLDownloader_class, m_URLDownloader_constructor);
jstring url_string = env->NewStringUTF(req->url.c_str());
jstring user_agent_string = env->NewStringUTF(m_user_agent.c_str());
jobject obj = env->NewObject(m_URLDownloader_class, m_URLDownloader_constructor, user_agent_string);
jboolean result;
if (req->post_data.empty())
{
@ -85,6 +88,7 @@ void AndroidHTTPDownloader::ProcessRequest(Request* req)
}
env->DeleteLocalRef(url_string);
env->DeleteLocalRef(user_agent_string);
if (result)
{

3
android/app/src/cpp/android_http_downloader.h
View File

@ -14,7 +14,7 @@ public:
AndroidHTTPDownloader();
~AndroidHTTPDownloader() override;
bool Initialize();
bool Initialize(const char* user_agent);
protected:
Request* InternalCreateRequest() override;
@ -30,6 +30,7 @@ private:
void ProcessRequest(Request* req);
std::string m_user_agent;
std::unique_ptr<cb::ThreadPool> m_thread_pool;
std::mutex m_cancel_mutex;

8
android/app/src/main/java/com/github/stenzek/duckstation/URLDownloader.java
View File

@ -15,17 +15,21 @@ import java.net.URL;
public class URLDownloader {
private int statusCode = -1;
private byte[] data = null;
private final String userAgent;
public URLDownloader() {
public URLDownloader(String userAgent) {
this.userAgent = userAgent;
}
static private HttpURLConnection getConnection(String url) {
private HttpURLConnection getConnection(String url) {
try {
final URL parsedUrl = new URL(url);
HttpURLConnection connection = (HttpURLConnection) parsedUrl.openConnection();
if (connection == null)
throw new RuntimeException(String.format("openConnection(%s) returned null", url));
if (userAgent != null)
connection.addRequestProperty("User-Agent", userAgent);
return connection;
} catch (Exception e) {
e.printStackTrace();