Skip to content

Commit dfffdce

Browse files
committed
Prevented image files from being previewed when a security method is configured.
1 parent 72a734d commit dfffdce

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

owncloudApp/src/main/java/com/owncloud/android/MainApp.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
/*
1+
/**
22
* ownCloud Android client application
33
*
44
* @author masensio
55
* @author David A. Velasco
66
* @author David González Verdugo
77
* @author Christian Schabesberger
88
* @author David Crespo Ríos
9-
* Copyright (C) 2020 ownCloud GmbH.
9+
* @author Fernando Sanz Velasco
10+
* Copyright (C) 2022 ownCloud GmbH.
1011
*
1112
* This program is free software: you can redistribute it and/or modify
1213
* it under the terms of the GNU General Public License version 2,
@@ -47,6 +48,7 @@ import com.owncloud.android.lib.common.OwnCloudClient
4748
import com.owncloud.android.lib.common.SingleSessionManager
4849
import com.owncloud.android.presentation.ui.authentication.LoginActivity
4950
import com.owncloud.android.presentation.ui.migration.StorageMigrationActivity
51+
import com.owncloud.android.presentation.ui.releasenotes.ReleaseNotesActivity
5052
import com.owncloud.android.presentation.ui.security.BiometricActivity
5153
import com.owncloud.android.presentation.ui.security.BiometricManager
5254
import com.owncloud.android.presentation.ui.security.LockTimeout
@@ -59,8 +61,8 @@ import com.owncloud.android.presentation.ui.settings.fragments.SettingsLogsFragm
5961
import com.owncloud.android.providers.LogsProvider
6062
import com.owncloud.android.ui.activity.FileDisplayActivity
6163
import com.owncloud.android.ui.activity.SplashActivity
62-
import com.owncloud.android.presentation.ui.releasenotes.ReleaseNotesActivity
6364
import com.owncloud.android.ui.activity.WhatsNewActivity
65+
import com.owncloud.android.ui.preview.PreviewImageActivity
6466
import com.owncloud.android.utils.DOWNLOAD_NOTIFICATION_CHANNEL_ID
6567
import com.owncloud.android.utils.DebugInjector
6668
import com.owncloud.android.utils.FILE_SYNC_CONFLICT_CHANNEL_ID

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
* @author Christian Schabesberger
88
* @author Shashvat Kedia
99
* @author Abel García de Prada
10+
* @author Fernando Sanz Velasco
1011
* Copyright (C) 2011 Bartek Przybylski
11-
* Copyright (C) 2020 ownCloud GmbH.
12+
* Copyright (C) 2022 ownCloud GmbH.
1213
*
1314
*
1415
* This program is free software: you can redistribute it and/or modify
@@ -1685,7 +1686,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
16851686
}
16861687

16871688
if (PreviewImageFragment.canBePreviewed(file)) {
1688-
startImagePreview(file)
1689+
showDetails(file)
16891690
} else {
16901691
initFragmentsWithFile()
16911692
}

0 commit comments

Comments
 (0)