Merge "Switch EXTRA_MODIFY_SHARE from PendingIntent to ChooserAction" into udc-dev

3 files changed, 21 insertions, 9 deletions

diff --git a/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt b/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt
index af134fcd..98c7d5ee 100644
--- a/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt
+++ b/java/tests/src/com/android/intentresolver/ChooserActionFactoryTest.kt
@@ -33,6 +33,7 @@ import com.android.intentresolver.flags.Flags
 import com.google.common.collect.ImmutableList
 import com.google.common.truth.Truth.assertThat
 import org.junit.After
+import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -50,6 +51,7 @@ class ChooserActionFactoryTest {
     private val logger = mock<ChooserActivityLogger>()
     private val flags = mock<FeatureFlagRepository>()
     private val actionLabel = "Action label"
+    private val modifyShareLabel = "Modify share"
     private val testAction = "com.android.intentresolver.testaction"
     private val countdown = CountDownLatch(1)
     private val testReceiver: BroadcastReceiver = object : BroadcastReceiver() {
@@ -115,7 +117,8 @@ class ChooserActionFactoryTest {
     fun testModifyShareAction() {
         val factory = createFactory(includeModifyShare = true)
 
-        factory.modifyShareAction!!.run()
+        val action = factory.modifyShareAction ?: error("Modify share action should not be null")
+        action.onClicked.run()
 
         Mockito.verify(logger).logActionSelected(
             eq(ChooserActivityLogger.SELECTION_TYPE_MODIFY_SHARE))
@@ -137,7 +140,12 @@ class ChooserActionFactoryTest {
         whenever(chooserRequest.chooserActions).thenReturn(ImmutableList.of(action))
 
         if (includeModifyShare) {
-            whenever(chooserRequest.modifyShareAction).thenReturn(testPendingIntent)
+            val modifyShare = ChooserAction.Builder(
+                Icon.createWithResource("", Resources.ID_NULL),
+                modifyShareLabel,
+                testPendingIntent
+            ).build()
+            whenever(chooserRequest.modifyShareAction).thenReturn(modifyShare)
         }
 
         return ChooserActionFactory(
diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index 3bf9f1d8..596b546e 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -1726,13 +1726,17 @@ public class UnbundledChooserActivityTest {
         Context testContext = InstrumentationRegistry.getInstrumentation().getContext();
         final String modifyShareAction = "test-broadcast-receiver-action";
         Intent chooserIntent = Intent.createChooser(createSendTextIntent(), null);
+        String label = "modify share";
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(
+                testContext,
+                123,
+                new Intent(modifyShareAction),
+                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT);
+        ChooserAction action = new ChooserAction.Builder(Icon.createWithBitmap(
+                createBitmap()), label, pendingIntent).build();
         chooserIntent.putExtra(
                 Intent.EXTRA_CHOOSER_MODIFY_SHARE_ACTION,
-                PendingIntent.getBroadcast(
-                        testContext,
-                        123,
-                        new Intent(modifyShareAction),
-                        PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT));
+                action);
         // Start activity
         mActivityRule.launchActivity(chooserIntent);
         waitForIdle();
@@ -1747,7 +1751,7 @@ public class UnbundledChooserActivityTest {
         testContext.registerReceiver(testReceiver, new IntentFilter(modifyShareAction));
 
         try {
-            onView(withText(R.string.select_text)).perform(click());
+            onView(withText(label)).perform(click());
             broadcastInvoked.await();
         } finally {
             testContext.unregisterReceiver(testReceiver);
diff --git a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
index d870a8c2..23bfaf9f 100644
--- a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
+++ b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
@@ -54,7 +54,7 @@ class ChooserContentPreviewUiTest {
         override fun createEditButton(): ActionRow.Action? = null
         override fun createNearbyButton(): ActionRow.Action? = null
         override fun createCustomActions(): List<ActionRow.Action> = emptyList()
-        override fun getModifyShareAction(): Runnable? = null
+        override fun getModifyShareAction(): ActionRow.Action? = null
         override fun getExcludeSharedTextAction(): Consumer<Boolean> = Consumer<Boolean> {}
     }
     private val transitionCallback = mock<ImagePreviewView.TransitionElementStatusCallback>()