[pull] master from nextcloud:master

.codecov.yml

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 codecov:
   branch: master
   ci:

.devcontainer/Dockerfile

@@ -1,16 +1,20 @@
-FROM ubuntu:focal
+FROM ubuntu:noble@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk
 
 RUN apt-get update -y
-RUN apt-get install -y unzip wget openjdk-11-jdk vim
+RUN apt-get install -y unzip wget openjdk-17-jdk vim
 
 RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O /tmp/commandlinetools.zip
 RUN cd /tmp && unzip commandlinetools.zip
 RUN mkdir -p /usr/lib/android-sdk/cmdline-tools/
 RUN cd /tmp/ && mv cmdline-tools/ latest/ && mv latest/ /usr/lib/android-sdk/cmdline-tools/
 RUN mkdir /usr/lib/android-sdk/licenses/
 RUN chmod -R 755 /usr/lib/android-sdk/
-RUN mkdir -p $HOME/.gradle
-RUN echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
+RUN mkdir -p "$HOME/.gradle" && \
+    echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.caching=true" >> "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.parallel=true" >> "$HOME/.gradle/gradle.properties" && \
+    echo "org.gradle.configureondemand=true" >> "$HOME/.gradle/gradle.properties" && \
+    echo "kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"

.devcontainer/Dockerfile.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.devcontainer/README.md

@@ -1,3 +1,7 @@
+<!--
+ ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+-->
 # Instructions
 
 1. Start a DevContainer either on GitHub Codespaces or locally in VSCode.

.devcontainer/devcontainer.env.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.devcontainer/devcontainer.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.drone.yml

@@ -3,9 +3,13 @@ kind: pipeline
 type: docker
 name: tests-stable
 
+# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+
+
 steps:
   - name: gplay
-    image: ghcr.io/nextcloud/continuous-integration-android8:3
+    image: ghcr.io/nextcloud/continuous-integration-android8:4
     privileged: true
     environment:
       LOG_USERNAME:
@@ -32,23 +36,28 @@ services:
     image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest # also change in updateScreenshots.sh
     environment:
       EVAL: true
-      SERVER_VERSION: 'stable25'
+      SERVER_VERSION: 'stable30'
     commands:
       - BRANCH="$SERVER_VERSION" /usr/local/bin/initnc.sh
       - echo 127.0.0.1 server >> /etc/hosts
+      - apt-get update && apt-get install -y composer
       - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"
       - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2"
       - su www-data -c "OC_PASS=user3 php /var/www/html/occ user:add --password-from-env --display-name='User Three' user3"
       - su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G"
       - su www-data -c "php /var/www/html/occ group:add users"
       - su www-data -c "php /var/www/html/occ group:adduser users user1"
       - su www-data -c "php /var/www/html/occ group:adduser users user2"
-      - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
+      - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
       - su www-data -c "php /var/www/html/occ app:enable activity"
-      - su www-data -c "git clone -b $SERVER_VERSION https://github.com/nextcloud/text.git /var/www/html/apps/text/"
+      - su www-data -c "git clone --depth 1 -b $SERVER_VERSION 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 $SERVER_VERSION https://github.com/nextcloud/end_to_end_encryption.git /var/www/html/apps/end_to_end_encryption/"
+      - su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/end_to_end_encryption.git /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 --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"
+      - su www-data -c "cd /var/www/html/apps/photos; composer install --no-dev"
+      - su www-data -c "php /var/www/html/occ app:enable -f photos"
+      - su www-data -c "php /var/www/html/occ config:system:set ratelimit.protection.enabled --value false --type bool"
       - /usr/local/bin/run.sh
 
 trigger:
@@ -65,7 +74,7 @@ name: tests-master
 
 steps:
   - name: gplay
-    image: ghcr.io/nextcloud/continuous-integration-android8:3
+    image: ghcr.io/nextcloud/continuous-integration-android8:4
     privileged: true
     environment:
       LOG_USERNAME:
@@ -90,19 +99,24 @@ services:
     commands:
       - /usr/local/bin/initnc.sh
       - echo 127.0.0.1 server >> /etc/hosts
+      - apt-get update && apt-get install -y composer
       - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1"
       - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2"
       - su www-data -c "OC_PASS=user3 php /var/www/html/occ user:add --password-from-env --display-name='User Three' user3"
       - su www-data -c "php /var/www/html/occ user:setting user2 files quota 1G"
       - su www-data -c "php /var/www/html/occ group:add users"
       - su www-data -c "php /var/www/html/occ group:adduser users user1"
       - su www-data -c "php /var/www/html/occ group:adduser users user2"
-      - su www-data -c "git clone -b master https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
+      - su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/activity.git /var/www/html/apps/activity/"
       - 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 "git clone --depth 1 -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 --depth 1 -b master 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 --depth 1 https://github.com/nextcloud/photos.git /var/www/html/apps/photos/"
