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

Unverified Commit 0a0fc5f9 authored by Andy Scherzinger's avatar Andy Scherzinger
Browse files

remove ktlint warnings 



Signed-off-by: default avatarAndy Scherzinger <info@andy-scherzinger.de>
parent 457182f0

src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt

+21 −15
Original line number Diff line number Diff line
@@ -42,10 +42,12 @@ class UpdateShareRemoteOperationIT : AbstractIT() { 


    @Test

    fun longNote() {

        testUpdateNote("123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123" +

        testUpdateNote(

            "123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123" +

                "123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123" +

                "123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123")

                "123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123" +

                "123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123"

        )

    }



    @Test
@@ -57,13 +59,15 @@ class UpdateShareRemoteOperationIT : AbstractIT() { 
        Assert.assertTrue(CreateFolderRemoteOperation("/note/", true).execute(client).isSuccess)



        // share folder to user "admin"

        val createOperationResult = CreateShareRemoteOperation("/note/",

        val createOperationResult = CreateShareRemoteOperation(

            "/note/",

            ShareType.USER,

            "admin",

            false,

            "",

            OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER,

                true).execute(client)

            true

        ).execute(client)



        assertTrue(createOperationResult.isSuccess)
@@ -91,12 +95,14 @@ class UpdateShareRemoteOperationIT : AbstractIT() { 
        Assert.assertTrue(CreateFolderRemoteOperation("/label/", true).execute(client).isSuccess)



        // share folder via public link

        val createOperationResult = CreateShareRemoteOperation("/label/",

        val createOperationResult = CreateShareRemoteOperation(

            "/label/",

            ShareType.PUBLIC_LINK,

            "",

            true,

            "",

                OCShare.READ_PERMISSION_FLAG).execute(client)

            OCShare.READ_PERMISSION_FLAG

        ).execute(client)



        assertTrue(createOperationResult.isSuccess)

src/main/java/com/nextcloud/common/NextcloudClient.kt

+13 −13
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ class NextcloudClient(var baseUri: Uri, var userId: String, val credentials: Str 
        val TAG = NextcloudClient::class.java.simpleName



        private fun createDefaultClient(context: Context): OkHttpClient {

            

            val trustManager = AdvancedX509TrustManager(NetworkUtils.getKnownServersStore(context))

            val sslContext = SSLContext.getInstance("TLSv1")

            sslContext.init(null, arrayOf<TrustManager>(trustManager), null)
@@ -107,7 +106,8 @@ class NextcloudClient(var baseUri: Uri, var userId: String, val credentials: Str 
        while (

            redirectionsCount < OwnCloudClient.MAX_REDIRECTIONS_COUNT &&

            (

                        status == HttpStatus.SC_MOVED_PERMANENTLY || status == HttpStatus.SC_MOVED_TEMPORARILY ||

                status == HttpStatus.SC_MOVED_PERMANENTLY ||

                    status == HttpStatus.SC_MOVED_TEMPORARILY ||

                    status == HttpStatus.SC_TEMPORARY_REDIRECT

                )

        ) {

src/androidTest/java/com/nextcloud/lib/resources/users/GetUserInfoRemoteOperationTest.kt

+2 −2

File changed.

Contains only whitespace changes.