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

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a8038616808f04e34a9ab63ee
+FROM ubuntu:noble@sha256:dfc10878be8d8fc9c61cbff33166cb1d1fe44391539243703c72766894fa834a
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk

app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -474,7 +474,7 @@ public final class ThumbnailsCacheManager {
                             }
                         } else {
                             if (fileFragment instanceof PreviewImageFragment) {
-                                ((PreviewImageFragment) fileFragment).setErrorPreviewMessage();
+                                ((PreviewImageFragment) fileFragment).handleUnsupportedImage();
                             }
                         }
                     }).start();

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt

@@ -721,28 +721,14 @@ class PreviewImageFragment : FileFragment(), Injectable {
         binding.emptyListProgress.visibility = View.GONE
     }
 
-    fun setErrorPreviewMessage() {
+    fun handleUnsupportedImage() {
         try {
-            if (activity != null) {
+            (activity as? PreviewImageActivity)?.requestForDownload(file) ?: context?.let {
                 Snackbar.make(
                     binding.emptyListView,
-                    R.string.resized_image_not_possible_download,
+                    resources.getString(R.string.could_not_download_image),
                     Snackbar.LENGTH_INDEFINITE
-                )
+                ).show()
-                    .setAction(
-                        R.string.common_yes
-                    ) { v: View? ->
-                        val activity = activity as PreviewImageActivity?
-                        if (activity != null) {
-                            activity.requestForDownload(file)
-                        } else if (context != null) {
-                            Snackbar.make(
-                                binding.emptyListView,
-                                resources.getString(R.string.could_not_download_image),
-                                Snackbar.LENGTH_INDEFINITE
-                            ).show()
-                        }
-                    }.show()
             }
         } catch (e: IllegalArgumentException) {
             Log_OC.d(TAG, e.message)

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

@@ -727,8 +727,6 @@
 
     <string name="sync_in_progress">Fetching most recent version of the file.</string>
 
-    <string name="resized_image_not_possible_download">No resized image available. Download full image?</string>
-
     <string name="store_short_desc">The self-hosted productivity platform that keeps you in control</string>
     <string name="store_full_desc">The self-hosted productivity platform that keeps you in control.\n\nFeatures:\n* Easy, modern interface, suited to the theme of your server\n* Upload files to your Nextcloud server\n* Share them with others\n* Keep your favorite files and folders synced\n* Search across all folders on your server\n* Auto Upload for photos and videos taken by your device\n* Keep up to date with notifications\n* Multi-account support\n* Secure access to your data with fingerprint or PIN\n* Integration with DAVx5 (formerly known as DAVdroid) for easy setup of calendar and contacts synchronization\n\nPlease report all issues at https://github.com/nextcloud/android/issues and discuss this app at https://help.nextcloud.com/c/clients/android\n\nNew to Nextcloud? Nextcloud is a private file sync and share and communication server. It is libre software, and you can host it yourself or pay a company to do it for you. That way, you are in control of your photos, your calendar and contact data, your documents and everything else.\n\nCheck out Nextcloud at https://nextcloud.com</string>
 

build.gradle

@@ -11,7 +11,7 @@
 buildscript {
     ext {
         androidLibraryVersion ="18f01f7cdffa09bbddbcb610d222fb6df46dae47"
-        androidPluginVersion = '8.6.0'
+        androidPluginVersion = '8.6.1'
         androidxMediaVersion = '1.4.0'
         androidxTestVersion = "1.6.1"
         appCompatVersion = '1.7.0'

gradle/verification-metadata.xml

@@ -65,6 +65,7 @@
             <trusting group="dev.equo.ide" name="solstice" version="1.3.1"/>
             <trusting group="dev.equo.ide" name="solstice" version="1.7.5"/>
          </trusted-key>
+         <trusted-key id="1D85469D8559C2E1DF5F925131D2D79DF7E85DD3" group="org.jcommander" name="jcommander" version="1.85"/>
          <trusted-key id="1D9AA7F9E1E2824728B8CD1794B291AEF984A085" group="io.reactivex.rxjava3"/>
          <trusted-key id="1FA868A348719E88B6D0DE24C03EF1D7D692BCFF">
             <trusting group="org.scala-lang" name="scala-library" version="2.12.13"/>
@@ -5990,14 +5991,6 @@
             <sha256 value="c29795ee883fc3364b2f16be5b9246b927271b961214f1a661b2caa2f42459a8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.nextcloud" name="android-library" version="15a1dacb4c917ff69accd268009260884ac1199e">
-         <artifact name="android-library-15a1dacb4c917ff69accd268009260884ac1199e.aar">
-            <sha256 value="55bd96fe71d188bade445d3fddeb83a67a6c76228cbc86ce99dfb99b0b08765d" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="android-library-15a1dacb4c917ff69accd268009260884ac1199e.module">
-            <sha256 value="a4199906d62366e815dae465740ed204e260d2c370fd617be09a560c8fb09c1c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.nextcloud" name="android-library" version="18f01f7cdffa09bbddbcb610d222fb6df46dae47">
          <artifact name="android-library-18f01f7cdffa09bbddbcb610d222fb6df46dae47.aar">
             <sha256 value="c6c70775d49d935e7691f43fee0ff51c2c0df03c041fd75da92cf1f0df1385a7" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6006,30 +5999,6 @@
             <sha256 value="66fc4c12f83ef0d2ae5536ebc4d808e2225129ba4668af77f03f27bd95b93934" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.github.nextcloud" name="android-library" version="1e26799720f2862b9c9c3f2e69bf36543decb37f">
-         <artifact name="android-library-1e26799720f2862b9c9c3f2e69bf36543decb37f.aar">
-            <sha256 value="c253a126ca3c32dd5b373ab1c64668e4603305b3113b052fc0fc5e3c833a913c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="android-library-1e26799720f2862b9c9c3f2e69bf36543decb37f.module">
-            <sha256 value="1a12ca601de12831df9de5c3e9cf2cece96c05f2df44f49af08f24a52e91caa7" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="com.github.nextcloud" name="android-library" version="2252d561460886cb3363ef1ff0fbd8ff3734cc63">
-         <artifact name="android-library-2252d561460886cb3363ef1ff0fbd8ff3734cc63.aar">
-            <sha256 value="c253a126ca3c32dd5b373ab1c64668e4603305b3113b052fc0fc5e3c833a913c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="android-library-2252d561460886cb3363ef1ff0fbd8ff3734cc63.module">
-            <sha256 value="0de5bee827067f36bd11de5eada28e71245a59f269d6f512761036e807709135" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="com.github.nextcloud" name="android-library" version="23ba8a757725868f989a093a68a1a6e6d7c8eb02">
-         <artifact name="android-library-23ba8a757725868f989a093a68a1a6e6d7c8eb02.aar">
-            <sha256 value="c253a126ca3c32dd5b373ab1c64668e4603305b3113b052fc0fc5e3c833a913c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="android-library-23ba8a757725868f989a093a68a1a6e6d7c8eb02.module">
-            <sha256 value="4ffcc6889711bae4c33d63d996397b2bf06f234d3e2e110e3c23c91df982860b" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.github.nextcloud" name="android-library" version="26dc8477962f12356db840bb1a774f0186b38e4d">
          <artifact name="android-library-26dc8477962f12356db840bb1a774f0186b38e4d.aar">
             <sha256 value="57ab4fd7c922875a7e0b5feac20aa27ab5df0fd3b4e042f92ed727c0b6316e81" origin="Generated by Gradle" reason="Artifact is not signed"/>