From 673dd26761bd246438c5cd5df7bc2ce3bdf82188 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 15:10:04 +0000 Subject: [PATCH 01/20] Update dependency com.googlecode.ez-vcard:ez-vcard to v0.12.1 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 597c229cfb84..a5cc69408249 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' From 0d84f8cacbfeaef2c8395bdda694833d2bf77a22 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 5 Feb 2024 00:18:45 +0100 Subject: [PATCH 02/20] Update dependency meta data Signed-off-by: Andy Scherzinger --- gradle/verification-metadata.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8c6315995561..a149fe85cd1a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -276,7 +276,10 @@ - + + + + From 7426f3ff8e8b447810e98c8c51682a0c245266c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 08:50:23 +0000 Subject: [PATCH 03/20] Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v6.0.8 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9926d122961b..c9e64a1e0b03 100644 --- a/app/build.gradle +++ b/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 From 1309835e01f2894c205d53ede9ffbe3312a3606b Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 1 Mar 2024 11:07:17 +0000 Subject: [PATCH 04/20] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index edf47ba03e5c..056ea05dfccb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -391,7 +391,7 @@ Dateiname Halten Sie Ihre Daten sicher und unter Ihrer Kontrolle Sichere Zusammenarbeit und Dateiaustausch - Benutzerfreundliche Webmailer, Kalender und Kontakte + Benutzerfreundlicher Webmailer, Kalender und Kontakte Bildschirmfreigabe, Online-Meetings und Webkonferenzen Ordner existiert bereits Erstellen From 697d99823fbaf1f482ae86d4aae44d05afc574de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:15:45 +0000 Subject: [PATCH 05/20] Update actions/setup-java digest to 9704b39 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/assembleFlavors.yml | 2 +- .github/workflows/check.yml | 2 +- .github/workflows/detectWrongSettings.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/screenShotTest.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index 2fb822451f79..e43b845b2ba3 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.github/workflows/assembleFlavors.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: set up JDK 17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 with: distribution: "temurin" java-version: 17 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e61731c43946..144defa2dc71 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up JDK 17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 with: distribution: "temurin" java-version: 17 diff --git a/.github/workflows/detectWrongSettings.yml b/.github/workflows/detectWrongSettings.yml index b3355a911ad8..18e1e15ce3f1 100644 --- a/.github/workflows/detectWrongSettings.yml +++ b/.github/workflows/detectWrongSettings.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up JDK 17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 with: distribution: "temurin" java-version: 17 diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 6b038cc013ce..69e31282c0f2 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 if: ${{ steps.check-secrets.outputs.ok == 'true' }} - name: set up JDK 17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 if: ${{ steps.check-secrets.outputs.ok == 'true' }} with: distribution: "temurin" diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index 0f493b462f1f..e16871108b82 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -40,7 +40,7 @@ jobs: ~/.android/adb* key: avd-${{ matrix.api-level }} - - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 + - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 with: distribution: "temurin" java-version: 17 From 9686f321efc78da48984484ca667298d9e525b2b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:15:50 +0000 Subject: [PATCH 06/20] Update actions/cache action to v4.0.1 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/screenShotTest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index 0f493b462f1f..5191b177c0a2 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -25,14 +25,14 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - 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: | From f1a97061603aaade6ea3598f0d0560a96c992651 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:20:56 +0000 Subject: [PATCH 07/20] Update actions/setup-java action to v4.1.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index e66d442a1bfd..a10b7cdd8087 100644 --- a/.github/workflows/unit-tests.yml +++ b/.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 From 3eb0aceb5c5bdaf70e3950fd3e85556c60028b3e Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 13:36:47 +0100 Subject: [PATCH 08/20] Use proper full version strings Signed-off-by: Andy Scherzinger --- .github/workflows/assembleFlavors.yml | 4 ++-- .github/workflows/check.yml | 4 ++-- .github/workflows/detectWrongSettings.yml | 4 ++-- .github/workflows/qa.yml | 4 ++-- .github/workflows/screenShotTest.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index e43b845b2ba3..d2d6f02f4ca4 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.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@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: "temurin" java-version: 17 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 144defa2dc71..5ff5ea5d49fc 100644 --- a/.github/workflows/check.yml +++ b/.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@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: "temurin" java-version: 17 diff --git a/.github/workflows/detectWrongSettings.yml b/.github/workflows/detectWrongSettings.yml index 18e1e15ce3f1..532c77e81e97 100644 --- a/.github/workflows/detectWrongSettings.yml +++ b/.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@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: "temurin" java-version: 17 diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 69e31282c0f2..ca436ccb3ce6 100644 --- a/.github/workflows/qa.yml +++ b/.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@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 if: ${{ steps.check-secrets.outputs.ok == 'true' }} with: distribution: "temurin" diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index e16871108b82..cb3095dce840 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -22,7 +22,7 @@ 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 @@ -40,7 +40,7 @@ jobs: ~/.android/adb* key: avd-${{ matrix.api-level }} - - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4 + - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: "temurin" java-version: 17 From c9b7d3cca5185f77dc363ccfcc52637e7f6bafda Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 21:09:16 +0000 Subject: [PATCH 09/20] Update dependency com.android.tools.build:gradle to v8.3.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- gradle/verification-metadata.xml | 395 ++++++++++++++++++++++++++++++- 2 files changed, 393 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 70774fa986fd..0e1219d41528 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - androidPluginVersion = '8.2.2' + androidPluginVersion = '8.3.0' appCompatVersion = '1.6.1' jacoco_version = '0.8.11' kotlin_version = '1.9.22' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 101ef6328ea6..162622c6c31d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7,6 +7,9 @@ + + + @@ -98,7 +101,10 @@ - + + + + @@ -145,6 +151,7 @@ + @@ -177,7 +184,10 @@ - + + + + @@ -242,7 +252,10 @@ - + + + + @@ -1111,6 +1124,14 @@ + + + + + + + + @@ -1119,6 +1140,14 @@ + + + + + + + + @@ -1127,6 +1156,14 @@ + + + + + + + + @@ -1135,6 +1172,14 @@ + + + + + + + + @@ -1143,6 +1188,14 @@ + + + + + + + + @@ -1151,6 +1204,14 @@ + + + + + + + + @@ -1159,6 +1220,14 @@ + + + + + + + + @@ -2512,6 +2581,14 @@ + + + + + + + + @@ -2520,6 +2597,14 @@ + + + + + + + + @@ -2528,6 +2613,14 @@ + + + + + + + + @@ -2536,6 +2629,14 @@ + + + + + + + + @@ -2544,6 +2645,14 @@ + + + + + + + + @@ -2552,6 +2661,14 @@ + + + + + + + + @@ -2568,6 +2685,14 @@ + + + + + + + + @@ -2576,6 +2701,14 @@ + + + + + + + + @@ -2584,6 +2717,14 @@ + + + + + + + + @@ -2592,6 +2733,14 @@ + + + + + + + + @@ -2600,6 +2749,14 @@ + + + + + + + + @@ -2608,6 +2765,14 @@ + + + + + + + + @@ -2616,6 +2781,14 @@ + + + + + + + + @@ -2624,6 +2797,14 @@ + + + + + + + + @@ -2632,6 +2813,14 @@ + + + + + + + + @@ -2640,6 +2829,14 @@ + + + + + + + + @@ -2648,6 +2845,14 @@ + + + + + + + + @@ -2656,6 +2861,14 @@ + + + + + + + + @@ -2664,6 +2877,14 @@ + + + + + + + + @@ -2672,6 +2893,14 @@ + + + + + + + + @@ -2680,6 +2909,14 @@ + + + + + + + + @@ -2688,6 +2925,14 @@ + + + + + + + + @@ -2696,6 +2941,14 @@ + + + + + + + + @@ -2704,6 +2957,14 @@ + + + + + + + + @@ -2712,6 +2973,14 @@ + + + + + + + + @@ -2744,6 +3013,14 @@ + + + + + + + + @@ -2784,6 +3061,14 @@ + + + + + + + + @@ -2824,6 +3109,14 @@ + + + + + + + + @@ -2832,6 +3125,14 @@ + + + + + + + + @@ -2848,6 +3149,14 @@ + + + + + + + + @@ -2864,6 +3173,14 @@ + + + + + + + + @@ -2880,6 +3197,14 @@ + + + + + + + + @@ -2896,6 +3221,14 @@ + + + + + + + + @@ -2912,6 +3245,14 @@ + + + + + + + + @@ -2944,6 +3285,14 @@ + + + + + + + + @@ -2960,6 +3309,14 @@ + + + + + + + + @@ -2976,6 +3333,14 @@ + + + + + + + + @@ -2992,6 +3357,14 @@ + + + + + + + + @@ -4367,6 +4740,14 @@ + + + + + + + + @@ -4459,6 +4840,14 @@ + + + + + + + + From 8f60b0a9cf4134688773157ca9b03c6d5c31ff22 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Feb 2024 22:30:43 +0100 Subject: [PATCH 10/20] Add 8.3.0 meta data Signed-off-by: Andy Scherzinger --- gradle/verification-keyring.keys | 66 ++++++++++++++++++++++++++++++++ gradle/verification-metadata.xml | 6 +-- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 5c90cec44202..7b6ef2d21b16 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -2189,6 +2189,43 @@ Zo/Xr9x/cYkFS8ieh6XR0y1Yx4xZIDTi3Q== =BLWG -----END PGP PUBLIC KEY BLOCK----- +pub D041CAD2E452550F +uid Deanna + +sub 5199F3DAE89C332D +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +mQGNBGCtdhoBDADdopjDt4eUNEqLJSw1ZICSR0oq09SOVtJSaSYdF8UiXjBfL1Ds +fhTDqSv5pT2a2gLj0OU3tFhWHvINLaKKCjQnHVcFXi2LTxt+XBOjRYkFjHVisbaZ +PZ6HnTMStPrvs+hQ168vU3VfYOsOLN22j53I/Ba+FA7E0G0bqkratuT5L7BTR1mC +fqDaeisWSCllfe6EEysaFF+/1RcRy+Yt+8ZWV0FZEF7UwQvqKHcYmlkqPIn3v/8y +J/yvmzIEtCQ1F+bvJbzaROmeJf254G2Uh7IfMYEm9WlqnGwNdbIhil7bdxq8Y/0H +XbQPaESxkki7yL5JTfH/+UzdklMe+Dga273L/cgzfjV3zJJ9vR94W5ABAbGYh4ZW +aKvNnT1m4vTbEMfo4r3NF2zc+K9Ly/JNaHqkR5M4SVElvN2lsC5KNUiRvExhg+h0 +mKyx61mu3gUIrC1UOmqhtx7RzQQf7ESMdzmNHY0P93lR0Ic10fyli0wfl7A6q7+q +zV2a1V2k9Yg6B9sAEQEAAbQgRGVhbm5hIDxkZWFubmFnYXJjaWFAZ29vZ2xlLmNv +bT65AY0EYK12GgEMAMgP3//QeBsTS3IrfSp3m44el96X6BWona2yo4DvVyuwqfUL +ZE+Nhj7I+kEZLrA29AOySOD/6quJ4MIJZfq/Do920Di8/10WQ00OdCM1wH7bMz2U +vcSqsr0iOgQtycuUf7JOHSTME9vqk+C3Lhn0r59AVaRdXEe6zBgNZyzZJeCr5F8w +RhglPlwvhOGs2aLEqlCxFnY4pLayQFoQyw1lDjHIXHg5JtfOHvqiNXVDcGpyKLG8 +SzImp62iL4sfuA0weVIQeS9kZiQabSYKvSf3TvNXYTgmFz/vjPbYhv9LTkBroTlV +g3l+UmAxLrHVuXMx0zX3jfNNHAqUjVhPYZhnifMkmGJgLeMIVqr5Q/tx8pzyYiiO +cqQ1zDg8ubJDGRue1JjlUGdw19OvhFDs+lydukt8Mmhb0gPkBLi2syZHgYHtEooX +PLwEsJ+SynZCFhZiWj8BsWNFJpaDd8ynNeWhMAcwi3B5ZeQiZaAlV0sItxsrzvbu +4ZYZtkjAkQdsaaTWSwARAQABiQG8BBgBCgAmFiEEaWthmaKp2MKc54zA0EHK0uRS +VQ8FAmCtdhoCGwwFCQPCZwAACgkQ0EHK0uRSVQ+G7wwAvaVPDgnM+i2pGQPwq6Mk +SzhKEG4H1pvBWyYR8H9D3p/dE33IjVu3EEy1h37Nzdyp46KtASGNe3KBodSsh6gv +PlV5pNGxMNbX6fo8ZGtS83C+6uTF1cYmuO1nmi8P4+7qtcNZg4xv/ujAZIC20kem +YKDth3FvPxEXsoxY+Ns7sxgd3SqoyLhjcyoczI8uyhim5nfvvbnEd6WrdiBPBtb/ +F1h/nfqdFj2TcZkAlnzGnlVlgU8J60u6zE+9VvBm0lJR73Ar55mQEwarGFPL1a3/ +A7ZEeNa0Dc3Oa5sKMYtxMlGKZ0WGUoGcDWiaDEsv5YyRnaSOaXKM1NkJCR013QAr +RcHrRBPo+0/RIZVE+b8oEcmGzdL8HNwnm7e06ruZryF9LQA5YBmCKE0urigmgEvC +zZsj/fMJ+OIZcAhE7UVae48GpW2kLATxmK01oSzvizIlmN3rVz2EnjOun2iuuEpF +/lmDbjK5n1r3f8npB1l1fT5cozzQJkPVYzhBWH1KXP5X +=nh9O +-----END PGP PUBLIC KEY BLOCK----- + pub D0BF1D737C9A1C22 uid PMD Release Signing Key @@ -3026,6 +3063,35 @@ K+jUtu4w+gsJ3GJvywKbXKy6DkVXcc+umnc318/Y =UhYJ -----END PGP PUBLIC KEY BLOCK----- +pub EE92349AD86DE446 +uid Thomas Ball + +sub E68665C8F91BDE69 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo +P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2 +SC9GkBMgagbCScP1xE45q5FO+z4kwmcERIKOQ687VAk64QM6hJCupfAd6SqS/X0Q +SGttTNtmj7YBpfnU5iFX05Hj8Zkk7CX439xltO8uJNyBlDVbuUZc3/kRowKPVuuo +TK2mzllVPzE/YT6NUY04wQPmRJx0uWZQUyDBZeckdurpSImdd7sik6Wf6zVGvxvg +MC4oMufZ3EM8R4dssRSIUfnBaQ2o1LS+GVxjABEBAAG0HlRob21hcyBCYWxsIDx0 +YmFsbEBnb29nbGUuY29tPrkBDQRjvdWpAQgA0k8hiP0izEoo5Ys6Ra/ECD2j2Ssi +SiEExo4ZGzHhHFDICs4JShob+qwbdpU6LzAwvyFArqqhcAMnoUEbFDrsbyml6vNF +KPU7cEkgsHoV3VfzDjRLqFK9QBmz4MzUUy4PiZ/rJ27JlRUiCEZETE15Jv+9+fgp +U+p1IAPu5Z5CIhRi95pevCi3z5Ty1E2C/4tCkKOGbmG9bIi7HGkj6Tk3TtX3LTJE +ZaIFuCp2Z8dXB0RtRIzSwxhQlRkpb6LB/m1mKD0tm7ccB/+/JeMFYbrOSSPA7yic +oUu6EviOTKAcZJrAkfBhGC2WSdRnQMxVzjnVtuG4UcTR1yBAJ0BgmwjrowARAQAB +iQE8BBgBCAAmFiEE6xs95xcTyewuh8wm7pI0mtht5EYFAmO91akCGwwFCQPCZwAA +CgkQ7pI0mtht5EY0LQf/UkEplnz4ksZwZ59yGwRbFw1E3zIG0O0MzykSwL30+36/ +MtoBhgVs9UqnOvnvMjFm+2byZRtY5rhnx4e3MtFAQWKsq693jthQ87Ie1915xyvR +7uJBDaulGY5WueQq7gscj5/iMUSb4977cLIth7+0Eop4E4qNEBalCLsnPUZBS670 +kW7h9SmHPPTPkvJsYdrVPtBn7Z7DySouXwQR5kCrjH9u6VtpfTnS9+yBQufVf0AQ +JbQJf85p+8W5KsRmwtRLDQrObOow84sxc6H8RmyinXsOqEZ7k07sagKezdfGqOmC +AwT14IRCih4oeUsICRfb9e23BVJGWs2x1VvzaIrLsQ== +=vv+C +-----END PGP PUBLIC KEY BLOCK----- + pub EE9E7DC9D92FC896 uid Eddie Aftandilian diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 162622c6c31d..0f6696cb479c 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4,12 +4,9 @@ true true - + - - - @@ -285,6 +282,7 @@ + From 6498cc59007063003c6ef6318f120856a4ac24e1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Feb 2024 23:14:50 +0100 Subject: [PATCH 11/20] Add further 8.3.0 dependency metadata Signed-off-by: Andy Scherzinger --- gradle/verification-metadata.xml | 208 +++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 0f6696cb479c..b2f45ccccd53 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2675,6 +2675,14 @@ + + + + + + + + @@ -3027,6 +3035,14 @@ + + + + + + + + @@ -3035,6 +3051,14 @@ + + + + + + + + @@ -3043,6 +3067,14 @@ + + + + + + + + @@ -3051,6 +3083,14 @@ + + + + + + + + @@ -3075,6 +3115,14 @@ + + + + + + + + @@ -3083,6 +3131,14 @@ + + + + + + + + @@ -3091,6 +3147,14 @@ + + + + + + + + @@ -3099,6 +3163,14 @@ + + + + + + + + @@ -3139,6 +3211,14 @@ + + + + + + + + @@ -3163,6 +3243,14 @@ + + + + + + + + @@ -3187,6 +3275,14 @@ + + + + + + + + @@ -3211,6 +3307,14 @@ + + + + + + + + @@ -3235,6 +3339,14 @@ + + + + + + + + @@ -3259,6 +3371,14 @@ + + + + + + + + @@ -3267,6 +3387,14 @@ + + + + + + + + @@ -3275,6 +3403,14 @@ + + + + + + + + @@ -3299,6 +3435,14 @@ + + + + + + + + @@ -3323,6 +3467,14 @@ + + + + + + + + @@ -3347,6 +3499,14 @@ + + + + + + + + @@ -3363,6 +3523,14 @@ + + + + + + + + @@ -4806,6 +4974,14 @@ + + + + + + + + @@ -4814,6 +4990,14 @@ + + + + + + + + @@ -4822,6 +5006,14 @@ + + + + + + + + @@ -4830,6 +5022,14 @@ + + + + + + + + @@ -4854,6 +5054,14 @@ + + + + + + + + From df194ce2fbb5e3cc529978e3580b57218c13b58a Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 1 Mar 2024 11:49:37 +0100 Subject: [PATCH 12/20] gradle has now different class folder Signed-off-by: tobiasKaminsky --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c9e64a1e0b03..e8715f147615 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -466,7 +466,7 @@ tasks.withType(SpotBugsTask).configureEach { task -> 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/") reports { xml { required = true From 6c268731311e3cb6f403e6e1cfb4241cf5d9af10 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 11:22:38 +0100 Subject: [PATCH 13/20] Adopt library structure for spotbugs Signed-off-by: Andy Scherzinger --- app/build.gradle | 3 +-- spotbugs-filter.xml => scripts/analysis/spotbugs-filter.xml | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename spotbugs-filter.xml => scripts/analysis/spotbugs-filter.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index e8715f147615..978711d53ab3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -459,10 +459,9 @@ 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")) diff --git a/spotbugs-filter.xml b/scripts/analysis/spotbugs-filter.xml similarity index 100% rename from spotbugs-filter.xml rename to scripts/analysis/spotbugs-filter.xml From 60feda654f5bd58871e2f04f014faf317f3cf62c Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 1 Mar 2024 11:55:51 +0100 Subject: [PATCH 14/20] gradle has now different class folder Signed-off-by: tobiasKaminsky --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 978711d53ab3..b992bff135e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -464,8 +464,8 @@ tasks.withType(SpotBugsTask){task -> 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}/compile${variantNameCap}JavaWithJavac/classes/") + excludeFilter = file("${project.rootDir}/scripts/analysis/spotbugs-filter.xml") reports { xml { required = true From 95be5705b003deaacb2059a6434bbde8346b94c8 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 13:43:26 +0100 Subject: [PATCH 15/20] Fix lint - Unsafe opt-in usage intended to be error-level severity Signed-off-by: Andy Scherzinger --- .../java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt index 2c522850634a..09f685869f2f 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt +++ b/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(R.id.exo_bottom_bar) From 8846907aa8e005f0b8d24830e0606b9c4311c8d7 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 13:46:30 +0100 Subject: [PATCH 16/20] Fix wrong comment type Signed-off-by: Andy Scherzinger --- .../client/media/PlayerStateMachine.kt | 2 +- .../android/syncadapter/FileSyncService.java | 7 ++- .../android/ui/dialog/SendFilesDialog.kt | 40 ++++++++--------- .../android/ui/dialog/SendShareDialog.kt | 44 +++++++++---------- 4 files changed, 46 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt b/app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt index 5a1ece0ab382..1795fd32746a 100644 --- a/app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt +++ b/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/ * diff --git a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java index c71832088882..35477bc584a7 100644 --- a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java +++ b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java @@ -33,7 +33,7 @@ /** * Background service for synchronizing remote files with their local state. - * + *

