diff options
| author | 2023-05-01 16:07:57 +0000 | |
|---|---|---|
| committer | 2023-05-08 16:55:38 +0000 | |
| commit | 4be9494c40c3e42485fb3d92ef44efec34faaf3d (patch) | |
| tree | bfda4410926fa2a435ccf2d65e9552aa37a72031 | |
| parent | d6a6ea70bb58be3f65da5ee8b1a5aee1849ca30b (diff) | |
Limit chooser actions to 5
Bug: 280288715
Test: atest ChooserRequestParametersTest
Test: manual testing with > 5 actions from ShareTest
Change-Id: I32a1e616e1fb3642db190c4a76de4fb0f5b7b39a
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserRequestParameters.java | 2 | ||||
| -rw-r--r-- | java/tests/src/com/android/intentresolver/ChooserRequestParametersTest.kt | 88 |
2 files changed, 90 insertions, 0 deletions
diff --git a/java/src/com/android/intentresolver/ChooserRequestParameters.java b/java/src/com/android/intentresolver/ChooserRequestParameters.java index b3f5a722..5157986b 100644 --- a/java/src/com/android/intentresolver/ChooserRequestParameters.java +++ b/java/src/com/android/intentresolver/ChooserRequestParameters.java @@ -68,6 +68,7 @@ public class ChooserRequestParameters { private static final int LAUNCH_FLAGS_FOR_SEND_ACTION = Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK; + private static final int MAX_CHOOSER_ACTIONS = 5; private final Intent mTarget; private final String mReferrerPackageName; @@ -322,6 +323,7 @@ public class ChooserRequestParameters { true, true) .filter(UriFilters::hasValidIcon) + .limit(MAX_CHOOSER_ACTIONS) .collect(toImmutableList()); } diff --git a/java/tests/src/com/android/intentresolver/ChooserRequestParametersTest.kt b/java/tests/src/com/android/intentresolver/ChooserRequestParametersTest.kt new file mode 100644 index 00000000..331d1c21 --- /dev/null +++ b/java/tests/src/com/android/intentresolver/ChooserRequestParametersTest.kt @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.intentresolver + +import android.app.PendingIntent +import android.content.Intent +import android.graphics.drawable.Icon +import android.net.Uri +import android.service.chooser.ChooserAction +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class ChooserRequestParametersTest { + val flags = TestFeatureFlagRepository(mapOf()) + + @Test + fun testChooserActions() { + val actionCount = 3 + val intent = Intent(Intent.ACTION_SEND) + val actions = createChooserActions(actionCount) + val chooserIntent = + Intent(Intent.ACTION_CHOOSER).apply { + putExtra(Intent.EXTRA_INTENT, intent) + putExtra(Intent.EXTRA_CHOOSER_CUSTOM_ACTIONS, actions) + } + val request = ChooserRequestParameters(chooserIntent, "", Uri.EMPTY, flags) + assertThat(request.chooserActions).containsExactlyElementsIn(actions).inOrder() + } + + @Test + fun testChooserActions_empty() { + val intent = Intent(Intent.ACTION_SEND) + val chooserIntent = + Intent(Intent.ACTION_CHOOSER).apply { putExtra(Intent.EXTRA_INTENT, intent) } + val request = ChooserRequestParameters(chooserIntent, "", Uri.EMPTY, flags) + assertThat(request.chooserActions).isEmpty() + } + + @Test + fun testChooserActions_tooMany() { + val intent = Intent(Intent.ACTION_SEND) + val chooserActions = createChooserActions(10) + val chooserIntent = + Intent(Intent.ACTION_CHOOSER).apply { + putExtra(Intent.EXTRA_INTENT, intent) + putExtra(Intent.EXTRA_CHOOSER_CUSTOM_ACTIONS, chooserActions) + } + + val request = ChooserRequestParameters(chooserIntent, "", Uri.EMPTY, flags) + + val expectedActions = chooserActions.sliceArray(0 until 5) + assertThat(request.chooserActions).containsExactlyElementsIn(expectedActions).inOrder() + } + + private fun createChooserActions(count: Int): Array<ChooserAction> { + return Array(count) { i -> createChooserAction("$i") } + } + + private fun createChooserAction(label: CharSequence): ChooserAction { + val icon = Icon.createWithContentUri("content://org.package.app/image") + val pendingIntent = + PendingIntent.getBroadcast( + InstrumentationRegistry.getInstrumentation().getTargetContext(), + 0, + Intent("TESTACTION"), + PendingIntent.FLAG_IMMUTABLE + ) + return ChooserAction.Builder(icon, label, pendingIntent).build() + } +} |