flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-27 17:56:09 +00:00
Code Issues Releases Wiki Activity

Properly handle InvalidArgumentException when URI is not valid in HTTP connector

Browse Source 
This fixes issue #149
This commit is contained in:
Loïc Blot 2017-05-03 15:46:30 +02:00
parent bc9f36d80b
commit c682d7fd0d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,15 +260,20 @@ public class LoginActivity extends AppCompatActivity {
protected Boolean doInBackground(Void... params) { protected Boolean doInBackground(Void... params) {
_returnCode = 0; _returnCode = 0;
OCHttpClient http = new OCHttpClient(getBaseContext(), _serverURI, _login, _password); OCHttpClient http = new OCHttpClient(getBaseContext(), _serverURI, _login, _password);
GetMethod testMethod = http.getVersion(); GetMethod testMethod = null;
try { try {
testMethod = http.getVersion();
_returnCode = http.execute(testMethod); _returnCode = http.execute(testMethod);
} catch (IllegalArgumentException e) {
Log.w(TAG, "Failed to getVersion, IllegalArgumentException occured: " + e.getMessage());
_returnCode = 597;
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to login, IOException occured: " + e.getMessage()); Log.w(TAG, "Failed to login, IOException occured: " + e.getMessage());
_returnCode = 599; _returnCode = 599;
} }
testMethod.releaseConnection(); if (testMethod != null)
testMethod.releaseConnection();
return (_returnCode == 200); return (_returnCode == 200);
} }
@ -322,6 +327,9 @@ public class LoginActivity extends AppCompatActivity {
case 404: case 404:
_serverView.setError(getString(R.string.error_connection_failed_not_found)); _serverView.setError(getString(R.string.error_connection_failed_not_found));
break; break;
case 597:
_serverView.setError(getString(R.string.error_invalid_server_address));
break;
case 400: case 400:
case 598: case 598:
_serverView.setError(getString(R.string.error_connection_failed)); _serverView.setError(getString(R.string.error_connection_failed));