Commit 949a1916 authored by Ricki Hirner's avatar Ricki Hirner

Fix/improve error handling; bump version to 1.12-beta4

parent efa4b7dc
......@@ -12,7 +12,7 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'org.jetbrains.dokka-android'
ext {
baseVersionName = "1.12-beta3"
baseVersionName = '1.12-beta4'
}
android {
......@@ -22,7 +22,7 @@ android {
defaultConfig {
applicationId "at.bitfire.davdroid"
versionCode 238
versionCode 239
buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
buildConfigField "boolean", "customCerts", "true"
......
......@@ -648,6 +648,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
} else {
contentIntent = Intent(context, DebugInfoActivity::class.java)
contentIntent.putExtra(DebugInfoActivity.KEY_THROWABLE, e)
contentIntent.putExtra(DebugInfoActivity.KEY_ACCOUNT, account)
contentIntent.putExtra(DebugInfoActivity.KEY_AUTHORITY, authority)
......@@ -804,7 +805,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
var local: ResourceType? = null
var remote: HttpUrl? = null
while (ex is ContextedException) {
if (ex is ContextedException) {
@Suppress("UNCHECKED_CAST")
// we want the innermost context value, which is the first one
(ex.getFirstContextValue(Constants.EXCEPTION_CONTEXT_LOCAL_RESOURCE) as? ResourceType)?.let {
......
Subproject commit 631048e0856cdfdb14264bea370447205353990f
Subproject commit cc71df5e853bcd1bfe0894eb046394b600c14307
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment