diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8f068afcad..84906f84fb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 +FROM ubuntu:noble@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8 ARG DEBIAN_FRONTEND=noninteractive ENV ANDROID_HOME=/usr/lib/android-sdk diff --git a/.drone.yml b/.drone.yml index 036d56cf4f..22394e7d3f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -183,6 +183,6 @@ name: GIT_TOKEN data: XIoa9IYq+xQ+N5iln8dlpWv0jV6ROr7HuE24ioUr4uQ8m8SjyH0yognWYLYLqnbTKrFWlFZiEMQTH/sZiWjRFvV1iL0= --- kind: signature -hmac: 2d6dd316e41c77d4abd0864d9fe78e90ae727d32c3f6a485095b437840c86a89 +hmac: 5d64f2d46fc49a1e7dad823b7ac9c0ee3762a748ab025782a20292887607d831 ... diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index b57043ba30..4e63820444 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.github/workflows/assembleFlavors.yml @@ -22,7 +22,7 @@ jobs: matrix: flavor: [ Generic, Gplay, Huawei ] steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: set up JDK 17 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 55c53cb8c8..1cd9dcc078 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,7 +22,7 @@ jobs: matrix: task: [ detekt, spotlessKotlinCheck ] steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up JDK 17 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: diff --git a/.github/workflows/command-rebase.yml b/.github/workflows/command-rebase.yml index 392b16ec59..c2ae95dd49 100644 --- a/.github/workflows/command-rebase.yml +++ b/.github/workflows/command-rebase.yml @@ -34,7 +34,7 @@ jobs: reaction-type: "+1" - name: Checkout the latest code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 token: ${{ secrets.COMMAND_BOT_PAT }} diff --git a/.github/workflows/detectWrongSettings.yml b/.github/workflows/detectWrongSettings.yml index defb5bf78e..1cf0e4e225 100644 --- a/.github/workflows/detectWrongSettings.yml +++ b/.github/workflows/detectWrongSettings.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up JDK 17 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 631d7ce411..11b1457afb 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -23,7 +23,7 @@ jobs: - name: Check if secrets are available run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}" id: check-secrets - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 if: ${{ steps.check-secrets.outputs.ok == 'true' }} - name: set up JDK 17 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index a593615cf5..caabdcae9a 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -25,7 +25,7 @@ jobs: color: [ blue ] api-level: [ 27 ] steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Gradle cache uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index e104c8a5fe..0cc139d3b5 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -21,7 +21,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up JDK 17 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: @@ -33,7 +33,7 @@ jobs: if: ${{ always() }} run: scripts/deleteOldComments.sh "test" "Unit" ${{github.event.number}} - name: Run unit tests with coverage - uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1 + uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3.3.2 with: arguments: jacocoTestGplayDebugUnitTest - name: Upload failing results diff --git a/app/build.gradle b/app/build.gradle index 4400e6378c..c7b4a46fac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,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.12' + classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.13' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6" classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 @@ -304,7 +304,7 @@ dependencies { implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.1' implementation 'org.lukhnos:nnio:0.3' - implementation 'org.bouncycastle:bcpkix-jdk18on:1.77' + implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1' implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1' implementation 'com.github.chrisbanes:PhotoView:2.3.0' diff --git a/app/lint.xml b/app/lint.xml index b25b08d85a..b3aea19333 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -56,7 +56,7 @@ - + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index bc83e43023..e23ae0acaf 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -88,6 +88,8 @@ لم يتم العثور على المضيف %1$s لا يدعم الحسابات المتعددة لا يمكن إنشاء إتصال + إلغاء الدخول + رجاءً، قم بإكمال عملية الدخول في مستعرض الوب عندك ترك في مجلد الأصل، بسبب كونه للقرائة فقط قم بالرفع عبر شبكة لاسلكية غير محدودة البيانات فقط /رفع تلقائي diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index 8d57743fb0..8add6ffbae 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -88,6 +88,8 @@ Could not find host %1$s does not support multiple accounts Could not establish connection + Cancel Login + Please complete login process in your browser kept in original folder, as it is readonly Only upload on unmetered Wi-Fi /AutoUpload diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5761430919..10985d3636 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -88,6 +88,8 @@ Konnte den Host nicht finden %1$s unterstützt nicht mehrere Benutzerkonten Verbindung konnte nicht hergestellt werden + Anmelden abbrechen + Bitte schließen Sie den Anmeldevorgang in Ihrem Browser ab im Original-Verzeichnis belassen, da nur lesbar Nur über gebührenfreies WLAN hochladen /AutoUpload diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 39c4efe7cb..fefecc1a83 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -88,6 +88,8 @@ Nemožno nájsť server %1$s nepodporuje viacero účtov Nepodarilo sa nadviazať spojenie + Zrušiť prihlasovanie + Prosím, dokončite proces prihlasovania vo vašom prehliadači ponechané v pôvodnom priečinku, pretože je iba na čítanie Nahrávaj iba na neobmedzenom Wi-Fi /AutomatickéNahrávanie diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 71a19cc8f3..1120a6165b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -88,6 +88,7 @@ Не могу да пронађем домаћина %1$s не подржава вишеструке налоге Не могу да успоставим везу + Откажи пријављивање остављен у оригиналној фасцикли јер је само за читање Отпремај само на бежичним мрежама без ограничења /Аутоматска отпремања diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1f26463e95..65c8f9c63a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -88,6 +88,8 @@ Вузол не знайдено %1$s не підтримує одночасно декілька облікових записів Не вдалося встановити з\'єднання + Скасувати авторизацію + Завершити авторизацію у бравзері залишено у вихідному каталозі, оскільки він доступний лише для читання Завантаження тільки через WiFi /AutoUpload diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index da4ab7bc48..69f0894b21 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -88,6 +88,8 @@ 無法找到主機 %1$s 不支援多個帳戶 無法建立連線 + 取消登入 + 請在瀏覽器中完成登入流程 以唯讀模式保留在原本的資料夾 僅在未計量的Wi-Fi上傳 自動上傳 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5ff6296423..fe5f18d675 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -88,6 +88,8 @@ 無法找到主機 %1$s 不支援多個帳號 無法建立連線 + 取消登入 + 請在瀏覽器中完成登入流程 以唯讀模式保留在原本的資料夾 僅在非計量收費的 Wi-Fi 上傳 自動上傳 diff --git a/build.gradle b/build.gradle index d8aaba9d51..bfdb86dafa 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { ext { androidLibraryVersion ="be87ba7948ba2067eaa6193b6c02f5e85b5bfdf1" - androidPluginVersion = '8.3.2' + androidPluginVersion = '8.4.0' androidxMediaVersion = '1.3.1' androidxTestVersion = "1.5.0" appCompatVersion = '1.6.1' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5fba5269d3..bec33f5693 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4,7 +4,7 @@ true true - + @@ -85,6 +85,7 @@ + @@ -1189,6 +1190,14 @@ + + + + + + + + @@ -1221,6 +1230,14 @@ + + + + + + + + @@ -1253,6 +1270,14 @@ + + + + + + + + @@ -1285,6 +1310,14 @@ + + + + + + + + @@ -1317,6 +1350,14 @@ + + + + + + + + @@ -1349,6 +1390,14 @@ + + + + + + + + @@ -1389,6 +1438,14 @@ + + + + + + + + @@ -2952,6 +3009,14 @@ + + + + + + + + @@ -2984,6 +3049,14 @@ + + + + + + + + @@ -3021,6 +3094,14 @@ + + + + + + + + @@ -3058,6 +3139,14 @@ + + + + + + + + @@ -3090,6 +3179,14 @@ + + + + + + + + @@ -3122,6 +3219,14 @@ + + + + + + + + @@ -3154,6 +3259,14 @@ + + + + + + + + @@ -3186,6 +3299,14 @@ + + + + + + + + @@ -3218,6 +3339,14 @@ + + + + + + + + @@ -3250,6 +3379,14 @@ + + + + + + + + @@ -3282,6 +3419,14 @@ + + + + + + + + @@ -3314,6 +3459,14 @@ + + + + + + + + @@ -3346,6 +3499,14 @@ + + + + + + + + @@ -3378,6 +3539,14 @@ + + + + + + + + @@ -3394,6 +3563,14 @@ + + + + + + + + @@ -3426,6 +3603,14 @@ + + + + + + + + @@ -3458,6 +3643,14 @@ + + + + + + + + @@ -3490,6 +3683,14 @@ + + + + + + + + @@ -3522,6 +3723,14 @@ + + + + + + + + @@ -3554,6 +3763,14 @@ + + + + + + + + @@ -3586,6 +3803,14 @@ + + + + + + + + @@ -3618,6 +3843,14 @@ + + + + + + + + @@ -3666,6 +3899,14 @@ + + + + + + + + @@ -3698,6 +3939,14 @@ + + + + + + + + @@ -3730,6 +3979,14 @@ + + + + + + + + @@ -3762,6 +4019,14 @@ + + + + + + + + @@ -3818,6 +4083,14 @@ + + + + + + + + @@ -3850,6 +4123,14 @@ + + + + + + + + @@ -3882,6 +4163,14 @@ + + + + + + + + @@ -3914,6 +4203,14 @@ + + + + + + + + @@ -3946,6 +4243,14 @@ + + + + + + + + @@ -3978,6 +4283,14 @@ + + + + + + + + @@ -4010,6 +4323,14 @@ + + + + + + + + @@ -4042,6 +4363,14 @@ + + + + + + + + @@ -4074,6 +4403,14 @@ + + + + + + + + @@ -4106,6 +4443,14 @@ + + + + + + + + @@ -4138,6 +4483,14 @@ + + + + + + + + @@ -4170,6 +4523,14 @@ + + + + + + + + @@ -4202,6 +4563,14 @@ + + + + + + + + @@ -4234,6 +4603,14 @@ + + + + + + + + @@ -4266,6 +4643,14 @@ + + + + + + + + @@ -4298,6 +4683,14 @@ + + + + + + + + @@ -4330,6 +4723,14 @@ + + + + + + + + @@ -4362,6 +4763,14 @@ + + + + + + + + @@ -4394,6 +4803,14 @@ + + + + + + + + @@ -4426,6 +4843,14 @@ + + + + + + + + @@ -4458,6 +4883,14 @@ + + + + + + + + @@ -4490,6 +4923,14 @@ + + + + + + + + @@ -4522,6 +4963,14 @@ + + + + + + + + @@ -4554,6 +5003,14 @@ + + + + + + + + @@ -4586,6 +5043,14 @@ + + + + + + + + @@ -4618,6 +5083,14 @@ + + + + + + + + @@ -4650,6 +5123,14 @@ + + + + + + + + @@ -4682,6 +5163,14 @@ + + + + + + + + @@ -4714,6 +5203,14 @@ + + + + + + + + @@ -4746,6 +5243,14 @@ + + + + + + + + @@ -4778,6 +5283,14 @@ + + + + + + + + @@ -4810,6 +5323,14 @@ + + + + + + + + @@ -4834,6 +5355,14 @@ + + + + + + + + diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 9531ef5b26..fa64b20338 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 71 warnings + Lint Report: 3 errors and 72 warnings