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

Commit 6bdb6bfc authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Fixed some issues where the access token wasn't being passed to the Google API.

parent 7987e95a
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ import java.util.logging.Logger
class DavAddressBook @JvmOverloads constructor(
        httpClient: OkHttpClient,
        location: HttpUrl,
        accessToken: String?,
        log: Logger = Constants.log
): DavCollection(httpClient, location, log) {
): DavCollection(httpClient, location, accessToken, log) {

    companion object {
        val MIME_VCARD3_UTF8 = MediaType.parse("text/vcard;charset=utf-8")
+2 −1
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ import java.util.logging.Logger
class DavCalendar @JvmOverloads constructor(
        httpClient: OkHttpClient,
        location: HttpUrl,
        accessToken: String?,
        log: Logger = Constants.log
): DavCollection(httpClient, location, log) {
): DavCollection(httpClient, location, accessToken, log) {

    companion object {
        val MIME_ICALENDAR = MediaType.parse("text/calendar")
+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import java.util.logging.Logger
open class DavCollection @JvmOverloads constructor(
        httpClient: OkHttpClient,
        location: HttpUrl,
        accessToken: String?,
        log: Logger = Constants.log
// TODO Is it okay if accessToken is null below?
) : DavResource(httpClient, location, null, log) {
) : DavResource(httpClient, location, accessToken, log) {

    /**
     * Sends a REPORT sync-collection request. If a sync-token is returned, it will be made