Merge #7658

7658: For #7563: Allow GeckoActions to be sorted r=pocmo a=sblatz
Co-authored-by: Sawyer Blatz <sdblatz@gmail.com>

components/browser/engine-gecko-beta/src/test/java/mozilla/components/browser/engine/gecko/selection/GeckoSelectionActionDelegateTest.kt

@@ -42,6 +42,9 @@ class GeckoSelectionActionDelegateTest {
             override fun isActionAvailable(id: String): Boolean = false
             override fun getActionTitle(id: String): CharSequence? = ""
             override fun performAction(id: String, selectedText: String): Boolean = false
+            override fun sortedActions(actions: Array<String>): Array<String> {
+                return actions
+            }
         }
 
         val geckoDelegate = TestGeckoSelectionActionDelegate(mock(), customDelegate)

components/browser/engine-gecko-nightly/src/test/java/mozilla/components/browser/engine/gecko/selection/GeckoSelectionActionDelegateTest.kt

@@ -42,6 +42,9 @@ class GeckoSelectionActionDelegateTest {
             override fun isActionAvailable(id: String): Boolean = false
             override fun getActionTitle(id: String): CharSequence? = ""
             override fun performAction(id: String, selectedText: String): Boolean = false
+            override fun sortedActions(actions: Array<String>): Array<String> {
+                return actions
+            }
         }
 
         val geckoDelegate = TestGeckoSelectionActionDelegate(mock(), customDelegate)

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/selection/GeckoSelectionActionDelegate.kt

@@ -37,7 +37,7 @@ open class GeckoSelectionActionDelegate(
     }
 
     override fun getAllActions(): Array<String> {
-        return super.getAllActions() + customDelegate.getAllActions()
+        return customDelegate.sortedActions(super.getAllActions() + customDelegate.getAllActions())
     }
 
     override fun isActionAvailable(id: String): Boolean {

components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/selection/GeckoSelectionActionDelegateTest.kt

@@ -42,6 +42,9 @@ class GeckoSelectionActionDelegateTest {
             override fun isActionAvailable(id: String): Boolean = false
             override fun getActionTitle(id: String): CharSequence? = ""
             override fun performAction(id: String, selectedText: String): Boolean = false
+            override fun sortedActions(actions: Array<String>): Array<String> {
+                return actions
+            }
         }
 
         val geckoDelegate = TestGeckoSelectionActionDelegate(mock(), customDelegate)

components/concept/engine/src/main/java/mozilla/components/concept/engine/selection/SelectionActionDelegate.kt

@@ -36,4 +36,11 @@ interface SelectionActionDelegate {
      * @returns [true] if the action was consumed.
      */
     fun performAction(id: String, selectedText: String): Boolean
+
+    /**
+     * Takes in a list of actions and sorts them.
+     *
+     * @returns the sorted list.
+     */
+    fun sortedActions(actions: Array<String>): Array<String>
 }

components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/DefaultSelectionActionDelegate.kt

@@ -24,7 +24,8 @@ private val customActions = arrayOf(SEARCH, SEARCH_PRIVATELY, SHARE)
 class DefaultSelectionActionDelegate(
     private val searchAdapter: SearchAdapter,
     resources: Resources,
-    private val shareTextClicked: ((String) -> Unit)? = null
+    private val shareTextClicked: ((String) -> Unit)? = null,
+    private val actionSorter: ((Array<String>) -> Array<String>)? = null
 ) : SelectionActionDelegate {
 
     private val normalSearchText =
@@ -64,4 +65,16 @@ class DefaultSelectionActionDelegate(
         }
         else -> false
     }
+
+    /**
+     * Takes in a list of actions and sorts them.
+     * @returns the sorted list.
+     */
+    override fun sortedActions(actions: Array<String>): Array<String> {
+        return if (actionSorter != null) {
+            actionSorter.invoke(actions)
+        } else {
+            actions
+        }
+    }
 }