From 62cb941f60138903eacdd7b1802bd55c84c48121 Mon Sep 17 00:00:00 2001 From: Fernando Sanz Date: Thu, 21 Apr 2022 09:46:22 +0200 Subject: [PATCH] Prevented image files from being previewed when a security method is configured. --- owncloudApp/src/main/java/com/owncloud/android/MainApp.kt | 3 ++- .../com/owncloud/android/ui/activity/FileDisplayActivity.kt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt b/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt index 9cb6c6ad38c..e65b7c5ed73 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt @@ -1,4 +1,4 @@ -/* +/** * ownCloud Android client application * * @author masensio @@ -7,6 +7,7 @@ * @author Christian Schabesberger * @author David Crespo Ríos * @author Juan Carlos Garrote Gascón + * @author Fernando Sanz Velasco * Copyright (C) 2022 ownCloud GmbH. * * This program is free software: you can redistribute it and/or modify diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index c0dd4703bb6..4b5ee8bda44 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -7,8 +7,9 @@ * @author Christian Schabesberger * @author Shashvat Kedia * @author Abel García de Prada + * @author Fernando Sanz Velasco * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2020 ownCloud GmbH. + * Copyright (C) 2022 ownCloud GmbH. * * * This program is free software: you can redistribute it and/or modify @@ -1685,7 +1686,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn } if (PreviewImageFragment.canBePreviewed(file)) { - startImagePreview(file) + showDetails(file) } else { initFragmentsWithFile() }