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

Handle Error#15 when ocsms is not install or owncloud is awaiting upgrade

Browse Source
This commit is contained in:
Loic Blot
2015-06-23 19:11:50 +02:00
parent 9ba7054d14
commit f59b3e9c5e
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java
+9 -2
View File
@@ -354,8 +354,15 @@ public class OCSMSOwnCloudClient {
respJSON = new JSONObject(response);
} catch (final JSONException e) {
if (skipError == false) {
Log.e(TAG, "Unable to parse server response", e);
throw new OCSyncException(R.string.err_sync_http_request_parse_resp, OCSyncErrorType.PARSE);
if (response.contains("ownCloud") && response.contains("DOCTYPE")) {
Log.e(TAG, "OcSMS app not enabled or ownCloud upgrade is required");
throw new OCSyncException(R.string.err_sync_ocsms_not_installed_or_oc_upgrade_required,
OCSyncErrorType.SERVER_ERROR);
}
else {
Log.e(TAG, "Unable to parse server response", e);
throw new OCSyncException(R.string.err_sync_http_request_parse_resp, OCSyncErrorType.PARSE);
}
}
return null;
}
src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
-1
View File
@@ -65,7 +65,6 @@ public class SmsSyncAdapter extends AbstractThreadedSyncAdapter {
// and push datas
_client.doPushRequest(null);
nMgr.dropSyncErrorMsg();
} catch (final OCSyncException e) {
nMgr.setSyncErrorMsg(getContext().getString(e.getErrorId()));