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

.github/workflows/codeql.yml

@@ -32,11 +32,11 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
+        uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK
-        uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b # v3.9.0
+        uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
         with:
           distribution: "temurin"
           java-version: 11
@@ -46,4 +46,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
+        uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4

.github/workflows/gradle-wrapper-validation.yml

@@ -1,8 +1,10 @@
+# synced from @nextcloud/android-config
 name: "Validate Gradle Wrapper"
-
 on:
     pull_request:
         branches: [ master, stable-* ]
+    push:
+        branches: [ master, stable-* ]
 
 # Declare default permissions as read only.
 permissions: read-all
@@ -12,5 +14,5 @@ jobs:
         name: "Validation"
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
+            - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-            -   uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
+            - uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1.0.5

.github/workflows/scorecard.yml

@@ -0,0 +1,38 @@
+# synced from @nextcloud/android-config
+name: Scorecard supply-chain security
+on:
+  branch_protection_rule:
+  schedule:
+    - cron: '32 23 * * 4'
+  push:
+    branches: [ "main", "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: false
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        with:
+          sarif_file: results.sarif

.github/workflows/scorecards-analysis.yml

@@ -1,55 +0,0 @@
-name: Scorecards supply-chain security
-on:
-  # Only the default branch is supported.
-  branch_protection_rule:
-  schedule:
-    - cron: '33 1 * * 5'
-  push:
-    branches: [ master ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      actions: read
-      contents: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v3 # v2.4.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@e3e75cf2ffbf9364bbff86cdbdf52b23176fe492 # v1.0.1
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # Read-only PAT token. To create it,
-          # follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
-          repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
-          # Publish the results to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories, `publish_results` will automatically be set to `false`,
-          # regardless of the value entered here.
-          publish_results: false
-
-      # Upload the results as artifacts (optional).
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2.3.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
-        with:
-          sarif_file: results.sarif

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.24.0 (February 13, 2022)
+
+- Several performance optimizations by @starypatyk
+- Support multi-page document scanning and exporting to PDF
+- Many small bugfixes and improvements
+
+Minimum: NC 16 Server, Android 6.0 Marshmallow
+
+For a full list, please see https://github.com/nextcloud/android/milestone/78
+
 ## 3.23.1 (December 21, 2022)
 
 - Bug fixes

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

@@ -32,6 +32,7 @@
     <string name="activity_icon">Aktywność</string>
     <string name="add_another_public_share_link">Dodaj kolejny link</string>
     <string name="add_new_public_share">Dodaj nowy link publiczny do udostępnienia</string>
+    <string name="add_new_secure_file_drop">dodaj nowy bezpiecznie upuszczony plik</string>
     <string name="add_to_cloud">Dodaj do %1$s</string>
     <string name="advanced_settings">Ustawienia zaawansowane</string>
     <string name="allow_resharing">Zezwalaj na udostępnianie dalej</string>
@@ -253,9 +254,9 @@
     <string name="end_to_end_encryption_enter_password">Wprowadź hasło, aby odszyfrować klucz prywatny.</string>
     <string name="end_to_end_encryption_folder_not_empty">Ten katalog nie jest pusty.</string>
     <string name="end_to_end_encryption_generating_keys">Generowanie nowych kluczy</string>
-    <string name="end_to_end_encryption_keywords_description">Wszystkie 12-stu słów utworzy bardzo trudne hasło, które pozwoli na przeglądanie i korzystanie z zaszyfrowanych plików. Zapisz je i przechowuj w bezpiecznym miejscu.</string>
+    <string name="end_to_end_encryption_keywords_description">Wszystkie 12-ście słów utworzy bardzo trudne hasło, które pozwoli na przeglądanie i korzystanie z zaszyfrowanych plików. Zapisz je i przechowuj w bezpiecznym miejscu.</string>
     <string name="end_to_end_encryption_not_enabled">Szyfrowanie End-to-End wyłączone po stronie serwera.</string>
-    <string name="end_to_end_encryption_passphrase_title">Zapisz swoje hasło do szyfrowania składające się z 12-stu słów</string>
+    <string name="end_to_end_encryption_passphrase_title">Zapisz swoje hasło do szyfrowania z 12-stu słów</string>
     <string name="end_to_end_encryption_password">Hasło…</string>
     <string name="end_to_end_encryption_retrieving_keys">Pobieranie kluczy…</string>
     <string name="end_to_end_encryption_storing_keys">Przechowywanie kluczy</string>
@@ -682,6 +683,7 @@
     <string name="share_password_title">Zabezpieczone hasłem</string>
     <string name="share_permission_can_edit">Może edytować</string>
     <string name="share_permission_file_drop">Upuść plik</string>
+    <string name="share_permission_secure_file_drop">Bezpieczne upuszczenie pliku</string>
     <string name="share_permission_view_only">Tylko podgląd</string>
     <string name="share_permissions">Uprawnienia udostępniania</string>
     <string name="share_remote_clarification">%1$s (zdalny)</string>

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

@@ -78,7 +78,7 @@
     <string name="avatar">Avatar</string>
     <string name="away">Ne spremljam</string>
     <string name="backup_settings">Nastavitve varnostnega kopiranja</string>
-    <string name="backup_title">Varnostno kopiranje kontaktov &amp; koledarja</string>
+    <string name="backup_title">Varnostno kopiranje stikov koledarja &amp;</string>
     <string name="battery_optimization_close">Zapri</string>
     <string name="battery_optimization_disable">Onemogoči</string>
     <string name="battery_optimization_message">Naprava ima najverjetneje omogočeno možnost optimizacije porabe baterije. Program AutoUpload pravilno deluje le, če je izvzet iz nje.</string>
@@ -276,9 +276,9 @@
     <string name="error_report_issue_text">Ali želite poslati poročilo na sledilnik (zahteva račun Github)?</string>
     <string name="error_retrieving_file">Pridobivanje datoteke je spodletelo</string>
     <string name="error_retrieving_templates">Napaka pridobivanja predlog</string>
-    <string name="error_showing_encryption_dialog">Napaka pri prikazu nastavitev šifriranja!</string>
+    <string name="error_showing_encryption_dialog">Napaka pri prikazu pogovornega okna nastavitev šifriranja!</string>
     <string name="error_starting_direct_camera_upload">Napaka začenjanja kamere</string>
-    <string name="error_starting_doc_scan">Napaka pri začetku preverjanja dokumenta</string>
+    <string name="error_starting_doc_scan">Napaka pri začenjanju preverjanja dokumenta</string>
     <string name="error_starting_scan_doc">Napaka uporabe preverjanja dokumenta</string>
     <string name="etm_accounts">Računi</string>
     <string name="etm_background_job_name">Ime opravila</string>
@@ -485,8 +485,8 @@
     <string name="no_items">Ni predmetov</string>
     <string name="no_mutliple_accounts_allowed">Dovoljen je le en račun</string>
     <string name="no_pdf_app_available">Ni nameščenega programa za odpiranje datotek PDF</string>
-    <string name="no_send_app">Nobena aplikacija ni primerna za pošiljanje izbranih datotek</string>
+    <string name="no_send_app">Na voljo ni nobenega programa za pošiljanje izbranih datotek</string>
-    <string name="no_share_permission_selected">Prosim izberite vsaj eno dovoljenje za souporabo.</string>
+    <string name="no_share_permission_selected">Izbrati je treba vsaj eno dovoljenje za souporabo.</string>
     <string name="note_confirm">Pošlji</string>
     <string name="note_could_not_sent">Sporočilca ni mogoče poslati</string>
     <string name="note_icon_hint">Ikona opombe</string>
@@ -533,8 +533,8 @@
     <string name="placeholder_media_time">12:23:45</string>
     <string name="placeholder_sentence">To je vsebnik predmetov</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
-    <string name="player_stop">končaj</string>
+    <string name="player_stop">ustavi</string>
-    <string name="player_toggle">preklop</string>
+    <string name="player_toggle">preklopi</string>
     <string name="power_save_check_dialog_message">Onemogočanje varčevanja lahko povzroči pošiljanje datotek, ko je napetost baterije že nizka!</string>
     <string name="pref_behaviour_entries_delete_file">izbrisano</string>
     <string name="pref_behaviour_entries_keep_file">ohranjeno v izvorni mapi</string>
@@ -556,9 +556,9 @@
     <string name="prefs_category_dev">Dev</string>
     <string name="prefs_category_general">Splošno</string>
     <string name="prefs_category_more">Več</string>
-    <string name="prefs_daily_backup_summary">Dnevno varnostno kopiranje vašega koledarja &amp; stikov </string>
+    <string name="prefs_daily_backup_summary">Dnevno varnostno kopiranje koledarja &amp; stikov</string>
     <string name="prefs_davx5_setup_error">Nepričakovana napaka pri nastavljanju DAVx5 (prej poznano kot DAVdroid)</string>
-    <string name="prefs_e2e_active">Celovito šifriranje »end-to-end« je nastavljeno!</string>
+    <string name="prefs_e2e_active">Celovito šifriranje E2E je nastavljeno!</string>
     <string name="prefs_e2e_mnemonic">Mnemonika E2E</string>
     <string name="prefs_e2e_no_device_credentials">Za prikaz mnemonike izberite poverila naprave.</string>
     <string name="prefs_enable_media_scan_notifications">Pokaži obvestila iskanja predstavnih vsebin</string>
@@ -581,8 +581,8 @@
     <string name="prefs_lock_using_passcode">Koda PIN</string>
     <string name="prefs_manage_accounts">Upravljanje z računi</string>
     <string name="prefs_recommend">Priporoči prijatelju</string>
-    <string name="prefs_remove_e2e">Odstrani šifriranje krajevno</string>
+    <string name="prefs_remove_e2e">Krajevno odstrani šifriranje</string>
-    <string name="prefs_setup_e2e">Nastavi celovito šifriranje »end-to-end«</string>
+    <string name="prefs_setup_e2e">Nastavi celovito šifriranje E2E</string>
     <string name="prefs_show_hidden_files">Pokaži skrite datoteke</string>
     <string name="prefs_sourcecode">Pridobi izvorno kodo</string>
     <string name="prefs_storage_path">Mapa podatkovne shrambe</string>
@@ -924,12 +924,30 @@
         <item quantity="few">Spodletelo je kopiranje %1$d datotek iz mape %2$s v</item>
         <item quantity="other">Spodletelo je kopiranje %1$d datotek iz mape %2$s v</item>
     </plurals>
+    <plurals name="created_n_uids_to">
+        <item quantity="one">Ustvarjeno je %1$d novo določilo UID</item>
+        <item quantity="two">Ustvarjeni sta %1$d novi določili UID</item>
+        <item quantity="few">Ustvarjena so %1$d nova določila UID</item>
+        <item quantity="other">Ustvarjenih je %1$d novih določil UID</item>
+    </plurals>
+    <plurals name="processed_n_entries">
+        <item quantity="one">Obdelan je %d vnos.</item>
+        <item quantity="two">Obdelana sta %d vnosa.</item>
+        <item quantity="few">Obdelani so %d vnosi.</item>
+        <item quantity="other">Obdelanih je %d vnosov.</item>
+    </plurals>
     <plurals name="found_n_duplicates">
         <item quantity="one">Najden je %d podvojen vnos.</item>
         <item quantity="two">Najdena sta %d podvojena vnosa.</item>
         <item quantity="few">Najdeni so %d podvojeni vnosi.</item>
         <item quantity="other">Najdenih je %d podvojenih vnosov.</item>
     </plurals>
+    <plurals name="export_successful">
+        <item quantity="one">Izvožena je %d datoteka.</item>
+        <item quantity="two">Izvoženi sta %d datoteki.</item>
+        <item quantity="few">Izvožene so %d datoteke.</item>
+        <item quantity="other">Izvoženih je %d datotek.</item>
+    </plurals>
     <plurals name="file_list__footer__folder">
         <item quantity="one">%1$d mapa</item>
         <item quantity="two">%1$d mapi</item>

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        androidPluginVersion = '7.4.0'
+        androidPluginVersion = '7.4.1'
         appCompatVersion = '1.6.0'
         jacoco_version = '0.8.8'
         kotlin_version = '1.7.22'
         androidxTestVersion = "1.4.0"
-        daggerVersion = "2.44.2"
+        daggerVersion = "2.45"
         markwonVersion = "4.6.2"
         prismVersion = "2.0.0"
         androidLibraryVersion ="64c2a93f9ccbb724af462eab718cc858ee87fe9a"