Merge pull request #1300 from nextcloud/backport-1187 (6b81e35a) · Commits · e / os / Nextcloud Android Library

.drone.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ services:
		- su www-data -c "php /var/www/html/occ app:enable activity"
		- su www-data -c "git clone -b main https://github.com/nextcloud/text.git /var/www/html/apps/text/"
		- su www-data -c "php /var/www/html/occ app:enable text"
		- su www-data -c "git clone -b master https://github.com/nextcloud/end_to_end_encryption/ /var/www/html/apps/end_to_end_encryption/"
		- su www-data -c "git clone -b artonge/feat/allow_metadata_update_for_subfolders https://github.com/nextcloud/end_to_end_encryption/ /var/www/html/apps/end_to_end_encryption/"
		- su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption"
		- su www-data -c "git clone -b master https://github.com/nextcloud/password_policy/ /var/www/html/apps/password_policy/"
		- su www-data -c "php /var/www/html/occ app:enable password_policy"
		@@ -213,6 +213,6 @@ trigger:
		- pull_request
		---
		kind: signature
		hmac: 6d69c7c3739747691580d04a781eb67cf95d2f33f8149d5ebd2cbcc30611b4f0
		hmac: 56749c47df149cc2d3c06343c609210a310e27635ea6ccb040890ab0afbce79d

		...

.idea/codeStyles/Project.xml

+1 −3

Original line number	Diff line number	Diff line
		@@ -6,8 +6,6 @@
		<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
		</value>
		</option>
		<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
		<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
		<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
		</JetCodeStyleSettings>
		<MarkdownNavigatorCodeStyleSettings>

library/build.gradle

+4 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,8 @@ configurations {
		dependencies {
		implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5'
		api 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
		implementation 'com.github.bitfireAT:dav4jvm:2.2.1' // in transition phase, we use old and new libs
		implementation 'com.github.bitfireAT:dav4jvm:2.2.1'
		// in transition phase, we use old and new libs
		implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
		implementation 'androidx.annotation:annotation:1.7.0'
		compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
		@@ -56,6 +57,8 @@ dependencies {
		implementation "androidx.core:core-ktx:1.10.1"
		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

		implementation 'org.bouncycastle:bcpkix-jdk18on:1.75'

		spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
		spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.2'

library/lint.xml

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?><!--
		~
		~ Nextcloud Android client application
		~
		~ @author Tobias Kaminsky
		~ Copyright (C) 2024 Tobias Kaminsky
		~ Copyright (C) 2024 Nextcloud GmbH
		~
		~ This program is free software: you can redistribute it and/or modify
		~ it under the terms of the GNU Affero General Public License as published by
		~ the Free Software Foundation, either version 3 of the License, or
		~ (at your option) any later version.
		~
		~ This program is distributed in the hope that it will be useful,
		~ but WITHOUT ANY WARRANTY; without even the implied warranty of
		~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		~ GNU Affero General Public License for more details.
		~
		~ You should have received a copy of the GNU Affero General Public License
		~ along with this program. If not, see <https://www.gnu.org/licenses/>.
		~
		-->

		<lint>
		<issue id="TrustAllX509TrustManager">
		<ignore path="*/bouncycastle/est/jcajce/.class" />
		<ignore path="**/bcpkix-jdk18on-1.75.jar" />
		</issue>
		</lint>

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesIT.java→library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -29,11 +29,13 @@ package com.owncloud.android;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertNotSame;
		import static org.junit.Assert.assertSame;
		import static org.junit.Assert.assertTrue;

		import com.owncloud.android.lib.common.operations.RemoteOperationResult;
		import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
		import com.owncloud.android.lib.resources.status.E2EVersion;
		import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
		import com.owncloud.android.lib.resources.status.NextcloudVersion;
		import com.owncloud.android.lib.resources.status.OCCapability;
		@@ -44,7 +46,7 @@ import org.junit.Test;
		/**
		* Class to test GetRemoteCapabilitiesOperation
		*/
		public class GetCapabilitiesIT extends AbstractIT {
		public class GetCapabilitiesRemoteOperationIT extends AbstractIT {
		/**
		* Test get capabilities
		*/
		@@ -150,12 +152,15 @@ public class GetCapabilitiesIT extends AbstractIT {
		// groupfolder
		if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_27)) {
		if (userId.equals("test")) {
		capability.getGroupfolders().isTrue();
		assertTrue(capability.getGroupfolders().isTrue());
		} else {
		capability.getGroupfolders().isFalse();
		assertTrue(capability.getGroupfolders().isFalse());
		}
		} else {
		capability.getGroupfolders().isFalse();
		assertTrue(capability.getGroupfolders().isFalse());
		}

		// e2e
		assertNotSame(capability.getEndToEndEncryptionApiVersion(), E2EVersion.UNKNOWN);
		}
		}