daily dev 20230207

Update Nextcloud Android library

.github/workflows/command-rebase.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # v2
+        uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d # v2
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -42,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # v2
+        uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d # v2
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/screenShotTest.yml

@@ -21,14 +21,14 @@ jobs:
             -   uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3
 
             -   name: Gradle cache
-                uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
+                uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3
                 with:
                     path: |
                         ~/.gradle/caches
                         ~/.gradle/wrapper
                     key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
             -   name: AVD cache
-                uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
+                uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3
                 id: avd-cache
                 with:
                     path: |

app/build.gradle

@@ -17,7 +17,7 @@ buildscript {
 }
 
 plugins {
-    id "com.diffplug.spotless" version "6.14.0"
+    id "com.diffplug.spotless" version "6.14.1"
 }
 
 apply plugin: 'com.android.application'
@@ -145,8 +145,8 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20230203
+                versionCode 20230207
-                versionName "20230203"
+                versionName "20230207"
             }
 
             qa {
@@ -245,7 +245,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
-    implementation 'androidx.webkit:webkit:1.5.0'
+    implementation 'androidx.webkit:webkit:1.6.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.5'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"

app/src/main/res/values-hu-rHU/strings.xml

@@ -209,6 +209,11 @@
     <string name="dismiss_notification_description">Értesítés mellőzése</string>
     <string name="displays_mnemonic">Megjeleníti a 12 szavas jelmondatát</string>
     <string name="dnd">Ne zavarjanak</string>
+    <string name="document_scan_export_dialog_images">Több kép</string>
+    <string name="document_scan_export_dialog_pdf">PDF-fájl</string>
+    <string name="document_scan_export_dialog_title">Válasszon exportálási típust</string>
+    <string name="document_scan_pdf_generation_failed">A PDF előállítása sikertelen</string>
+    <string name="document_scan_pdf_generation_in_progress">PDF előállítása…</string>
     <string name="done">Kész</string>
     <string name="dontClear">Ne törölje</string>
     <string name="download_latest_dev_version">A legfrissebb fejlesztői verzió letöltése</string>
@@ -273,6 +278,7 @@
     <string name="error_retrieving_templates">Hiba történt a sablonok lékérésekor</string>
     <string name="error_showing_encryption_dialog">Hiba a titkosítás beállítóablakának megjelenítése során!</string>
     <string name="error_starting_direct_camera_upload">Hiba a kamera indításakor</string>
+    <string name="error_starting_doc_scan">Hiba a dokumentumbeolvasás elindítása során</string>
     <string name="error_starting_scan_doc">Hiba a dokumentumbeolvasás használata sorá</string>
     <string name="etm_accounts">Fiókok</string>
     <string name="etm_background_job_name">Feladat neve</string>
@@ -624,6 +630,7 @@
     <string name="retrieving_file">Fájl lekérése…</string>
     <string name="richdocuments_failed_to_load_document">A dokumentum betöltése sikertelen!</string>
     <string name="scanQR_description">Belépés QR-kóddal</string>
+    <string name="scan_page">Kép szkennelése</string>
     <string name="screenshot_01_gridView_heading">Az adatai védelme</string>
     <string name="screenshot_01_gridView_subline">saját üzemeltetésű irodai platform</string>
     <string name="screenshot_02_listView_heading">Tallózás és megosztás</string>

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

@@ -207,7 +207,13 @@
     <string name="disable_new_media_folder_detection_notifications">Disabilita</string>
     <string name="dismiss">Annulla</string>
     <string name="dismiss_notification_description">Cancella notifica</string>
+    <string name="displays_mnemonic">Visualizza la tua frase segreta di 12 parole</string>
     <string name="dnd">Non disturbare</string>
+    <string name="document_scan_export_dialog_images">Immagini multiple</string>
+    <string name="document_scan_export_dialog_pdf">File PDF</string>
+    <string name="document_scan_export_dialog_title">Scegli il tipo di esportazione</string>
+    <string name="document_scan_pdf_generation_failed">Generazione PDF non riuscita</string>
+    <string name="document_scan_pdf_generation_in_progress">Generazione PDF...</string>
     <string name="done">Fatto</string>
     <string name="dontClear">Non togliere</string>
     <string name="download_latest_dev_version">Scarica l\'ultima versione di sviluppo</string>
@@ -272,6 +278,7 @@
     <string name="error_retrieving_templates">Errore durante il recupero dei modelli</string>
     <string name="error_showing_encryption_dialog">Errore nel mostrare il messaggio di cifratura impostata!</string>
     <string name="error_starting_direct_camera_upload">Errore  di avvio della fotocamera</string>
+    <string name="error_starting_doc_scan">Errore all\'avvio della scansione del documento</string>
     <string name="error_starting_scan_doc">Errore durante l\'utilizzo della scansione del documento</string>
     <string name="etm_accounts">Account</string>
     <string name="etm_background_job_name">Nome operazione</string>
@@ -418,7 +425,10 @@
     <string name="local_folder_friendly_path">%1$s/%2$s</string>
     <string name="local_folder_list_empty">Non ci sono ulteriori cartelle.</string>
     <string name="locate_folder">Trova cartella</string>
+    <string name="lock_expiration_info">Scade: %1$s</string>
     <string name="lock_file">Blocca file</string>
+    <string name="locked_by">Bloccato da %1$s</string>
+    <string name="locked_by_app">Bloccato dall\'app %1$s </string>
     <string name="log_send_mail_subject">Registri applicazione %1$s Android</string>
     <string name="log_send_no_mail_app">Non è stata trovata alcuna applicazione per inviare i log. Installa un client di posta elettronica.</string>
     <string name="login">Accedi</string>

app/src/versionDev/res/values/setup.xml

@@ -5,7 +5,7 @@
     <bool name="dev_version_direct_download_enabled">true</bool>
 
     <!-- App name  and other strings-->
-    <string name="app_name">Nextcloud dev</string>
+    <string name="app_name">Nextcloud Dev</string>
     <string name="account_type">nextcloud.beta</string>     <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.nextcloud.beta.provider</string>    <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">org.nextcloud.beta.android.providers.UsersAndGroupsSearchProvider</string>
@@ -13,7 +13,7 @@
     <string name="document_provider_authority">org.nextcloud.beta.documents</string>
     <string name="file_provider_authority">org.nextcloud.beta.files</string>
     <string name="image_cache_provider_authority">org.nextcloud.beta.android.providers.imageCache</string>
-    <string name="default_display_name_for_root_folder">Nextcloud dev</string>
+    <string name="default_display_name_for_root_folder">Nextcloud Dev</string>
     
     <bool name="logger_enabled">true</bool>
     <string name="dev_changelog">https://github.com/nextcloud/android/commits/master</string>

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         daggerVersion = "2.44.2"
         markwonVersion = "4.6.2"
         prismVersion = "2.0.0"
-        androidLibraryVersion ="01fcd84ecd9e9aef888ebcf96017d3aa6d59acfa"
+        androidLibraryVersion ="4cf2f754969617ed51e50e5c66ae1bcc686cd479"
         mockitoVersion = "4.11.0"
         mockitoKotlinVersion = "4.1.0"
         mockkVersion = "1.13.3"
@@ -16,7 +16,7 @@ buildscript {
         workRuntime = "2.7.1"
         fidoVersion = "4.1.0-patch1"
         checkerVersion = "3.21.2"
-        exoplayerVersion = "2.18.1"
+        exoplayerVersion = "2.18.2"
         documentScannerVersion = "1.0.1"
         roomVersion = "2.5.0"
 

scripts/buildDev

@@ -74,7 +74,7 @@ if git log --pretty='format:%an' HEAD "^$lastBuildTag" | grep -q dependabot; the
 fi
 
 # changelog
-echo "$changelog" > app/src/versionDev/fastlane/metadata/android/en-US/changelogs/$date.txt
+echo "$changelog" > src/versionDev/fastlane/metadata/android/en-US/changelogs/$date.txt
 
 git add .
 git commit -m "daily dev $date" -m "$changelog"

scripts/metadata/generate_metadata.py

@@ -11,8 +11,8 @@ import shutil
 from xml.etree import ElementTree
 
 XML_PATH = '../../app/src/main/res'
-METADATA_PATH = '../../app/src/generic/fastlane/metadata/android/'
+METADATA_PATH = '../../src/generic/fastlane/metadata/android/'
-METADATA_DEV_PATH = '../../app/src/versionDev/fastlane/metadata/android/'
+METADATA_DEV_PATH = '../../src/versionDev/fastlane/metadata/android/'
 DEFAULT_LANG = 'en-US'
 LANG_MAP = {
     'values': 'en-US',

src/README.md

@@ -0,0 +1,2 @@
+This `src/` directory is only here for F-Droid, as it doesn't pick up per-flavor metadata in the app/ subdir.
+Tracking issue: https://gitlab.com/fdroid/fdroidserver/-/issues/829