From 19cb1ad37dabbbb4ee111eadb255b412e44d65b7 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 24 Sep 2019 15:48:56 +0530 Subject: [PATCH 1/2] Fix #20 : Show and sync all calendars associated with an account --- .../accountmanager/ui/setup/GoogleAuthenticatorFragment.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt index ee04b8ea9..9dc4028e7 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt @@ -348,10 +348,10 @@ class GoogleAuthenticatorFragment : Fragment(), AuthorizationService.TokenRespon } private fun validateLoginData(emailAddress: String, authState: AuthState): LoginInfo? { - val baseUrl = Uri.parse("https://apidata.googleusercontent.com/caldav/v2/$emailAddress/events") - val uri = validateBaseUrl(baseUrl, false, { message -> + val baseUrl = Uri.parse("https://apidata.googleusercontent.com/caldav/v2/$emailAddress/user") + val uri = validateBaseUrl(baseUrl, false) { message -> view!!.urlpwd_base_url.error = message - }) + } return if (uri != null) LoginInfo(uri, emailAddress, null, authState, null) -- GitLab From cefb06de44e682682da9aa88d011a33ec6181ce9 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Wed, 25 Sep 2019 13:23:31 +0530 Subject: [PATCH 2/2] Change depth header to 1 from 0 --- .../foundation/e/accountmanager/ui/setup/DavResourceFinder.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt index 3f087fdc1..d165bdf0c 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt @@ -169,6 +169,7 @@ class DavResourceFinder( try { val uri = URI(href) if (uri.scheme.equals("mailto", true)) + log.info("myenail: ${uri.schemeSpecificPart}") config.email = uri.schemeSpecificPart } catch(e: URISyntaxException) { log.log(Level.WARNING, "Couldn't parse user address", e) @@ -205,7 +206,7 @@ class DavResourceFinder( } } Service.CALDAV -> { - davBase.propfind(0, + davBase.propfind(1, ResourceType.NAME, DisplayName.NAME, CalendarColor.NAME, CalendarDescription.NAME, CalendarTimezone.NAME, CurrentUserPrivilegeSet.NAME, SupportedCalendarComponentSet.NAME, CalendarHomeSet.NAME, CurrentUserPrincipal.NAME -- GitLab