Merge remote-tracking branch 'origin/master' into dev

.github/workflows/assembleFlavors.yml

@@ -19,9 +19,9 @@ jobs:
             matrix:
                 flavor: [ Generic, Gplay, Huawei ]
         steps:
-            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
             -   name: set up JDK 17
-                uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+                uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
                 with:
                     distribution: "temurin"
                     java-version: 17

.github/workflows/check.yml

@@ -19,9 +19,9 @@ jobs:
             matrix:
                 task: [ detekt, spotlessKotlinCheck ]
         steps:
-            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
             -   name: Set up JDK 17
-                uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+                uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
                 with:
                     distribution: "temurin"
                     java-version: 17

.github/workflows/detectWrongSettings.yml

@@ -16,9 +16,9 @@ jobs:
         runs-on: ubuntu-22.04
 
         steps:
-            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
             -   name: Set up JDK 17
-                uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+                uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
                 with:
                     distribution: "temurin"
                     java-version: 17

.github/workflows/qa.yml

@@ -19,10 +19,10 @@ jobs:
             -   name: Check if secrets are available
                 run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}"
                 id: check-secrets
-            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
             -   name: set up JDK 17
-                uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+                uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
                 with:
                     distribution: "temurin"

.github/workflows/screenShotTest.yml

@@ -22,25 +22,25 @@ jobs:
                 color: [ blue ]
                 api-level: [ 27 ]
         steps:
-            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
             -   name: Gradle cache
-                uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+                uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
                 with:
                     path: |
                         ~/.gradle/caches
                         ~/.gradle/wrapper
                     key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
             -   name: AVD cache
-                uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+                uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
                 id: avd-cache
                 with:
                     path: |
                         ~/.android/avd/*
                         ~/.android/adb*
                     key: avd-${{ matrix.api-level }}
 
-            -   uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
+            -   uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
                 with:
                     distribution: "temurin"
                     java-version: 17

.github/workflows/unit-tests.yml

@@ -20,7 +20,7 @@ jobs:
         steps:
             -   uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
             -   name: Set up JDK 17
-                uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+                uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
                 with:
                     distribution: "temurin"
                     java-version: 17

app/build.gradle

@@ -6,7 +6,7 @@ import org.gradle.internal.jvm.Jvm
 buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
-        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.7'
+        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.5"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
@@ -275,7 +275,7 @@ dependencies {
     compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
     implementation 'commons-io:commons-io:2.15.1'
     implementation 'org.greenrobot:eventbus:3.3.1'
-    implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.0'
+    implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.1'
     implementation 'org.lukhnos:nnio:0.3'
     implementation 'org.bouncycastle:bcpkix-jdk18on:1.75'
     implementation 'com.google.code.gson:gson:2.10.1'
@@ -459,14 +459,13 @@ spotbugs {
     reportLevel = Confidence.valueOf('MEDIUM')
 }
 
-tasks.withType(SpotBugsTask).configureEach { task ->
+tasks.withType(SpotBugsTask){task ->
     String variantNameCap = task.name.replace("spotbugs", "")
     String variantName = variantNameCap.substring(0, 1).toLowerCase() + variantNameCap.substring(1)
-
     dependsOn "compile${variantNameCap}Sources"
 
-    excludeFilter.set(file("${project.rootDir}/spotbugs-filter.xml"))
-    classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/")
+    classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/")
+    excludeFilter = file("${project.rootDir}/scripts/analysis/spotbugs-filter.xml")
     reports {
         xml {
             required = true

app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt

@@ -39,7 +39,7 @@ import javax.inject.Inject
 class LogsActivity : ToolbarActivity() {
 
     @Inject
-    protected lateinit var viewModelFactory: ViewModelFactory
+    lateinit var viewModelFactory: ViewModelFactory
 
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils

app/src/main/java/com/nextcloud/client/media/PlayerService.kt

@@ -88,10 +88,10 @@ class PlayerService : Service() {
     }
 
     @Inject
-    protected lateinit var audioManager: AudioManager
+    lateinit var audioManager: AudioManager
 
     @Inject
-    protected lateinit var clientFactory: ClientFactory
+    lateinit var clientFactory: ClientFactory
 
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils

app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt

@@ -25,7 +25,7 @@ import com.github.oxo42.stateless4j.delegates.Action
 import com.github.oxo42.stateless4j.transitions.Transition
 import java.util.ArrayDeque
 
-/*
+/**
  * To see visual representation of the state machine, install PlanUml plugin.
  * http://plantuml.com/
  *

app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java

@@ -33,7 +33,7 @@
 
 /**
  * Background service for synchronizing remote files with their local state.
- * 
+ * <p>
  * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs.
  */
 public class FileSyncService extends Service {
@@ -46,7 +46,7 @@ public class FileSyncService extends Service {
     @Inject UserAccountManager userAccountManager;
     @Inject ViewThemeUtils viewThemeUtils;
 
-    /*
+    /**
      * {@inheritDoc}
      */
     @Override
@@ -59,12 +59,11 @@ public void onCreate() {
         }
     }
 
-    /*
+    /**
      * {@inheritDoc}
      */
     @Override
     public IBinder onBind(Intent intent) {
        return syncAdapter.getSyncAdapterBinder();
     }
-
 }

