Skip to content

Commit 5be040c

Browse files
Merge pull request nextcloud#11922 from nextcloud/E2Esharing_rebased
E2e sharing
2 parents 2382361 + 218fbd7 commit 5be040c

File tree

71 files changed

+6367
-1614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+6367
-1614
lines changed

.idea/inspectionProfiles/ktlint.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ dependencies {
266266
implementation 'org.greenrobot:eventbus:3.3.1'
267267
implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.0'
268268
implementation 'org.lukhnos:nnio:0.2'
269-
implementation 'org.bouncycastle:bcpkix-jdk15to18:1.72'
269+
implementation 'org.bouncycastle:bcpkix-jdk18on:1.75'
270270
implementation 'com.google.code.gson:gson:2.10.1'
271271
implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1'
272272
implementation 'com.github.chrisbanes:PhotoView:2.3.0'

app/lint.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<issue id="TrustAllX509TrustManager">
4949
<ignore path="**/bouncycastle/est/jcajce/*.class" />
5050
<ignore path="**/bcpkix-jdk15to18-1.72.jar" />
51+
<ignore path="**/bcpkix-jdk18on-1.75.jar" />
5152
</issue>
5253

5354
<issue id="RestrictedApi" severity="error">

app/schemas/com.nextcloud.client.database.NextcloudDatabase/77.json

Lines changed: 1191 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
*
3+
* Nextcloud Android client application
4+
*
5+
* @author Tobias Kaminsky
6+
* Copyright (C) 2023 Tobias Kaminsky
7+
* Copyright (C) 2023 Nextcloud GmbH
8+
*
9+
* This program is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU Affero General Public License as published by
11+
* the Free Software Foundation, either version 3 of the License, or
12+
* (at your option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License
20+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
21+
*/
22+
23+
package com.nextcloud.client;
24+
25+
public enum EndToEndAction {
26+
CREATE_FOLDER,
27+
GO_INTO_FOLDER,
28+
GO_UP,
29+
UPLOAD_FILE,
30+
DOWNLOAD_FILE,
31+
DELETE_FILE,
32+
}

0 commit comments

Comments
 (0)