diff options
11 files changed, 35 insertions, 142 deletions
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index c8387c4e..250edaf2 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -171,7 +171,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; import javax.inject.Inject; -import javax.inject.Provider; /** * The Chooser Activity handles intent resolution specifically for sharing intents - @@ -257,16 +256,13 @@ public class ChooserActivity extends Hilt_ChooserActivity implements @Inject @Background public CoroutineDispatcher mBackgroundDispatcher; @Inject public ChooserHelper mChooserHelper; @Inject public FeatureFlags mFeatureFlags; - @Inject public android.service.chooser.FeatureFlags mChooserServiceFeatureFlags; @Inject public EventLog mEventLog; @Inject @AppPredictionAvailable public boolean mAppPredictionAvailable; @Inject @ImageEditor public Optional<ComponentName> mImageEditor; @Inject @NearbyShare public Optional<ComponentName> mNearbyShare; - protected TargetDataLoader mTargetDataLoader; - @Inject public Provider<TargetDataLoader> mTargetDataLoaderProvider; @Inject @Caching - public Provider<TargetDataLoader> mCachingTargetDataLoaderProvider; + public TargetDataLoader mTargetDataLoader; @Inject public DevicePolicyResources mDevicePolicyResources; @Inject public ProfilePagerResources mProfilePagerResources; @Inject public PackageManager mPackageManager; @@ -345,20 +341,14 @@ public class ChooserActivity extends Hilt_ChooserActivity implements Log.i(TAG, "onCreate"); mActivityModelRepository.initialize(this::createActivityModel); - mTargetDataLoader = mChooserServiceFeatureFlags.chooserPayloadToggling() - ? mCachingTargetDataLoaderProvider.get() - : mTargetDataLoaderProvider.get(); - setTheme(R.style.Theme_DeviceDefault_Chooser); // Initializer is invoked when this function returns, via Lifecycle. mChooserHelper.setInitializer(this::initialize); - if (mChooserServiceFeatureFlags.chooserPayloadToggling()) { - mChooserHelper.setOnChooserRequestChanged(this::onChooserRequestChanged); - mChooserHelper.setOnPendingSelection(this::onPendingSelection); - if (unselectFinalItem()) { - mChooserHelper.setOnHasSelections(this::onHasSelections); - } + mChooserHelper.setOnChooserRequestChanged(this::onChooserRequestChanged); + mChooserHelper.setOnPendingSelection(this::onPendingSelection); + if (unselectFinalItem()) { + mChooserHelper.setOnHasSelections(this::onHasSelections); } } private int mInitialProfile = -1; @@ -659,8 +649,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements mEnterTransitionAnimationDelegate, new HeadlineGeneratorImpl(this), mRequest.getContentTypeHint(), - mRequest.getMetadataText(), - mChooserServiceFeatureFlags.chooserPayloadToggling()); + mRequest.getMetadataText()); updateStickyContentPreview(); if (shouldShowStickyContentPreview()) { getEventLog().logActionShareWithPreview( @@ -777,9 +766,6 @@ public class ChooserActivity extends Hilt_ChooserActivity implements } private void recreatePagerAdapter() { - if (!mChooserServiceFeatureFlags.chooserPayloadToggling()) { - return; - } destroyProfileRecords(); createProfileRecords( new AppPredictorFactory( @@ -2454,17 +2440,12 @@ public class ChooserActivity extends Hilt_ChooserActivity implements // ResolverListAdapter#mPostListReadyRunnable is executed. if (chooserListAdapter.getDisplayResolveInfoCount() == 0) { Log.d(TAG, "getDisplayResolveInfoCount() == 0"); - if (rebuildComplete && mChooserServiceFeatureFlags.chooserPayloadToggling()) { + if (rebuildComplete) { onAppTargetsLoaded(listAdapter); } chooserListAdapter.notifyDataSetChanged(); } else { - if (mChooserServiceFeatureFlags.chooserPayloadToggling()) { - chooserListAdapter.updateAlphabeticalList( - () -> onAppTargetsLoaded(listAdapter)); - } else { - chooserListAdapter.updateAlphabeticalList(); - } + chooserListAdapter.updateAlphabeticalList(() -> onAppTargetsLoaded(listAdapter)); } if (rebuildComplete) { diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java index c2bb1f23..563d7d1a 100644 --- a/java/src/com/android/intentresolver/ChooserListAdapter.java +++ b/java/src/com/android/intentresolver/ChooserListAdapter.java @@ -518,13 +518,6 @@ public class ChooserListAdapter extends ResolverListAdapter { /** * Group application targets */ - public void updateAlphabeticalList() { - updateAlphabeticalList(() -> {}); - } - - /** - * Group application targets - */ public void updateAlphabeticalList(Runnable onCompleted) { final DisplayResolveInfoAzInfoComparator comparator = new DisplayResolveInfoAzInfoComparator(mContext); diff --git a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java index 1128ec5d..4166e5ae 100644 --- a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java @@ -51,7 +51,6 @@ import java.util.function.Supplier; public final class ChooserContentPreviewUi { private final CoroutineScope mScope; - private final boolean mIsPayloadTogglingEnabled; /** * Delegate to build the default system action buttons to display in the preview layout, if/when @@ -109,11 +108,8 @@ public final class ChooserContentPreviewUi { TransitionElementStatusCallback transitionElementStatusCallback, HeadlineGenerator headlineGenerator, ContentTypeHint contentTypeHint, - @Nullable CharSequence metadata, - // TODO: replace with the FeatureFlag ref when v1 is gone - boolean isPayloadTogglingEnabled) { + @Nullable CharSequence metadata) { mScope = scope; - mIsPayloadTogglingEnabled = isPayloadTogglingEnabled; mModifyShareActionFactory = modifyShareActionFactory; mContentPreviewUi = createContentPreview( previewData, @@ -169,7 +165,7 @@ public final class ChooserContentPreviewUi { return fileContentPreviewUi; } - if (previewType == CONTENT_PREVIEW_PAYLOAD_SELECTION && mIsPayloadTogglingEnabled) { + if (previewType == CONTENT_PREVIEW_PAYLOAD_SELECTION) { transitionElementStatusCallback.onAllTransitionElementsReady(); // TODO return new ShareouselContentPreviewUi(); } diff --git a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt index 07cbaa04..d7b9077d 100644 --- a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt +++ b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt @@ -24,7 +24,6 @@ import android.provider.DocumentsContract import android.provider.DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL import android.provider.Downloads import android.provider.OpenableColumns -import android.service.chooser.Flags.chooserPayloadToggling import android.text.TextUtils import android.util.Log import androidx.annotation.OpenForTesting @@ -133,7 +132,7 @@ constructor( * IMAGE, FILE, TEXT. */ if (!targetIntent.isSend || records.isEmpty()) { CONTENT_PREVIEW_TEXT - } else if (chooserPayloadToggling() && shouldShowPayloadSelection()) { + } else if (shouldShowPayloadSelection()) { // TODO: replace with the proper flags injection CONTENT_PREVIEW_PAYLOAD_SELECTION } else { diff --git a/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt b/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt index 86ebb9d9..d0bd9740 100644 --- a/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt +++ b/java/src/com/android/intentresolver/icons/TargetDataLoaderModule.kt @@ -31,16 +31,13 @@ import dagger.hilt.android.scopes.ActivityScoped object TargetDataLoaderModule { @Provides @ActivityScoped - fun targetDataLoader( - @ActivityContext context: Context, - @ActivityOwned lifecycle: Lifecycle, - ): TargetDataLoader = DefaultTargetDataLoader(context, lifecycle, isAudioCaptureDevice = false) - - @Provides - @ActivityScoped @Caching fun cachingTargetDataLoader( @ActivityContext context: Context, - targetDataLoader: TargetDataLoader, - ): TargetDataLoader = CachingTargetDataLoader(context, targetDataLoader) + @ActivityOwned lifecycle: Lifecycle, + ): TargetDataLoader = + CachingTargetDataLoader( + context, + DefaultTargetDataLoader(context, lifecycle, isAudioCaptureDevice = false), + ) } diff --git a/java/src/com/android/intentresolver/inject/ActivityModelModule.kt b/java/src/com/android/intentresolver/inject/ActivityModelModule.kt index 5b92c05b..60eff925 100644 --- a/java/src/com/android/intentresolver/inject/ActivityModelModule.kt +++ b/java/src/com/android/intentresolver/inject/ActivityModelModule.kt @@ -49,11 +49,10 @@ object ActivityModelModule { fun provideInitialRequest( activityModelRepo: ActivityModelRepository, savedStateHandle: SavedStateHandle, - flags: ChooserServiceFlags, ): ValidationResult<ChooserRequest> { val activityModel = activityModelRepo.value val extras = restoreChooserRequestExtras(activityModel.intent.extras, savedStateHandle) - return readChooserRequest(activityModel, flags, extras) + return readChooserRequest(activityModel, extras) } @Provides diff --git a/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt b/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt index 846cae9e..1644e409 100644 --- a/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt +++ b/java/src/com/android/intentresolver/ui/viewmodel/ChooserRequestReader.kt @@ -48,7 +48,6 @@ import com.android.intentresolver.R import com.android.intentresolver.data.model.ChooserRequest import com.android.intentresolver.ext.hasSendAction import com.android.intentresolver.ext.ifMatch -import com.android.intentresolver.inject.ChooserServiceFlags import com.android.intentresolver.shared.model.ActivityModel import com.android.intentresolver.util.hasValidIcon import com.android.intentresolver.validation.Validation @@ -69,7 +68,6 @@ internal fun Intent.maybeAddSendActionFlags() = fun readChooserRequest( model: ActivityModel, - flags: ChooserServiceFlags, savedState: Bundle = model.intent.extras ?: Bundle(), ): ValidationResult<ChooserRequest> { @Suppress("DEPRECATION") @@ -126,7 +124,7 @@ fun readChooserRequest( val additionalContentUri: Uri? val focusedItemPos: Int - if (isSendAction && flags.chooserPayloadToggling()) { + if (isSendAction) { additionalContentUri = optional(value<Uri>(EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI)) focusedItemPos = optional(value<Int>(EXTRA_CHOOSER_FOCUSED_ITEM_POSITION)) ?: 0 } else { diff --git a/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt b/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt index 2292a63c..8597d802 100644 --- a/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt +++ b/java/src/com/android/intentresolver/ui/viewmodel/ChooserViewModel.kt @@ -32,7 +32,6 @@ import com.android.intentresolver.data.repository.ActivityModelRepository import com.android.intentresolver.data.repository.ChooserRequestRepository import com.android.intentresolver.domain.saveUpdates import com.android.intentresolver.inject.Background -import com.android.intentresolver.inject.ChooserServiceFlags import com.android.intentresolver.shared.model.ActivityModel import com.android.intentresolver.validation.Invalid import com.android.intentresolver.validation.Valid @@ -59,7 +58,6 @@ constructor( private val processUpdatesInteractor: Lazy<ProcessTargetIntentUpdatesInteractor>, private val fetchPreviewsInteractor: Lazy<FetchPreviewsInteractor>, @Background private val bgDispatcher: CoroutineDispatcher, - private val flags: ChooserServiceFlags, /** * Provided only for the express purpose of early exit in the event of an invalid request. * @@ -77,10 +75,6 @@ constructor( val shareouselViewModel: ShareouselViewModel by lazy { // TODO: consolidate this logic, this would require a consolidated preview view model but // for now just postpone starting the payload selection preview machinery until it's needed - assert(flags.chooserPayloadToggling()) { - "An attempt to use payload selection preview with the disabled flag" - } - viewModelScope.launch(bgDispatcher) { processUpdatesInteractor.get().activate() } viewModelScope.launch(bgDispatcher) { fetchPreviewsInteractor.get().activate() } shareouselViewModelProvider.get() diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt index 905c8517..ef0703e6 100644 --- a/tests/unit/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt +++ b/tests/unit/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt @@ -61,11 +61,7 @@ class ChooserContentPreviewUiTest { private val transitionCallback = mock<ImagePreviewView.TransitionElementStatusCallback>() @get:Rule val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() - private fun createContentPreviewUi( - action: String, - sharedText: CharSequence? = null, - isPayloadTogglingEnabled: Boolean = false - ) = + private fun createContentPreviewUi(action: String, sharedText: CharSequence? = null) = ChooserContentPreviewUi( testScope, previewData, @@ -81,7 +77,6 @@ class ChooserContentPreviewUiTest { headlineGenerator, ContentTypeHint.NONE, testMetadataText, - isPayloadTogglingEnabled, ) @Test @@ -114,10 +109,7 @@ class ChooserContentPreviewUiTest { .thenReturn(FileInfo.Builder(uri).withPreviewUri(uri).withMimeType("image/png").build()) whenever(previewData.imagePreviewFileInfoFlow).thenReturn(MutableSharedFlow()) val testSubject = - createContentPreviewUi( - action = Intent.ACTION_SEND, - sharedText = "Shared text", - ) + createContentPreviewUi(action = Intent.ACTION_SEND, sharedText = "Shared text") assertThat(testSubject.mContentPreviewUi) .isInstanceOf(FilesPlusTextContentPreviewUi::class.java) verify(previewData, times(1)).imagePreviewFileInfoFlow @@ -150,11 +142,7 @@ class ChooserContentPreviewUiTest { whenever(previewData.firstFileInfo) .thenReturn(FileInfo.Builder(uri).withPreviewUri(uri).withMimeType("image/png").build()) whenever(previewData.imagePreviewFileInfoFlow).thenReturn(MutableSharedFlow()) - val testSubject = - createContentPreviewUi( - action = Intent.ACTION_SEND, - isPayloadTogglingEnabled = true, - ) + val testSubject = createContentPreviewUi(action = Intent.ACTION_SEND) assertThat(testSubject.mContentPreviewUi) .isInstanceOf(ShareouselContentPreviewUi::class.java) assertThat(testSubject.preferredContentPreview) diff --git a/tests/unit/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt b/tests/unit/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt index 3dae760c..9884a675 100644 --- a/tests/unit/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt +++ b/tests/unit/src/com/android/intentresolver/contentpreview/PreviewDataProviderTest.kt @@ -21,14 +21,12 @@ import android.content.Intent import android.database.MatrixCursor import android.media.MediaMetadata import android.net.Uri -import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.FlagsParameterization import android.platform.test.flag.junit.SetFlagsRule import android.provider.DocumentsContract import android.provider.Downloads import android.provider.OpenableColumns -import android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING import com.android.intentresolver.Flags.FLAG_INDIVIDUAL_METADATA_TITLE_READ import com.google.common.truth.Truth.assertThat import kotlin.coroutines.EmptyCoroutineContext @@ -493,7 +491,6 @@ class PreviewDataProviderTest(flags: FlagsParameterization) { } @Test - @EnableFlags(FLAG_CHOOSER_PAYLOAD_TOGGLING) fun sendImageWithAdditionalContentUri_showPayloadTogglingUi() { val uri = Uri.parse("content://org.pkg.app/image.png") val targetIntent = Intent(Intent.ACTION_SEND).apply { putExtra(Intent.EXTRA_STREAM, uri) } @@ -513,26 +510,6 @@ class PreviewDataProviderTest(flags: FlagsParameterization) { } @Test - @DisableFlags(FLAG_CHOOSER_PAYLOAD_TOGGLING) - fun sendImageWithAdditionalContentUriAndDisabledFlag_showImagePreviewUi() { - val uri = Uri.parse("content://org.pkg.app/image.png") - val targetIntent = Intent(Intent.ACTION_SEND).apply { putExtra(Intent.EXTRA_STREAM, uri) } - whenever(contentResolver.getType(uri)).thenReturn("image/png") - val testSubject = - createDataProvider( - targetIntent, - additionalContentUri = Uri.parse("content://org.pkg.app.extracontent"), - ) - - assertThat(testSubject.previewType).isEqualTo(ContentPreviewType.CONTENT_PREVIEW_IMAGE) - assertThat(testSubject.uriCount).isEqualTo(1) - assertThat(testSubject.firstFileInfo?.uri).isEqualTo(uri) - assertThat(testSubject.firstFileInfo?.previewUri).isEqualTo(uri) - verify(contentResolver, times(1)).getType(any()) - } - - @Test - @EnableFlags(FLAG_CHOOSER_PAYLOAD_TOGGLING) fun sendItemsWithAdditionalContentUriWithSameAuthority_showImagePreviewUi() { val uri = Uri.parse("content://org.pkg.app/image.png") val targetIntent = Intent(Intent.ACTION_SEND).apply { putExtra(Intent.EXTRA_STREAM, uri) } diff --git a/tests/unit/src/com/android/intentresolver/ui/viewmodel/ChooserRequestTest.kt b/tests/unit/src/com/android/intentresolver/ui/viewmodel/ChooserRequestTest.kt index 7bd4edee..71f28950 100644 --- a/tests/unit/src/com/android/intentresolver/ui/viewmodel/ChooserRequestTest.kt +++ b/tests/unit/src/com/android/intentresolver/ui/viewmodel/ChooserRequestTest.kt @@ -28,12 +28,10 @@ import android.content.Intent.EXTRA_REFERRER import android.content.Intent.EXTRA_TEXT import android.content.Intent.EXTRA_TITLE import android.net.Uri -import android.service.chooser.Flags import androidx.core.net.toUri import androidx.core.os.bundleOf import com.android.intentresolver.ContentTypeHint import com.android.intentresolver.data.model.ChooserRequest -import com.android.intentresolver.inject.FakeChooserServiceFlags import com.android.intentresolver.shared.model.ActivityModel import com.android.intentresolver.validation.Importance import com.android.intentresolver.validation.Invalid @@ -59,13 +57,10 @@ private fun createActivityModel( class ChooserRequestTest { - private val fakeChooserServiceFlags = - FakeChooserServiceFlags().apply { setFlag(Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING, false) } - @Test fun missingIntent() { val model = createActivityModel(targetIntent = null) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Invalid::class.java) result as Invalid<ChooserRequest> @@ -80,7 +75,7 @@ class ChooserRequestTest { val model = createActivityModel(targetIntent = Intent(ACTION_SEND), referrer) model.intent.putExtras(bundleOf(EXTRA_REFERRER to referrer)) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -97,7 +92,7 @@ class ChooserRequestTest { val model = createActivityModel(targetIntent = intent, referrer = referrer) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -112,7 +107,7 @@ class ChooserRequestTest { model.intent.putExtras(bundleOf(EXTRA_REFERRER to referrer)) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -126,7 +121,7 @@ class ChooserRequestTest { val intent2 = Intent(ACTION_SEND_MULTIPLE) val model = createActivityModel(targetIntent = intent1, additionalIntents = listOf(intent2)) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -139,7 +134,7 @@ class ChooserRequestTest { val intent = Intent().putExtras(bundleOf(EXTRA_INTENT to Intent(ACTION_SEND))) val model = createActivityModel(targetIntent = intent) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -149,7 +144,6 @@ class ChooserRequestTest { @Test fun testRequest_actionSendWithAdditionalContentUri() { - fakeChooserServiceFlags.setFlag(Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING, true) val uri = Uri.parse("content://org.pkg/path") val position = 10 val model = @@ -158,7 +152,7 @@ class ChooserRequestTest { intent.putExtra(EXTRA_CHOOSER_FOCUSED_ITEM_POSITION, position) } - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -168,35 +162,14 @@ class ChooserRequestTest { } @Test - fun testRequest_actionSendWithAdditionalContentUri_parametersIgnoredWhenFlagDisabled() { - fakeChooserServiceFlags.setFlag(Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING, false) - val uri = Uri.parse("content://org.pkg/path") - val position = 10 - val model = - createActivityModel(targetIntent = Intent(ACTION_SEND)).apply { - intent.putExtra(EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI, uri) - intent.putExtra(EXTRA_CHOOSER_FOCUSED_ITEM_POSITION, position) - } - val result = readChooserRequest(model, fakeChooserServiceFlags) - - assertThat(result).isInstanceOf(Valid::class.java) - result as Valid<ChooserRequest> - - assertThat(result.value.additionalContentUri).isNull() - assertThat(result.value.focusedItemPosition).isEqualTo(0) - assertThat(result.warnings).isEmpty() - } - - @Test fun testRequest_actionSendWithInvalidAdditionalContentUri() { - fakeChooserServiceFlags.setFlag(Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING, true) val model = createActivityModel(targetIntent = Intent(ACTION_SEND)).apply { intent.putExtra(EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI, "__invalid__") intent.putExtra(EXTRA_CHOOSER_FOCUSED_ITEM_POSITION, "__invalid__") } - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -207,10 +180,9 @@ class ChooserRequestTest { @Test fun testRequest_actionSendWithoutAdditionalContentUri() { - fakeChooserServiceFlags.setFlag(Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING, true) val model = createActivityModel(targetIntent = Intent(ACTION_SEND)) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -221,7 +193,6 @@ class ChooserRequestTest { @Test fun testRequest_actionViewWithAdditionalContentUri() { - fakeChooserServiceFlags.setFlag(Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING, true) val uri = Uri.parse("content://org.pkg/path") val position = 10 val model = @@ -230,7 +201,7 @@ class ChooserRequestTest { intent.putExtra(EXTRA_CHOOSER_FOCUSED_ITEM_POSITION, position) } - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -248,7 +219,7 @@ class ChooserRequestTest { Intent.CHOOSER_CONTENT_TYPE_ALBUM, ) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -266,7 +237,7 @@ class ChooserRequestTest { intent.putExtra(Intent.EXTRA_METADATA_TEXT, metadataText) } - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) result as Valid<ChooserRequest> @@ -285,7 +256,7 @@ class ChooserRequestTest { } val model = createActivityModel(targetIntent) - val result = readChooserRequest(model, fakeChooserServiceFlags) + val result = readChooserRequest(model) assertThat(result).isInstanceOf(Valid::class.java) (result as Valid<ChooserRequest>).value.let { request -> |