flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-08 16:36:10 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Loic Blot 2018-02-12 22:57:43 +01:00
parent 95d2bfe8f9
commit f2348d0a46
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -21,8 +21,8 @@ android {
defaultConfig { defaultConfig {
applicationId "fr.unix_experience.owncloud_sms" applicationId "fr.unix_experience.owncloud_sms"
versionCode 65 versionCode 66
versionName "2.0.1" versionName "2.0.2"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 27 targetSdkVersion 27
maxSdkVersion 27 maxSdkVersion 27
@ -32,11 +32,6 @@ android {
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a',
'arm64-v8a', 'mips', 'mips64' 'arm64-v8a', 'mips', 'mips64'
} }
externalNativeBuild {
cmake {
cppFlags "-frtti -fexceptions -std=c++11"
}
}
} }
buildTypes { buildTypes {

BIN
ncsmsgo/ncsmsgo.aar
View File

Binary file not shown.

10
src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
View File

@ -261,6 +261,7 @@ public class LoginActivity extends AppCompatActivity {
Log.i(TAG, "_serverURL = " + serverURL); Log.i(TAG, "_serverURL = " + serverURL);
_login = login; _login = login;
_password = password; _password = password;
_last_http_error = null;
} }
@Override @Override
@ -278,6 +279,7 @@ public class LoginActivity extends AppCompatActivity {
_returnCode = 599; _returnCode = 599;
} }
_last_http_error = http.getLastError();
return (_returnCode == 200); return (_returnCode == 200);
} }
@ -325,7 +327,12 @@ public class LoginActivity extends AppCompatActivity {
boolean serverViewRequestFocus = true; boolean serverViewRequestFocus = true;
switch (_returnCode) { switch (_returnCode) {
case 0: case 0:
_serverView.setError("UNK"); if (!_last_http_error.isEmpty()) {
_serverView.setError("Low level error: " + _last_http_error);
}
else {
_serverView.setError("Unknown error");
}
break; break;
case 404: case 404:
_serverView.setError(getString(R.string.error_connection_failed_not_found)); _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 URL _serverURL;
private final String _login; private final String _login;
private final String _password; private final String _password;
private String _last_http_error;
private int _returnCode; private int _returnCode;
static final String PARAM_AUTHTOKEN_TYPE = "auth.token"; static final String PARAM_AUTHTOKEN_TYPE = "auth.token";

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

@ -52,6 +52,10 @@ public class OCHttpClient {
} }
} }
public String getLastError() {
return _smsHttpClient.getLastError();
}
Pair<Integer, SmsIDListResponse> getAllSmsIds() throws OCSyncException { Pair<Integer, SmsIDListResponse> getAllSmsIds() throws OCSyncException {
SmsIDListResponse silr = _smsHttpClient.doGetSmsIDList(); SmsIDListResponse silr = _smsHttpClient.doGetSmsIDList();
int httpStatus = (int) _smsHttpClient.getLastHTTPStatus(); int httpStatus = (int) _smsHttpClient.getLastHTTPStatus();