+      - su www-data -c "cd /var/www/html/apps/photos; composer install --no-dev"
+      - su www-data -c "php /var/www/html/occ app:enable -f photos"
+      - su www-data -c "php /var/www/html/occ config:system:set ratelimit.protection.enabled --value false --type bool"
       - /usr/local/bin/run.sh
 
 trigger:
@@ -120,7 +134,7 @@ name: allScreenshots
 
 steps:
   - name: runAllScreenshots
-    image: ghcr.io/nextcloud/continuous-integration-android8:3
+    image: ghcr.io/nextcloud/continuous-integration-android8:4
     privileged: true
     environment:
       GIT_USERNAME:
@@ -171,4 +185,6 @@ name: GIT_TOKEN
 data: XIoa9IYq+xQ+N5iln8dlpWv0jV6ROr7HuE24ioUr4uQ8m8SjyH0yognWYLYLqnbTKrFWlFZiEMQTH/sZiWjRFvV1iL0=
 ---
 kind: signature
-hmac: aec1cabcb7b4f98f1be1d5b7a052a629ce3193e19a3692dd52ada48b6e72a1c9
+hmac: ea9432c9317fa6ca12a282bb117c9f3268ddb29b208dbd772795ba19cf395082
+
+...

.editorconfig

@@ -2,6 +2,9 @@
 
 # see http://EditorConfig.org
 
+# SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+
 # This is the file in the root of the project.
 # For sub folders you can have other files that override only some settings.
 # For these, this settings should be false.
@@ -39,7 +42,10 @@ trim_trailing_whitespace=false
 indent_size=2
 
 [*.{kt,kts}]
+ktlint_code_style = android_studio
 # IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it
 ktlint_standard_import-ordering = disabled
+ktlint_standard_no-consecutive-comments = disabled
+ktlint_function_naming_ignore_when_annotated_with = Composable
 ij_kotlin_allow_trailing_comma = false
 ij_kotlin_allow_trailing_comma_on_call_site = false

.github/.config.yml.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.github/FUNDING.yml

@@ -1,2 +1,4 @@
+# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 # You can add one username per supported platform and one custom link
 custom: https://nextcloud.com/include/

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
-name: Bug report
-description: Create a report to help us improve
-labels: [ "bug" ]
+name: "🐛 Bug report: Nextcloud Android Client"
+description: "Submit a report and help us improve the Nextcloud Android Client"
+labels: ["bug", "0. Needs triage"]
 body:
     -   type: checkboxes
         id: before-posting

.github/ISSUE_TEMPLATE/bug_report.yml.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,16 @@
-blank_issues_enabled: false
+# SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
 contact_links:
-    -   name: Community Support and Help
-        url: https://help.nextcloud.com/
-        about: For questions and general help
+    - name: 🚨 Report a security or privacy issue
+      url: https://hackerone.com/nextcloud
+      about: Report security and privacy related issues privately to the Nextcloud team, so we can coordinate the fix and release without potentially exposing all Nextcloud servers and users in the meantime.
+    -   name: 🚨 报告安全或隐私问题
+        url: https://hackerone.com/nextcloud
+        about: 请以私密方式向 Nextcloud 团队报告安全和隐私相关问题，以便我们能够协调修复工作并安排发布计划，避免在此期间可能暴露所有 Nextcloud 服务器和用户的风险。
+    - name: ❓ Community Support and Help
+      url: https://help.nextcloud.com/
+      about: Configuration, webserver/proxy or performance issues and other questions
+    - name: 💼 Nextcloud Enterprise
+      url: https://portal.nextcloud.com/
+      about: If you are a Nextcloud Enterprise customer, or need Professional support, so it can be resolved directly by our dedicated engineers more quickly
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/config.yml.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +1,48 @@
 ---
-name: Feature request
+name: 🚀 Feature request
 about: Suggest an idea for this project
-labels: enhancement
-
+labels: enhancement, 0. Needs triage
 ---
 
-### Is your feature request related to a problem? Please describe.
+<!--
+Thanks for reporting issues back to Nextcloud!
+
+Note: This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. This is a place to report bugs to developers, after your server has been debugged. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
+
+Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
+
+Guidelines for submitting issues:
+
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
+    - You can also filter by appending e. g. "state:open" to the search string.
+    - More info on search syntax within github: https://help.github.com/articles/searching-issues
+
+* This repository https://github.com/nextcloud/server/issues is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+
+* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
+
+* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
+-->
+
+
+<!--- Please keep this note for other contributors -->
+
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
+
+
+**Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-### Describe the solution you'd like
+**Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
-### Describe alternatives you've considered
+**Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-### Additional context
+**Additional context**
 Add any other context or screenshots about the feature request here.
-
-**NOTE:** Be super sure to remove sensitive data like passwords, note that everybody can look here! You can use the Issue Template application to prefill some of the required information: https://apps.nextcloud.com/apps/issuetemplate

.github/ISSUE_TEMPLATE/feature_request.md.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

.github/pull_request_template.md.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: 2023 Marcel Hibbe <dev@mhibbe.de>
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only