Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
Merge pull request #233 from lgallard/fix/content-type-header
Browse files Browse the repository at this point in the history 
Fix content type header issues
  • Loading branch information
@lgallard
lgallard committed Mar 7, 2020
2 parents 986fea4 + ea1c764 commit 1e20064
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 70 deletions.
124 changes: 62 additions & 62 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,81 +10,81 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="freeDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleFreeDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileFreeDebugSources" />
<option name="SELECTED_BUILD_VARIANT" value="proDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleProDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileProDebugSources" />
<afterSyncTasks>
<task>generateFreeDebugSources</task>
<task>generateProDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/free/res;file://$MODULE_DIR$/build/generated/res/resValues/free/debug" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/pro/res;file://$MODULE_DIR$/build/generated/res/resValues/pro/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/javac/freeDebug/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/freeDebugUnitTest/classes" />
<output url="file://$MODULE_DIR$/build/intermediates/javac/proDebug/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/proDebugUnitTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/freeDebug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/freeDebug/compileFreeDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/free/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/freeDebug/compileFreeDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/free/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/free/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/freeDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/freeDebugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/freeDebugAndroidTest/compileFreeDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/free/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/freeDebugAndroidTest/compileFreeDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/free/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/free/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFreeDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/freeDebugUnitTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFreeDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/free/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/free/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/free/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/free/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/free/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/free/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/free/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/proDebug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/proDebug/compileProDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/pro/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/proDebug/compileProDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/pro/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/pro/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/proDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/proDebugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/proDebugAndroidTest/compileProDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/pro/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/proDebugAndroidTest/compileProDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/pro/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/pro/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestProDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/proDebugUnitTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testProDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/pro/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPro/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@ android {
productFlavors {
pro {
applicationId 'com.lgallardo.qbittorrentclientpro'
versionName '4.8.4'
versionName '4.8.5'
minSdkVersion 14
targetSdkVersion 28
archivesBaseName = "qBittorrentController_v" + versionName
versionCode 4840
versionCode 4850
dimension "default"
}
free {
applicationId "com.lgallardo.qbittorrentclient"
versionName '4.8.4'
versionName '4.8.5'
minSdkVersion 14
targetSdkVersion 28
archivesBaseName = "qBittorrentController_v" + versionName
versionCode 4840
versionCode 4850
dimension "default"
}
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ public Map<String, String> getHeaders() throws AuthFailureError {
Map<String, String> params = new HashMap<>();
//params.put("Host", hostname + ":" + port);
params.put("Referer", protocol + "://" + hostname + ":" + port);
params.put("Content-Type:", "application/x-www-form-urlencoded");
params.put("Content-Type", "application/x-www-form-urlencoded");

return params;
}
Expand Down Expand Up @@ -2346,7 +2346,7 @@ public Map<String, String> getHeaders() throws AuthFailureError {
params.put("User-Agent", "qBittorrent for Android");
//params.put("Host", hostname + ":" + port);
params.put("Referer", protocol + "://" + hostname + ":" + port);
params.put("Content-Type", urlContentType);
// params.put("Content-Type", urlContentType);
params.put("Cookie", cookie);
return params;
}
Expand Down Expand Up @@ -2446,7 +2446,7 @@ public Map<String, String> getHeaders() throws AuthFailureError {
params.put("User-Agent", "qBittorrent for Android");
//params.put("Host", hostname + ":" + port);
params.put("Referer", protocol + "://" + hostname + ":" + port);
params.put("Content-Type", urlContentType);
// params.put("Content-Type", urlContentType);
params.put("Cookie", cookie);
return params;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/lgallardo/qbittorrentclient/NotifierService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public Map<String, String> getHeaders() throws AuthFailureError {
Map<String, String> params = new HashMap<>();
params.put("Host", hostname + ":" + port);
params.put("Referer", protocol + "://" + hostname + ":" + port);
params.put("Content-Type:", "application/x-www-form-urlencoded");
params.put("Content-Type", "application/x-www-form-urlencoded");

return params;
}
Expand Down

0 comments on commit 1e20064

Please sign in to comment.