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

Commit 66845348 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '3117-a14-filter-cookie' into 'main' 

Make Notes not use cookies

See merge request !152
parents 91155a7e 9143f1ff

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ dependencies { 
    implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2

    implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2

    implementation 'com.google.code.gson:gson:2.10.1'

    implementation("foundation.e:Nextcloud-Android-Library:1.0.10-u2.17-release") {

    implementation("foundation.e:Nextcloud-Android-Library:2.0.0-u2.17-release") {

        exclude group: 'foundation.e.dav4jvm', module: 'dav4jvm'

        exclude group: 'com.gitlab.bitfireAT', module: 'dav4jvm'

        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version

app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ public class InputStreamBinder extends IInputStreamService.Stub { 


        final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

        final OwnCloudAccount ownCloudAccount = new OwnCloudAccount(account, context);

        final OwnCloudClient client = ownCloudClientManager.getClientFor(ownCloudAccount, context);

        final OwnCloudClient client = ownCloudClientManager.getClientFor(ownCloudAccount, context, OwnCloudClient.DONT_USE_COOKIES);



        HttpMethodBase method = buildMethod(request, client.getBaseUri(), requestBodyInputStream);
@@ -426,7 +426,7 @@ public class InputStreamBinder extends IInputStreamService.Stub { 


        final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

        final OwnCloudAccount ownCloudAccount = new OwnCloudAccount(account, context);

        final OwnCloudClient client = ownCloudClientManager.getClientFor(ownCloudAccount, context);

        final OwnCloudClient client = ownCloudClientManager.getClientFor(ownCloudAccount, context, OwnCloudClient.DONT_USE_COOKIES);



        HttpMethodBase method = buildMethod(request, client.getBaseUri(), requestBodyInputStream);