calculate the content length correctly when the content disposition h…

…eader contains unicode multi-byte characters
irccloud · Sep 18, 2018 · f242cc0 · f242cc0
1 parent 0371fd0
commit f242cc0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/irccloud-android.iml b/irccloud-android.iml
@@ -94,7 +94,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_aapt_derived_proguard_rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_main_dex_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />

diff --git a/src/com/irccloud/android/activity/MainActivity.java b/src/com/irccloud/android/activity/MainActivity.java
@@ -6528,7 +6528,7 @@ public void run() {
                 http.setReadTimeout(60000);
                 http.setConnectTimeout(60000);
                 http.setDoOutput(true);
-                http.setFixedLengthStreamingMode(total + (boundary.length() * 2) + original_filename.length() + type.length() + 88);
+                http.setFixedLengthStreamingMode(total + (boundary.length() * 2) + original_filename.getBytes().length + type.length() + 88);
                 http.setRequestProperty("User-Agent", NetworkConnection.getInstance().useragent);
                 http.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
                 http.setRequestProperty("Cookie", "session=" + NetworkConnection.getInstance().session);