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

Unverified Commit 0800cec4 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #1485 from nextcloud/nextcloudUri 

base url shall never be null
parents 2a68af4a 76a860b0

library/src/main/java/com/nextcloud/common/NextcloudUriDelegate.kt

+1 −10
Original line number Diff line number Diff line
@@ -18,21 +18,12 @@ import com.owncloud.android.lib.common.network.WebdavUtils 
 * When finally getting rid of [com.owncloud.android.lib.common.OwnCloudClient],

 * this should be separate from the client.

 */

class NextcloudUriDelegate(baseUri: Uri, var userId: String?) : NextcloudUriProvider {

class NextcloudUriDelegate(override var baseUri: Uri, var userId: String?) : NextcloudUriProvider {

    constructor(baseUri: Uri) : this(baseUri, null)



    val userIdEncoded: String?

        get() = userId?.let { UserIdEncoder.encode(it) }



    /**

     * Root URI of the Nextcloud server

     */

    override var baseUri: Uri? = baseUri

        set(uri) {

            requireNotNull(uri) { "URI cannot be NULL" }

            field = uri

        }



    override val filesDavUri: Uri

        get() = Uri.parse("$davUri/files/$userIdEncoded")

    override val uploadUri: Uri

library/src/main/java/com/nextcloud/common/NextcloudUriProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ interface NextcloudUriProvider { 
    /**

     * Root URI of the Nextcloud server

     */

    var baseUri: Uri?

    var baseUri: Uri

    val filesDavUri: Uri

    val uploadUri: Uri

    val davUri: Uri