app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt

@@ -1,3 +1,23 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2020 Tobias Kaminsky
+ * Copyright (C) 2020 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 <http://www.gnu.org/licenses/>.
+ */
 package com.owncloud.android.ui.dialog
 
 import android.content.ComponentName
@@ -23,26 +43,6 @@ import com.owncloud.android.ui.components.SendButtonData
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
 
-/*
- * Nextcloud Android client application
- *
- * @author Tobias Kaminsky
- * Copyright (C) 2020 Tobias Kaminsky
- * Copyright (C) 2020 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 <http://www.gnu.org/licenses/>.
- */
 class SendFilesDialog : BottomSheetDialogFragment(R.layout.send_files_fragment), Injectable {
 
     private var files: Array<OCFile>? = null

app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt

@@ -1,3 +1,25 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * @author Andy Scherzinger
+ * Copyright (C) 2017 Tobias Kaminsky
+ * Copyright (C) 2017 Nextcloud GmbH.
+ * Copyright (C) 2018 Andy Scherzinger
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
 package com.owncloud.android.ui.dialog
 
 import android.content.ComponentName
@@ -30,28 +52,6 @@ import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
 
-/*
- * Nextcloud Android client application
- *
- * @author Tobias Kaminsky
- * @author Andy Scherzinger
- * Copyright (C) 2017 Tobias Kaminsky
- * Copyright (C) 2017 Nextcloud GmbH.
- * Copyright (C) 2018 Andy Scherzinger
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
 class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment), Injectable {
 
     private lateinit var binding: SendShareFragmentBinding

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

@@ -390,6 +390,7 @@ class PreviewMediaActivity :
         }
     }
 
+    @OptIn(markerClass = [UnstableApi::class])
     private fun applyWindowInsets() {
         val playerView = binding.exoplayerView
         val exoControls = playerView.findViewById<FrameLayout>(R.id.exo_bottom_bar)

app/src/main/res/values-de/strings.xml

@@ -391,7 +391,7 @@
     <string name="filename_hint">Dateiname</string>
     <string name="first_run_1_text">Halten Sie Ihre Daten sicher und unter Ihrer Kontrolle</string>
     <string name="first_run_2_text">Sichere Zusammenarbeit und Dateiaustausch</string>
-    <string name="first_run_3_text">Benutzerfreundliche Webmailer, Kalender und Kontakte</string>
+    <string name="first_run_3_text">Benutzerfreundlicher Webmailer, Kalender und Kontakte</string>
     <string name="first_run_4_text">Bildschirmfreigabe, Online-Meetings und Webkonferenzen</string>
     <string name="folder_already_exists">Ordner existiert bereits</string>
     <string name="folder_confirm_create">Erstellen</string>

build.gradle

@@ -1,17 +1,17 @@
 buildscript {
     ext {
-        androidPluginVersion = '8.2.2'
+        androidPluginVersion = '8.3.0'
         appCompatVersion = '1.6.1'
         jacoco_version = '0.8.11'
         kotlin_version = '1.9.22'
         androidxTestVersion = "1.5.0"
-        daggerVersion = "2.50"
+        daggerVersion = "2.51"
         markwonVersion = "4.6.2"
         prismVersion = "2.0.0"
         androidLibraryVersion ="f8bebf237680bb04a566c9555776a035f8040a4e"
         mockitoVersion = "4.11.0"
         mockitoKotlinVersion = "4.1.0"
-        mockkVersion = "1.13.9"
+        mockkVersion = "1.13.10"
         espressoVersion = "3.5.1"
         workRuntime = "2.9.0"
         fidoVersion = "4.1.0-patch2"