Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fb1f299 authored by Amit Kumar's avatar Amit Kumar Committed by Sumit Pundir
Browse files

Show and sync all calendars associated with an account

parent 6ef03117

app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt

+2 −1
Original line number Diff line number Diff line
@@ -151,6 +151,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)
@@ -186,7 +187,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

app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ class GoogleAuthenticatorFragment : Fragment(), AuthorizationService.TokenRespon 
        fun validateUrl() {

            model.baseUrlError.value = null

            try {

                val uri = URI("https://apidata.googleusercontent.com/caldav/v2/$emailAddress/events")

                val uri = URI("https://apidata.googleusercontent.com/caldav/v2/$emailAddress/user")

                if (uri.scheme.equals("http", true) || uri.scheme.equals("https", true)) {

                    valid = true

                    loginModel.baseURI = uri