diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3474beb7a4..1e2cb0cefd 100644
--- a/.devcontainer/Dockerfile
+++ b/.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
diff --git a/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 9bf6a7f7e9..0cadc34a19 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/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();
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt
index 96cc11fc24..842a5d4b62 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt
+++ b/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
- )
- .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()
+ ).show()
}
} catch (e: IllegalArgumentException) {
Log_OC.d(TAG, e.message)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e4bb7f61a..197a931bc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -727,8 +727,6 @@
Fetching most recent version of the file.
- No resized image available. Download full image?
-
The self-hosted productivity platform that keeps you in control
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
diff --git a/build.gradle b/build.gradle
index b32ea22711..a9930ab8dc 100644
--- a/build.gradle
+++ b/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'
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index f639d14522..b1ce2018c9 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -65,6 +65,7 @@
+
@@ -5990,14 +5991,6 @@
-
-
-
-
-
-
-
-
@@ -6006,30 +5999,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-