1
0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2026-08-20 21:03:08 +00:00

Version 2.0.2: fetch last http error issue properly from low level go client

This commit is contained in:
Loic Blot
2018-02-12 22:57:43 +01:00
parent 95d2bfe8f9
commit f2348d0a46
5 changed files with 16 additions and 9 deletions
@@ -261,6 +261,7 @@ public class LoginActivity extends AppCompatActivity {
Log.i(TAG, "_serverURL = " + serverURL);
_login = login;
_password = password;
_last_http_error = null;
}
@Override
@@ -278,6 +279,7 @@ public class LoginActivity extends AppCompatActivity {
_returnCode = 599;
}
_last_http_error = http.getLastError();
return (_returnCode == 200);
}
@@ -325,7 +327,12 @@ public class LoginActivity extends AppCompatActivity {
boolean serverViewRequestFocus = true;
switch (_returnCode) {
case 0:
_serverView.setError("UNK");
if (!_last_http_error.isEmpty()) {
_serverView.setError("Low level error: " + _last_http_error);
}
else {
_serverView.setError("Unknown error");
}
break;
case 404:
_serverView.setError(getString(R.string.error_connection_failed_not_found));
@@ -371,6 +378,7 @@ public class LoginActivity extends AppCompatActivity {
private final URL _serverURL;
private final String _login;
private final String _password;
private String _last_http_error;
private int _returnCode;
static final String PARAM_AUTHTOKEN_TYPE = "auth.token";
@@ -52,6 +52,10 @@ public class OCHttpClient {
}
}
public String getLastError() {
return _smsHttpClient.getLastError();
}
Pair<Integer, SmsIDListResponse> getAllSmsIds() throws OCSyncException {
SmsIDListResponse silr = _smsHttpClient.doGetSmsIDList();
int httpStatus = (int) _smsHttpClient.getLastHTTPStatus();