flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-26 09:16:15 +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
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/fr/unix_experience/owncloud_sms/engine/OCHttpClient.java
View File

@ -151,6 +151,7 @@ public class OCHttpClient {
public Pair<Integer, JSONObject> execute(String method, URL url, String requestBody, boolean skipError) throws OCSyncException { public Pair<Integer, JSONObject> execute(String method, URL url, String requestBody, boolean skipError) throws OCSyncException {
Pair<Integer, JSONObject> response; Pair<Integer, JSONObject> response;
HttpURLConnection urlConnection = null; HttpURLConnection urlConnection = null;
try { try {
urlConnection = (HttpURLConnection) url.openConnection(); urlConnection = (HttpURLConnection) url.openConnection();
} catch (IOException e) { } catch (IOException e) {
@ -171,7 +172,7 @@ public class OCHttpClient {
urlConnection.setRequestMethod(method); urlConnection.setRequestMethod(method);
} catch (ProtocolException e) { } catch (ProtocolException e) {
Log.e(OCHttpClient.TAG, "Fatal error when setting request method: " + 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.setRequestProperty("User-Agent", _userAgent);
urlConnection.setInstanceFollowRedirects(true); urlConnection.setInstanceFollowRedirects(true);
@ -180,8 +181,9 @@ public class OCHttpClient {
} }
urlConnection.setRequestProperty("Content-Type", "application/json"); urlConnection.setRequestProperty("Content-Type", "application/json");
urlConnection.setRequestProperty("Accept", "application/json"); urlConnection.setRequestProperty("Accept", "application/json");
if (!"GET".equals(method)) {
urlConnection.setRequestProperty("Transfer-Encoding", "chunked"); urlConnection.setRequestProperty("Transfer-Encoding", "chunked");
}
String basicAuth = "Basic " + String basicAuth = "Basic " +
Base64.encodeToString((_username + ":" + _password).getBytes(), Base64.NO_WRAP); Base64.encodeToString((_username + ":" + _password).getBytes(), Base64.NO_WRAP);
urlConnection.setRequestProperty("Authorization", basicAuth); urlConnection.setRequestProperty("Authorization", basicAuth);

1
src/main/res/values/strings.xml
View File

@ -273,4 +273,5 @@
<string name="pref_show_sync_notifications">Show sync notifications</string> <string name="pref_show_sync_notifications">Show sync notifications</string>
<string name="sync_complete">Synchronization complete</string> <string name="sync_complete">Synchronization complete</string>
<string name="err_sync_http_write_failed">Error #19: Failed to write HTTP stream when pushing data to server.</string> <string name="err_sync_http_write_failed">Error #19: Failed to write HTTP stream when pushing data to server.</string>
<string name="err_sync_http_request_protocol_exception">Error #20: Failed to properly set HTTP protocol version.</string>
</resources> </resources>