Use activity name as text action ID

Author: bleroux

shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java

@@ -60,7 +60,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
           switch (method) {
             case METHOD_QUERY_TEXT_ACTIONS:
               try {
-                Map<Integer, String> actions = processTextMethodHandler.queryTextActions();
+                Map<String, String> actions = processTextMethodHandler.queryTextActions();
                 result.success(actions);
               } catch (IllegalStateException exception) {
                 result.error("error", exception.getMessage(), null);
@@ -69,7 +69,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
             case METHOD_PROCESS_TEXT_ACTION:
               try {
                 final ArrayList<Object> argumentList = (ArrayList<Object>) args;
-                int id = (int) (argumentList.get(0));
+                String id = (String) (argumentList.get(0));
                 String text = (String) (argumentList.get(1));
                 boolean readOnly = (boolean) (argumentList.get(2));
                 processTextMethodHandler.processTextAction(id, text, readOnly, result);
@@ -101,7 +101,7 @@ public void setMethodHandler(@Nullable ProcessTextMethodHandler processTextMetho
 
   public interface ProcessTextMethodHandler {
     /** Requests the map of text actions. Each text action has a unique id and a localized label. */
-    Map<Integer, String> queryTextActions();
+    Map<String, String> queryTextActions();
 
     /**
      * Requests to run a text action on a given input text.
@@ -114,7 +114,7 @@ public interface ProcessTextMethodHandler {
      * @param result The method channel result instance used to reply.
      */
     void processTextAction(
-        @NonNull int id,
+        @NonNull String id,
         @NonNull String input,
         @NonNull boolean readOnly,
         @NonNull MethodChannel.Result result);

shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java

@@ -33,7 +33,7 @@ public class ProcessTextPlugin
   @NonNull private final ProcessTextChannel processTextChannel;
   @NonNull private final PackageManager packageManager;
   @Nullable private ActivityPluginBinding activityBinding;
-  private Map<Integer, ResolveInfo> resolveInfosById;
+  private Map<String, ResolveInfo> resolveInfosById;
 
   @NonNull
   private Map<Integer, MethodChannel.Result> requestsByCode =
@@ -47,13 +47,13 @@ public ProcessTextPlugin(@NonNull ProcessTextChannel processTextChannel) {
   }
 
   @Override
-  public Map<Integer, String> queryTextActions() {
+  public Map<String, String> queryTextActions() {
     if (resolveInfosById == null) {
-      resolveInfosById = new HashMap<Integer, ResolveInfo>();
+      resolveInfosById = new HashMap<String, ResolveInfo>();
       cacheResolveInfos();
     }
-    Map<Integer, String> result = new HashMap<Integer, String>();
-    for (Integer id : resolveInfosById.keySet()) {
+    Map<String, String> result = new HashMap<String, String>();
+    for (String id : resolveInfosById.keySet()) {
       final ResolveInfo info = resolveInfosById.get(id);
       result.put(id, info.loadLabel(packageManager).toString());
     }
@@ -62,7 +62,7 @@ public Map<Integer, String> queryTextActions() {
 
   @Override
   public void processTextAction(
-      @NonNull int id,
+      @NonNull String id,
       @NonNull String text,
       @NonNull boolean readOnly,
       @NonNull MethodChannel.Result result) {
@@ -97,7 +97,8 @@ public void processTextAction(
     intent.putExtra(Intent.EXTRA_PROCESS_TEXT, text);
     intent.putExtra(Intent.EXTRA_PROCESS_TEXT_READONLY, readOnly);
 
-    // Start the text processing activity. When the activity complets, the onActivityResult callback
+    // Start the text processing activity. When the activity completes, the onActivityResult
+    // callback
     // is called.
     activityBinding.getActivity().startActivityForResult(intent, requestCode);
   }
@@ -116,12 +117,11 @@ private void cacheResolveInfos() {
       infos = packageManager.queryIntentActivities(intent, 0);
     }
 
-    // Assign an internal id for communication between the engine and the framework.
-    int index = 0;
     resolveInfosById.clear();
     for (ResolveInfo info : infos) {
+      final String id = info.activityInfo.name;
       final String label = info.loadLabel(packageManager).toString();
-      resolveInfosById.put(index++, info);
+      resolveInfosById.put(id, info);
     }
   }
 
@@ -131,7 +131,7 @@ private void cacheResolveInfos() {
    * <p>When an activity returns a value, the request is completed successfully and returns the
    * processed text.
    *
-   * <p>When an activity does not return a valuen. the request is completed successfully and returns
+   * <p>When an activity does not return a value. the request is completed successfully and returns
    * null.
    */
   @TargetApi(Build.VERSION_CODES.M)
@@ -168,7 +168,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
 
   // ActivityAware interface implementation.
   //
-  // Store the binding and manage the activity result listerner.
+  // Store the binding and manage the activity result listener.
 
   public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
     this.activityBinding = binding;

shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java

@@ -84,10 +84,8 @@ public void performQueryTextActions() {
         new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
 
     // Set up mocked result for PackageManager.queryIntentActivities.
-    ResolveInfo action1 = mock(ResolveInfo.class);
-    when(action1.loadLabel(mockPackageManager)).thenReturn("Action1");
-    ResolveInfo action2 = mock(ResolveInfo.class);
-    when(action2.loadLabel(mockPackageManager)).thenReturn("Action2");
+    ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
+    ResolveInfo action2 = createFakeResolveInfo("Action2", mockPackageManager);
     List<ResolveInfo> infos = new ArrayList<ResolveInfo>(Arrays.asList(action1, action2));
     Intent intent = new Intent().setAction(Intent.ACTION_PROCESS_TEXT).setType("text/plain");
     when(mockPackageManager.queryIntentActivities(
@@ -96,9 +94,9 @@ public void performQueryTextActions() {
 
     // ProcessTextPlugin should retrieve the mocked text actions.
     ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
-    Map<Integer, String> textActions = processTextPlugin.queryTextActions();
-    final int action1Id = 0;
-    final int action2Id = 1;
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
     assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
   }
 
@@ -121,9 +119,9 @@ public void performProcessTextActionWithNoReturnedValue() {
 
     // ProcessTextPlugin should retrieve the mocked text actions.
     ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
-    Map<Integer, String> textActions = processTextPlugin.queryTextActions();
-    final int action1Id = 0;
-    final int action2Id = 1;
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
     assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
 
     // Set up the activity binding.
@@ -170,9 +168,9 @@ public void performProcessTextActionWithReturnedValue() {
 
     // ProcessTextPlugin should retrieve the mocked text actions.
     ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
-    Map<Integer, String> textActions = processTextPlugin.queryTextActions();
-    final int action1Id = 0;
-    final int action2Id = 1;
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
     assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
 
     // Set up the activity binding.
@@ -217,7 +215,7 @@ private ResolveInfo createFakeResolveInfo(String label, PackageManager mockPacka
       packageNameField.set(activityInfo, "mockActivityPackageName");
       Field nameField = PackageItemInfo.class.getDeclaredField("name");
       nameField.setAccessible(true);
-      nameField.set(activityInfo, "mockActivityName");
+      nameField.set(activityInfo, "mockActivityName." + label);
     } catch (Exception ex) {
       // Test will failed if reflection APIs throw.
     }