* 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(); } - } diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt index b11dc503f8c8..f6ee624009d3 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt +++ b/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 . + */ 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 . - */ class SendFilesDialog : BottomSheetDialogFragment(R.layout.send_files_fragment), Injectable { private var files: Array? = null diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt index c6f57dd75aeb..9aa5789a09c8 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt +++ b/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 . + */ 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 . - */ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment), Injectable { private lateinit var binding: SendShareFragmentBinding From 12479ac5385eb047b38e51f3d3609439892373b5 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 13:48:01 +0100 Subject: [PATCH 17/20] bump lint warning score Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 3e0520e4c5f4..9531ef5b263b 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 69 warnings + Lint Report: 3 errors and 71 warnings From 40547d375c98259fe548b62477d9cec84799a287 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:23:00 +0000 Subject: [PATCH 18/20] Update daggerVersion to v2.51 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e1219d41528..c1a6ff4bde18 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { 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 ="acc7df66e4a43ed7f450136c13753f2743fb245e" From ef5b6085724d1fc5ff03546c1541a59a195f2005 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 15:57:04 +0100 Subject: [PATCH 19/20] Fix injection field visibility for dagger Signed-off-by: Andy Scherzinger --- .../main/java/com/nextcloud/client/logger/ui/LogsActivity.kt | 2 +- app/src/main/java/com/nextcloud/client/media/PlayerService.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt index 183b8fe00600..457e24c6efe3 100644 --- a/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/client/media/PlayerService.kt b/app/src/main/java/com/nextcloud/client/media/PlayerService.kt index a7cf6bb5479c..009c51887976 100644 --- a/app/src/main/java/com/nextcloud/client/media/PlayerService.kt +++ b/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 From 11eeb061e8ad1ec8842d9fd7e0001fefd3ffeb2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:22:34 +0000 Subject: [PATCH 20/20] Update mockkVersion to v1.13.10 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c1a6ff4bde18..95eff06bcaeb 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { androidLibraryVersion ="acc7df66e4a43ed7f450136c13753f2743fb245e" 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"