flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-24 08:16:23 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-en/strings.xml
View File

@ -157,5 +157,6 @@ Contributors and issue\'s reporters</string>
<string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string> <string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
<string name="err_sync_no_connection_available">Error #16: No data connection available</string> <string name="err_sync_no_connection_available">Error #16: No data connection available</string>
<string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string> <string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
<string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: OcSMS app is not installed or ownCloud awaiting for an upgrade</string>
</resources> </resources>

1
res/values-fr/strings.xml
View File

@ -117,4 +117,5 @@ Les contributeurs et rapporteurs de bugs</string>
<string name="err_sync_no_connection_available">Erreur #16: Aucune connexion data disponible</string> <string name="err_sync_no_connection_available">Erreur #16: Aucune connexion data disponible</string>
<string name="err_sync_account_unparsable">Error #17: Compte mal configuré. Merci de bien vouloir le reconfigurer.</string> <string name="err_sync_account_unparsable">Error #17: Compte mal configuré. Merci de bien vouloir le reconfigurer.</string>
<string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: L\'application OcSMS n\'est pas installée ou ownCloud attend d\'être mis à niveau.</string>
</resources> </resources>

2
res/values/strings.xml
View File

@ -167,6 +167,8 @@ Contributors and issue\'s reporters</string>
<string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string> <string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
<string name="err_sync_no_connection_available">Error #16: No data connection available</string> <string name="err_sync_no_connection_available">Error #16: No data connection available</string>
<string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string> <string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
<string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: OcSMS app is not installed or ownCloud awaiting for an upgrade</string>
<string name="title_activity_main">MainActivity</string> <string name="title_activity_main">MainActivity</string>
<string name="title_section1">Section 1</string> <string name="title_section1">Section 1</string>
<string name="title_section2">Section 2</string> <string name="title_section2">Section 2</string>

7
src/fr/unix_experience/owncloud_sms/engine/OCSMSOwnCloudClient.java
View File

@ -354,9 +354,16 @@ public class OCSMSOwnCloudClient {
respJSON = new JSONObject(response); respJSON = new JSONObject(response);
} catch (final JSONException e) { } catch (final JSONException e) {
if (skipError == false) { if (skipError == false) {
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); Log.e(TAG, "Unable to parse server response", e);
throw new OCSyncException(R.string.err_sync_http_request_parse_resp, OCSyncErrorType.PARSE); throw new OCSyncException(R.string.err_sync_http_request_parse_resp, OCSyncErrorType.PARSE);
} }
}
return null; return null;
} }

1
src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
View File

@ -65,7 +65,6 @@ public class SmsSyncAdapter extends AbstractThreadedSyncAdapter {
// and push datas // and push datas
_client.doPushRequest(null); _client.doPushRequest(null);
nMgr.dropSyncErrorMsg(); nMgr.dropSyncErrorMsg();
} catch (final OCSyncException e) { } catch (final OCSyncException e) {
nMgr.setSyncErrorMsg(getContext().getString(e.getErrorId())); nMgr.setSyncErrorMsg(getContext().getString(e.getErrorId()));