Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.isRoot
import com.owncloud.android.AbstractIT
import com.owncloud.android.ui.preview.pdf.PreviewBitmapActivity
import com.owncloud.android.utils.ScreenshotTest
import org.junit.Test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.db.OCUpload
import com.owncloud.android.files.services.NameCollisionPolicy
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.utils.FileStorageUtils
import org.hamcrest.Matchers.allOf
import org.junit.After
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
import java.io.File

class PreviewImageActivityIT : AbstractOnServerIT() {
class PreviewMediaActivityIT : AbstractOnServerIT() {
companion object {
private const val REMOTE_FOLDER: String = "/PreviewImageActivityIT/"
}
Expand Down Expand Up @@ -152,8 +152,8 @@ class PreviewImageActivityIT : AbstractOnServerIT() {
}
val expectedFileOrder = fileListTransformation(testFiles)

val intent = PreviewImageActivity.previewFileIntent(targetContext, user, expectedFileOrder.first())
launchActivity<PreviewImageActivity>(intent).use { scenario ->
val intent = PreviewMediaActivity.previewFileIntent(targetContext, user, expectedFileOrder.first())
launchActivity<PreviewMediaActivity>(intent).use { scenario ->
if (offline) {
scenario.onActivity { activity ->
activity.connectivityService = connectivityServiceMock
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
android:exported="false"
android:theme="@style/PreferenceTheme" />
<activity
android:name=".ui.preview.PreviewImageActivity"
android:name=".ui.preview.media.PreviewMediaActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
android:exported="false"
android:supportsPictureInPicture="true"
Expand Down Expand Up @@ -666,7 +666,7 @@
android:exported="false"
android:theme="@style/Theme.ownCloud.Toolbar" />
<activity
android:name=".ui.preview.PreviewBitmapActivity"
android:name=".ui.preview.pdf.PreviewBitmapActivity"
android:exported="false"
android:theme="@style/Theme.ownCloud.OverlayGrey" />
<activity
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/java/com/nextcloud/client/di/ComponentsModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ import com.owncloud.android.ui.fragment.localfilelist.LocalFileListFragment
import com.owncloud.android.ui.fragment.notifications.NotificationsFragment
import com.owncloud.android.ui.fragment.uploadList.UploadListFragment
import com.owncloud.android.ui.navigation.NavigatorActivity
import com.owncloud.android.ui.preview.FileDownloadFragment
import com.owncloud.android.ui.preview.PreviewBitmapActivity
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.ui.preview.PreviewPlaybackFragment
import com.owncloud.android.ui.preview.PreviewTextFileFragment
import com.owncloud.android.ui.preview.PreviewTextFragment
import com.owncloud.android.ui.preview.PreviewTextStringFragment
import com.owncloud.android.ui.preview.media.PreviewMediaDownloadFragment
import com.owncloud.android.ui.preview.pdf.PreviewBitmapActivity
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.ui.preview.media.PreviewMediaFragment
import com.owncloud.android.ui.preview.media.PreviewPlaybackFragment
import com.owncloud.android.ui.preview.text.PreviewTextFileFragment
import com.owncloud.android.ui.preview.text.PreviewTextFragment
import com.owncloud.android.ui.preview.text.PreviewTextStringFragment
import com.owncloud.android.ui.preview.pdf.PreviewPdfFragment
import com.owncloud.android.ui.trashbin.TrashbinFragment
import dagger.Module
Expand Down Expand Up @@ -213,7 +213,7 @@ internal interface ComponentsModule {
fun passCodeActivity(): PassCodeActivity

@ContributesAndroidInjector
fun previewImageActivity(): PreviewImageActivity
fun previewImageActivity(): PreviewMediaActivity

@ContributesAndroidInjector
fun receiveExternalFilesActivity(): ReceiveExternalFilesActivity
Expand Down Expand Up @@ -288,7 +288,7 @@ internal interface ComponentsModule {
fun contactsBackupFragment(): BackupFragment

@ContributesAndroidInjector
fun previewImageFragment(): PreviewImageFragment
fun previewImageFragment(): PreviewMediaFragment

@ContributesAndroidInjector
fun chooseContactListFragment(): BackupListFragment
Expand Down Expand Up @@ -387,7 +387,7 @@ internal interface ComponentsModule {
fun fileActivity(): FileActivity

@ContributesAndroidInjector
fun fileDownloadFragment(): FileDownloadFragment
fun fileDownloadFragment(): PreviewMediaDownloadFragment

@ContributesAndroidInjector
fun loadingDialog(): LoadingDialog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import com.owncloud.android.authentication.AuthenticatorActivity
import com.owncloud.android.operations.DownloadFileOperation
import com.owncloud.android.ui.activity.FileActivity
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.ui.preview.media.PreviewMediaFragment

class FileDownloadIntents(private val context: Context) {

Expand All @@ -31,8 +31,8 @@ class FileDownloadIntents(private val context: Context) {
}

fun detailsIntent(operation: DownloadFileOperation?): Intent = if (operation != null) {
if (PreviewImageFragment.canBePreviewed(operation.file)) {
Intent(context, PreviewImageActivity::class.java)
if (PreviewMediaFragment.canBePreviewed(operation.file)) {
Intent(context, PreviewMediaActivity::class.java)
} else {
Intent(context, FileDisplayActivity::class.java)
}.apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import com.owncloud.android.R
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.notifications.NotificationUtils
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.ui.preview.media.PreviewMediaFragment
import com.owncloud.android.utils.theme.ViewThemeUtils
import javax.inject.Inject
import javax.inject.Provider
Expand Down Expand Up @@ -70,8 +70,8 @@ class AppNotificationManagerImpl @Inject constructor(
.setContentText(content)

if (allowPreview) {
val openFileIntent = if (PreviewImageFragment.canBePreviewed(file)) {
PreviewImageActivity.previewFileIntent(context, fileOwner, file)
val openFileIntent = if (PreviewMediaFragment.canBePreviewed(file)) {
PreviewMediaActivity.previewFileIntent(context, fileOwner, file)
} else {
FileDisplayActivity.openFileIntent(context, fileOwner, file)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.nextcloud.client.player.model.file.toVirtualFolderType
import com.nextcloud.client.player.ui.audio.AudioPlayerActivity
import com.nextcloud.client.player.util.PlayerUtil.playbackFile
import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import dagger.android.AndroidInjection
import javax.inject.Inject

Expand Down Expand Up @@ -113,8 +113,8 @@ class PlaybackService : MediaSessionService() {
?: return null
val virtualFolderType = playbackResumptionConfigStore.loadConfig()?.collection?.toVirtualFolderType()

return PreviewImageActivity.previewFileIntent(this, user, file).apply {
putExtra(PreviewImageActivity.EXTRA_VIRTUAL_TYPE, virtualFolderType)
return PreviewMediaActivity.previewFileIntent(this, user, file).apply {
putExtra(PreviewMediaActivity.EXTRA_VIRTUAL_TYPE, virtualFolderType)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import com.nmc.android.ui.LauncherActivity
import com.owncloud.android.R
import com.owncloud.android.authentication.AuthenticatorActivity
import com.owncloud.android.ui.activity.ToolbarActivity
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.utils.theme.ViewThemeUtils
import dynamiccolor.MaterialDynamicColors
import javax.inject.Provider
Expand All @@ -33,7 +33,7 @@ class SystemBarBackgroundCallbacks(private val viewThemeUtilsProvider: Provider<
AuthenticatorActivity::class,
FirstRunActivity::class,
AudioPlayerActivity::class,
PreviewImageActivity::class
PreviewMediaActivity::class
)

private fun isExcluded(activity: Activity): Boolean = excludedActivities.any { it.isInstance(activity) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile;
import com.owncloud.android.ui.adapter.DiskLruImageCache;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.ui.preview.media.PreviewMediaFragment;
import com.owncloud.android.utils.BitmapUtils;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeTypeUtil;
Expand Down Expand Up @@ -391,12 +391,12 @@ protected void onPostExecute(Bitmap bitmap) {
} else {
new Thread(() -> {
if (connectivityService.isInternetWalled()) {
if (fileFragment instanceof PreviewImageFragment) {
((PreviewImageFragment) fileFragment).setNoConnectionErrorMessage();
if (fileFragment instanceof PreviewMediaFragment) {
((PreviewMediaFragment) fileFragment).setNoConnectionErrorMessage();
}
} else {
if (fileFragment instanceof PreviewImageFragment) {
((PreviewImageFragment) fileFragment).handleUnsupportedImage();
if (fileFragment instanceof PreviewMediaFragment) {
((PreviewMediaFragment) fileFragment).handleUnsupportedImage();
}
}
}).start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
import com.owncloud.android.ui.fragment.filesRepository.RemoteFilesRepository;
import com.owncloud.android.ui.helpers.CredentialsUpdateHelper;
import com.owncloud.android.ui.helpers.FileOperationsHelper;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.media.PreviewMediaActivity;
import com.owncloud.android.utils.ClipboardUtil;
import com.owncloud.android.utils.ErrorMessageAdapter;
import com.owncloud.android.utils.FilesSyncHelper;
Expand Down Expand Up @@ -220,7 +220,7 @@ protected void onCreate(Bundle savedInstanceState) {
savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID, Long.MAX_VALUE)
);
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null && !(this instanceof PreviewImageActivity)) {
if (actionBar != null && !(this instanceof PreviewMediaActivity)) {
viewThemeUtils.files.themeActionBar(this, actionBar, savedInstanceState.getString(KEY_ACTION_BAR_TITLE));
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ import com.owncloud.android.ui.helpers.UriUploader
import com.owncloud.android.ui.interfaces.TransactionInterface
import com.owncloud.android.ui.navigation.NavigatorScreen
import com.owncloud.android.ui.navigation.animator.NavigationAnimator
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.ui.preview.PreviewTextFileFragment
import com.owncloud.android.ui.preview.PreviewTextFragment
import com.owncloud.android.ui.preview.PreviewTextStringFragment
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.ui.preview.media.PreviewMediaFragment
import com.owncloud.android.ui.preview.text.PreviewTextFileFragment
import com.owncloud.android.ui.preview.text.PreviewTextFragment
import com.owncloud.android.ui.preview.text.PreviewTextStringFragment
import com.owncloud.android.ui.preview.pdf.PreviewPdfFragment.Companion.newInstance
import com.owncloud.android.utils.DataHolderUtil
import com.owncloud.android.utils.ErrorMessageAdapter
Expand Down Expand Up @@ -1849,7 +1849,7 @@ class FileDisplayActivity :
// Force the preview if the file is an image or text file
if (uploadWasFine) {
file?.let {
if (PreviewImageFragment.canBePreviewed(it)) {
if (PreviewMediaFragment.canBePreviewed(it)) {
startImagePreview(it, true)
} else if (PreviewTextFileFragment.canBePreviewed(it)) {
startTextPreview(it, true)
Expand Down Expand Up @@ -1954,7 +1954,7 @@ class FileDisplayActivity :
}

fileIDForImmediatePreview = -1
if (PreviewImageFragment.canBePreviewed(currentFile)) {
if (PreviewMediaFragment.canBePreviewed(currentFile)) {
startImagePreview(currentFile, currentFile.isDown)
} else {
previewFile(currentFile, null)
Expand Down Expand Up @@ -2114,7 +2114,7 @@ class FileDisplayActivity :
}

fun canPreviewInMediaPager(file: OCFile?): Boolean =
PreviewImageFragment.canBePreviewed(file) || (file != null && MimeTypeUtil.isVideo(file))
PreviewMediaFragment.canBePreviewed(file) || (file != null && MimeTypeUtil.isVideo(file))

fun previewImageWithSearchContext(
file: OCFile,
Expand Down Expand Up @@ -2780,12 +2780,12 @@ class FileDisplayActivity :
return null
}

return Intent(this, PreviewImageActivity::class.java).apply {
return Intent(this, PreviewMediaActivity::class.java).apply {
putExtra(EXTRA_FILE, file)
putExtra(EXTRA_LIVE_PHOTO_FILE, file.livePhotoVideo)
putExtra(EXTRA_USER, user.get())
type?.let { putExtra(PreviewImageActivity.EXTRA_VIRTUAL_TYPE, it) }
mediaState?.let { putExtra(PreviewImageActivity.EXTRA_MEDIA_STATE, it) }
type?.let { putExtra(PreviewMediaActivity.EXTRA_VIRTUAL_TYPE, it) }
mediaState?.let { putExtra(PreviewMediaActivity.EXTRA_MEDIA_STATE, it) }
}
}

Expand Down Expand Up @@ -3010,13 +3010,13 @@ class FileDisplayActivity :
startTextPreview(file, true)
} else if (event.intent.getBooleanExtra(AUDIO_PREVIEW, false)) {
startAudioPreview(file, true, true)
} else if (bundle.containsKey(PreviewImageActivity.EXTRA_VIRTUAL_TYPE)) {
val virtualType = bundle.get(PreviewImageActivity.EXTRA_VIRTUAL_TYPE) as VirtualFolderType?
} else if (bundle.containsKey(PreviewMediaActivity.EXTRA_VIRTUAL_TYPE)) {
val virtualType = bundle.get(PreviewMediaActivity.EXTRA_VIRTUAL_TYPE) as VirtualFolderType?
startImagePreview(
file,
true,
virtualType,
bundle.getSerializableArgument(PreviewImageActivity.EXTRA_MEDIA_STATE, MediaState::class.java),
bundle.getSerializableArgument(PreviewMediaActivity.EXTRA_MEDIA_STATE, MediaState::class.java),
galleryThumbnailOf(file)
)
} else {
Expand Down Expand Up @@ -3410,7 +3410,7 @@ class FileDisplayActivity :

@JvmStatic
fun openFileIntent(context: Context?, user: User?, file: OCFile?): Intent {
val intent = Intent(context, PreviewImageActivity::class.java)
val intent = Intent(context, PreviewMediaActivity::class.java)
intent.putExtra(EXTRA_FILE, file)
intent.putExtra(EXTRA_USER, user)
return intent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import com.owncloud.android.lib.resources.status.OCCapability
import com.owncloud.android.ui.activity.DrawerActivity
import com.owncloud.android.ui.adapter.filelist.recommended.RecommendedFilesAdapter
import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
import com.owncloud.android.ui.preview.PreviewTextFragment
import com.owncloud.android.ui.preview.text.PreviewTextFragment
import com.owncloud.android.utils.theme.ViewThemeUtils

@Suppress("LongParameterList")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.ui.activity.ConflictsResolveActivity
import com.owncloud.android.ui.activity.DrawerActivity
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.ui.preview.media.PreviewMediaFragment
import com.owncloud.android.utils.MimeType
import com.owncloud.android.utils.MimeTypeUtil
import java.io.File
Expand Down Expand Up @@ -64,7 +64,7 @@ class UploadListAdapterHelper(private val activity: DrawerActivity) {
}

val optionalUser = activity.user
if (PreviewImageFragment.canBePreviewed(file) && optionalUser.isPresent) {
if (PreviewMediaFragment.canBePreviewed(file) && optionalUser.isPresent) {
// show image preview and stay in uploads tab
val intent = FileDisplayActivity.openFileIntent(activity, optionalUser.get(), file)
activity.startActivity(intent)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import com.owncloud.android.ui.activity.FileActivity
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.interfaces.ActivityListInterface
import com.owncloud.android.ui.navigation.NavigatorActivity
import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.PreviewImageFragment.Companion.canBePreviewed
import com.owncloud.android.ui.preview.media.PreviewMediaActivity
import com.owncloud.android.ui.preview.media.PreviewMediaFragment.Companion.canBePreviewed
import com.owncloud.android.utils.theme.ViewThemeUtils
import javax.inject.Inject

Expand Down Expand Up @@ -179,7 +179,7 @@ class ActivitiesFragment :
val context = context ?: return
val user = userAccountManager.user
val intent = if (canBePreviewed(ocFile)) {
Intent(context, PreviewImageActivity::class.java)
Intent(context, PreviewMediaActivity::class.java)
} else {
Intent(context, FileDisplayActivity::class.java)
}.apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ import com.owncloud.android.ui.fragment.albums.util.AlbumCollageLayout
import com.owncloud.android.ui.fragment.helper.ColumnCount
import com.owncloud.android.ui.helpers.UriUploader
import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.ui.preview.media.PreviewMediaFragment
import com.owncloud.android.utils.ClipboardUtil
import com.owncloud.android.utils.ErrorMessageAdapter
import com.owncloud.android.utils.MimeTypeUtil
Expand Down Expand Up @@ -539,7 +539,7 @@ class AlbumItemsFragment :
val activity = containerActivity as? FileDisplayActivity ?: return

when {
PreviewImageFragment.canBePreviewed(file) ->
PreviewMediaFragment.canBePreviewed(file) ->
activity.startImagePreview(file, !file.isDown, VirtualFolderType.ALBUM)

MimeTypeUtil.isVideo(file) ->
Expand Down
Loading
Loading