flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2026-08-20 12:52:59 +00:00
Code Issues Releases Wiki Activity

Add a new connection error type & fix periodic sync

Browse Source
This commit is contained in:
Loic Blot
2017-12-06 21:11:42 +01:00
parent 56857c16d4
commit d12bd8b835
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java
+5 -3
View File
@@ -151,6 +151,7 @@ public class OCHttpClient {
public Pair<Integer, JSONObject> execute(String method, URL url, String requestBody, boolean skipError) throws OCSyncException {
Pair<Integer, JSONObject> response;
HttpURLConnection urlConnection = null;
try {
urlConnection = (HttpURLConnection) url.openConnection();
} catch (IOException e) {
@@ -171,7 +172,7 @@ public class OCHttpClient {
urlConnection.setRequestMethod(method);
} catch (ProtocolException e) {
Log.e(OCHttpClient.TAG, "Fatal error when setting request method: " + e);
throw new OCSyncException(R.string.err_sync_http_request_ioexception, OCSyncErrorType.IO);
throw new OCSyncException(R.string.err_sync_http_request_protocol_exception, OCSyncErrorType.IO);
}
urlConnection.setRequestProperty("User-Agent", _userAgent);
urlConnection.setInstanceFollowRedirects(true);
@@ -180,8 +181,9 @@ public class OCHttpClient {
}
urlConnection.setRequestProperty("Content-Type", "application/json");
urlConnection.setRequestProperty("Accept", "application/json");
urlConnection.setRequestProperty("Transfer-Encoding", "chunked");
if (!"GET".equals(method)) {
urlConnection.setRequestProperty("Transfer-Encoding", "chunked");
}
String basicAuth = "Basic " +
Base64.encodeToString((_username + ":" + _password).getBytes(), Base64.NO_WRAP);
urlConnection.setRequestProperty("Authorization", basicAuth);