arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-23 22:21:23 +00:00
Code Issues Releases Wiki Activity

Handle readonly journal exceptions.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-11 16:12:53 +00:00
parent dcd0393a31
commit 92908b9a60
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/etesync/syncadapter/NotificationHelper.kt
View File

@ -44,6 +44,9 @@ class NotificationHelper(internal val context: Context, internal val notificatio
} else if (e is Exceptions.ServiceUnavailableException) { } else if (e is Exceptions.ServiceUnavailableException) {
App.log.log(Level.SEVERE, "Service unavailable") App.log.log(Level.SEVERE, "Service unavailable")
messageString = R.string.sync_error_unavailable messageString = R.string.sync_error_unavailable
} else if (e is Exceptions.ReadOnlyException) {
App.log.log(Level.SEVERE, "Journal is read only", e)
messageString = R.string.sync_error_journal_readonly
} else if (e is Exceptions.HttpException) { } else if (e is Exceptions.HttpException) {
App.log.log(Level.SEVERE, "HTTP Exception during sync", e) App.log.log(Level.SEVERE, "HTTP Exception during sync", e)
messageString = R.string.sync_error_http_dav messageString = R.string.sync_error_http_dav

5
app/src/main/java/com/etesync/syncadapter/journalmanager/BaseManager.kt
View File

@ -34,8 +34,9 @@ abstract class BaseManager {
throw Exceptions.UserInactiveException(response, apiError.detail) throw Exceptions.UserInactiveException(response, apiError.detail)
} else if (apiError.code == "associate_not_allowed") { } else if (apiError.code == "associate_not_allowed") {
throw Exceptions.AssociateNotAllowedException(response, apiError.detail) throw Exceptions.AssociateNotAllowedException(response, apiError.detail)
} } else if (apiError.code == "journal_owner_inactive") {
} throw Exceptions.ReadOnlyException(response, apiError.detail)
} }
}// Fall through. We want to always throw when unsuccessful. }// Fall through. We want to always throw when unsuccessful.
throw Exceptions.HttpException(response, apiError.detail) throw Exceptions.HttpException(response, apiError.detail)

2
app/src/main/java/com/etesync/syncadapter/journalmanager/Exceptions.kt
View File

@ -10,6 +10,8 @@ import java.security.GeneralSecurityException
class Exceptions { class Exceptions {
class AssociateNotAllowedException(response: Response, message: String?) : HttpException(response, message) class AssociateNotAllowedException(response: Response, message: String?) : HttpException(response, message)
class ReadOnlyException(response: Response, message: String?) : HttpException(response, message)
class UnauthorizedException(response: Response, message: String?) : HttpException(response, message) class UnauthorizedException(response: Response, message: String?) : HttpException(response, message)
class UserInactiveException(response: Response, message: String?) : HttpException(response, message) class UserInactiveException(response: Response, message: String?) : HttpException(response, message)

1
app/src/main/res/values/strings.xml
View File

@ -315,6 +315,7 @@
<string name="sync_error_http_dav">Server error while %s</string> <string name="sync_error_http_dav">Server error while %s</string>
<string name="sync_error_unavailable">Could not connect to server while %s</string> <string name="sync_error_unavailable">Could not connect to server while %s</string>
<string name="sync_error_local_storage">Database error while %s</string> <string name="sync_error_local_storage">Database error while %s</string>
<string name="sync_error_journal_readonly">Journal is read only</string>
<string name="sync_phase_prepare">preparing synchronization</string> <string name="sync_phase_prepare">preparing synchronization</string>
<string name="sync_phase_journals">syncronizing journals</string> <string name="sync_phase_journals">syncronizing journals</string>
<string name="sync_phase_query_capabilities">querying capabilities</string> <string name="sync_phase_query_capabilities">querying capabilities</string>