From 8764dfb8c1720b6bc1f8e2fbe400477cb125b9af Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Thu, 1 Jun 2023 15:19:26 -0700 Subject: Always use file or image preview UI when sending files When sending files, always use the file preivew UI (or the image preview UI, when applicable) regardless of the intent type. Fix: 285174069 Test: manual testing, unit tests Change-Id: I6f27839427b58a09ffb397ba56c2ce8401380a21 --- .../intentresolver/contentpreview/PreviewDataProviderTest.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'java/tests') diff --git a/java/tests/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt b/java/tests/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt index 2c47efa5..145b89ad 100644 --- a/java/tests/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt +++ b/java/tests/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt @@ -71,16 +71,21 @@ class PreviewDataProviderTest { } @Test - fun test_sendIntentWithTextMimeType_resolvesToTextPreviewUiSynchronously() { + fun test_sendSingleTextFileWithoutPreview_resolvesToFilePreviewUi() { + val uri = Uri.parse("content://org.pkg.app/notes.txt") val targetIntent = Intent(Intent.ACTION_SEND) .apply { + putExtra(Intent.EXTRA_STREAM, uri) type = "text/plain" } + whenever(contentResolver.getType(uri)).thenReturn("text/plain") val testSubject = PreviewDataProvider(targetIntent, contentResolver, mimeTypeClassifier, dispatcher) - assertThat(testSubject.previewType).isEqualTo(ContentPreviewType.CONTENT_PREVIEW_TEXT) - verify(contentResolver, never()).getType(any()) + assertThat(testSubject.previewType).isEqualTo(ContentPreviewType.CONTENT_PREVIEW_FILE) + assertThat(testSubject.uriCount).isEqualTo(1) + assertThat(testSubject.firstFileInfo?.uri).isEqualTo(uri) + verify(contentResolver, times(1)).getType(any()) } @Test -- cgit v1.2.3-59-g8ed1b