Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nerzhul/ncsms-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-11-25 14:10:29 +0300
committerLoic Blot <loic.blot@unix-experience.fr>2017-11-25 14:10:42 +0300
commitf4b20b5873dd423c05ff41a4d9eccddcb612b215 (patch)
tree304fadd49514759041bbd6ef45005f70e131e404
parent84134671be7de6008e4540f831ff38c6851b82af (diff)
Release 1.3.21.3.2
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java12
2 files changed, 10 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 8598f33..5f7c367 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ android {
defaultConfig {
applicationId "fr.unix_experience.owncloud_sms"
- versionCode 61
- versionName "1.3.1"
+ versionCode 62
+ versionName "1.3.2"
minSdkVersion 16
targetSdkVersion 26
maxSdkVersion 26
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java
index 465ab5c..0cd40e2 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java
@@ -155,7 +155,9 @@ public class OCHttpClient {
urlConnection.setRequestMethod(method);
urlConnection.setRequestProperty("User-Agent", _userAgent);
urlConnection.setInstanceFollowRedirects(true);
- urlConnection.setDoOutput(true);
+ if (!"GET".equals(method)) {
+ urlConnection.setDoOutput(true);
+ }
urlConnection.setRequestProperty("Content-Type", "application/json");
urlConnection.setRequestProperty("Accept", "application/json");
@@ -164,9 +166,11 @@ public class OCHttpClient {
urlConnection.setRequestProperty("Authorization", basicAuth);
urlConnection.setChunkedStreamingMode(0);
- OutputStream out = new BufferedOutputStream(urlConnection.getOutputStream());
- out.write(requestBody.getBytes(Charset.forName("UTF-8")));
- out.close();
+ if (!"GET".equals(method)) {
+ OutputStream out = new BufferedOutputStream(urlConnection.getOutputStream());
+ out.write(requestBody.getBytes(Charset.forName("UTF-8")));
+ out.close();
+ }
response = handleHTTPResponse(urlConnection, skipError);
} catch (IOException e) {