diff --git a/res/values-en/strings.xml b/res/values-en/strings.xml index 450bc71..004e077 100644 --- a/res/values-en/strings.xml +++ b/res/values-en/strings.xml @@ -157,5 +157,6 @@ Contributors and issue\'s reporters Error #15: Unable to parse server response Error #16: No data connection available Error #17: malformed account. Please reconfigure it + Error #18: OcSMS app is not installed or ownCloud awaiting for an upgrade diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index d779817..461d2e9 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -117,4 +117,5 @@ Les contributeurs et rapporteurs de bugs Erreur #16: Aucune connexion data disponible Error #17: Compte mal configuré. Merci de bien vouloir le reconfigurer. + Error #18: L\'application OcSMS n\'est pas installée ou ownCloud attend d\'être mis à niveau. diff --git a/res/values/strings.xml b/res/values/strings.xml index 41f2fb3..8e0a45d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -167,6 +167,8 @@ Contributors and issue\'s reporters Error #15: Unable to parse server response Error #16: No data connection available Error #17: malformed account. Please reconfigure it + Error #18: OcSMS app is not installed or ownCloud awaiting for an upgrade + MainActivity Section 1 Section 2 diff --git a/src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java b/src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java index b6ac860..ead905b 100644 --- a/src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java +++ b/src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java @@ -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; } diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java index fb85aa7..8ce55f4 100644 --- a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java +++ b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java @@ -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()));