mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tobias Kaminsky 2024-02-02 02:30:56 +01:00
commit 7a57d8f49e
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -267,7 +267,7 @@ dependencies {
implementation 'commons-io:commons-io:2.13.0' implementation 'commons-io:commons-io:2.13.0'
implementation 'org.greenrobot:eventbus:3.3.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.0'
implementation 'org.lukhnos:nnio:0.2' implementation 'org.lukhnos:nnio:0.3'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.75' implementation 'org.bouncycastle:bcpkix-jdk18on:1.75'
implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1' implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1'
@ -279,7 +279,7 @@ dependencies {
exclude group: "com.android.support" exclude group: "com.android.support"
} }
implementation 'com.caverock:androidsvg:1.4' implementation 'com.caverock:androidsvg:1.4'
implementation 'androidx.annotation:annotation:1.6.0' implementation 'androidx.annotation:annotation:1.7.1'
implementation 'com.vanniktech:emoji-google:0.17.0' implementation 'com.vanniktech:emoji-google:0.17.0'
implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion" implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"

3
app/src/main/res/values-es/strings.xml
View file

@ -619,7 +619,7 @@
<string name="prefs_recommend">Recomendar a un amigo</string> <string name="prefs_recommend">Recomendar a un amigo</string>
<string name="prefs_remove_e2e">Eliminar cifrado localmente</string> <string name="prefs_remove_e2e">Eliminar cifrado localmente</string>
<string name="prefs_setup_e2e">Configurar el cifrado de extremo a extremo</string> <string name="prefs_setup_e2e">Configurar el cifrado de extremo a extremo</string>
<string name="prefs_show_ecosystem_apps">Mostrar conmutador de la app</string> <string name="prefs_show_ecosystem_apps">Mostrar conmutador de apps</string>
<string name="prefs_show_ecosystem_apps_summary">Sugerencias de Nextcloud app en encabezado de navegación</string> <string name="prefs_show_ecosystem_apps_summary">Sugerencias de Nextcloud app en encabezado de navegación</string>
<string name="prefs_show_hidden_files">Mostrar archivos ocultos</string> <string name="prefs_show_hidden_files">Mostrar archivos ocultos</string>
<string name="prefs_sourcecode">Obtener el código fuente</string> <string name="prefs_sourcecode">Obtener el código fuente</string>
@ -934,6 +934,7 @@
<string name="uploads_view_upload_status_fetching_server_version">Obteniendo la versión del servidor…</string> <string name="uploads_view_upload_status_fetching_server_version">Obteniendo la versión del servidor…</string>
<string name="uploads_view_upload_status_service_interrupted">La aplicación se ha interrumpido</string> <string name="uploads_view_upload_status_service_interrupted">La aplicación se ha interrumpido</string>
<string name="uploads_view_upload_status_succeeded">Completado</string> <string name="uploads_view_upload_status_succeeded">Completado</string>
<string name="uploads_view_upload_status_succeeded_same_file">Se encontró el mismo archivo en el remoto, omitiendo subida</string>
<string name="uploads_view_upload_status_unknown_fail">Error desconocido</string> <string name="uploads_view_upload_status_unknown_fail">Error desconocido</string>
<string name="uploads_view_upload_status_virus_detected">Virus detectado. ¡No se ha podido subir!</string> <string name="uploads_view_upload_status_virus_detected">Virus detectado. ¡No se ha podido subir!</string>
<string name="uploads_view_upload_status_waiting_exit_power_save_mode">Esperando a salir del modo de ahorro de batería</string> <string name="uploads_view_upload_status_waiting_exit_power_save_mode">Esperando a salir del modo de ahorro de batería</string>

9
gradle/verification-metadata.xml
View file

@ -12,6 +12,7 @@
<ignored-key id="991EFB94DB91127D" reason="Key couldn't be downloaded from any key server"/> <ignored-key id="991EFB94DB91127D" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="F13D3E721D56BD54" reason="Key couldn't be downloaded from any key server"/> <ignored-key id="F13D3E721D56BD54" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="3D002DBC5EA9615F" reason="Key couldn't be downloaded from any key server"/> <ignored-key id="3D002DBC5EA9615F" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="4F91D100EB1F597B" reason="Key couldn't be downloaded from any key server"/>
</ignored-keys> </ignored-keys>
<trusted-keys> <trusted-keys>
<trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/> <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/>
@ -7124,6 +7125,14 @@
<sha256 value="f44da04cf645323acb1fe89dd365308f91a51e7532e2cc6b27540ff6d352ef1d" origin="Generated by Gradle"/> <sha256 value="f44da04cf645323acb1fe89dd365308f91a51e7532e2cc6b27540ff6d352ef1d" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.lukhnos" name="nnio" version="0.3">
<artifact name="nnio-0.3.jar">
<sha256 value="f6666bb59ee14782b5484d86ae1bafa836c8bfc6b858f7aadec5c50ca9be015f" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
<artifact name="nnio-0.3.module">
<sha256 value="238a7a2002efa66df2cfd313be3ce22a7d206d6ebbfe6b48e0652587830cb2bd" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="org.mnode.ical4j" name="ical4j" version="3.0.0"> <component group="org.mnode.ical4j" name="ical4j" version="3.0.0">
<artifact name="ical4j-3.0.0.jar"> <artifact name="ical4j-3.0.0.jar">
<sha256 value="847ca726fab2b61b95d389a48693f0ca67fcc591a1bccc6f43057157daa433d0" origin="Generated by Gradle"/> <sha256 value="847ca726fab2b61b95d389a48693f0ca67fcc591a1bccc6f43057157daa433d0" origin="Generated by Gradle"/>

3
renovate.json5
View file

@ -1,7 +1,8 @@
{ {
"$schema": "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [ "extends": [
"config:recommended" "config:recommended",
":switchToGradleLite"
], ],
"timezone": "Europe/Berlin", "timezone": "Europe/Berlin",
"labels": [ "labels": [