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

Commit b465f2cd authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

add support for separate URI for cardDav

parent 99ef9e82

app/src/main/java/at/bitfire/davdroid/servicedetection/DavResourceFinder.kt

+4 −1
Original line number Diff line number Diff line
@@ -106,7 +106,10 @@ class DavResourceFinder( 


    private fun findInitialConfiguration(service: Service): Configuration.ServiceInfo? {

        // user-given base URI (either mailto: URI or http(s):// URL)

        val baseURI = loginModel.baseURI!!

        var baseURI = loginModel.baseURI!!

        if (loginModel.cardDavURI != null && service == Service.CARDDAV) {

            baseURI = loginModel.cardDavURI!!

        }



        // domain for service discovery

        var discoveryFQDN: String? = null

app/src/main/java/at/bitfire/davdroid/ui/setup/LoginModel.kt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import java.net.URI 
class LoginModel: ViewModel() {



    var baseURI: URI? = null

    var cardDavURI: URI? = null

    var credentials: Credentials? = null



    var configuration: DavResourceFinder.Configuration? = null

app/src/main/java/at/bitfire/davdroid/ui/setup/OpenIdAuthenticationBaseFragment.kt

+5 −1
Original line number Diff line number Diff line
@@ -188,9 +188,13 @@ abstract class OpenIdAuthenticationBaseFragment(private val identityProvider: Id 
        finishActivity()

    }



    protected fun proceedNext(userName: String, baseUrl: String) {

    protected fun proceedNext(userName: String, baseUrl: String, cardDavUrl: String? = null) {

        activity?.intent?.putExtra(LoginActivity.OPENID_AUTH_FLOW_COMPLETE, true)



        if (cardDavUrl != null) {

            loginModel.cardDavURI = URI(cardDavUrl)

        }



        val baseUri = URI(baseUrl)

        loginModel.baseURI = baseUri

        loginModel.credentials = Credentials(