Fixes mozilla-mobile#4854 - Switch back to constant request code

Author: NotWoods

components/feature/prompts/src/main/java/mozilla/components/feature/prompts/FilePicker.kt

@@ -58,7 +58,7 @@ internal class FilePicker(
             if (hasPermission && type.shouldCapture(promptRequest.mimeTypes, promptRequest.captureMode)) {
                 type.buildIntent(container.context, promptRequest)?.also {
                     saveCaptureUriIfPresent(it)
-                    container.startActivityForResult(it, R.id.mozac_feature_prompts_file_picker_activity_request_code)
+                    container.startActivityForResult(it, FILE_PICKER_ACTIVITY_REQUEST_CODE)
                     return
                 }
             }
@@ -84,7 +84,7 @@ internal class FilePicker(
                 putExtra(EXTRA_INITIAL_INTENTS, intents.toTypedArray())
             }
 
-            container.startActivityForResult(chooser, R.id.mozac_feature_prompts_file_picker_activity_request_code)
+            container.startActivityForResult(chooser, FILE_PICKER_ACTIVITY_REQUEST_CODE)
         } else {
             onNeedToRequestPermissions(neededPermissions.toTypedArray())
         }
@@ -98,7 +98,7 @@ internal class FilePicker(
      * @param intent The result of the request.
      */
     fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        if (requestCode == R.id.mozac_feature_prompts_file_picker_activity_request_code) {
+        if (requestCode == FILE_PICKER_ACTIVITY_REQUEST_CODE) {
             store.consumePromptFrom(sessionId) {
                 val request = it as File
 
@@ -170,4 +170,8 @@ internal class FilePicker(
 
     private fun saveCaptureUriIfPresent(intent: Intent) =
         intent.getParcelableExtra<Uri>(EXTRA_OUTPUT)?.let { captureUri = it }
+
+    companion object {
+        const val FILE_PICKER_ACTIVITY_REQUEST_CODE = 7113
+    }
 }

components/feature/prompts/src/main/res/values/ids.xml

@@ -22,6 +22,7 @@ import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.prompt.PromptRequest
+import mozilla.components.feature.prompts.FilePicker.Companion.FILE_PICKER_ACTIVITY_REQUEST_CODE
 import mozilla.components.support.test.any
 import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
@@ -72,12 +73,12 @@ class FilePickerTest {
 
         whenever(state.customTabs).thenReturn(listOf(customTab))
         filePicker = FilePicker(fragment, store, customTab.id) { }
-        filePicker.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, 0, null)
+        filePicker.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, 0, null)
         verify(store).dispatch(ContentAction.ConsumePromptRequestAction(customTab.id))
 
         val selected = prepareSelectedSession(request)
         filePicker = FilePicker(fragment, store) { }
-        filePicker.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, 0, null)
+        filePicker.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, 0, null)
         verify(store).dispatch(ContentAction.ConsumePromptRequestAction(selected.id))
     }
 
@@ -163,7 +164,7 @@ class FilePickerTest {
 
         stubContext()
 
-        filePicker.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, RESULT_OK, intent)
+        filePicker.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, RESULT_OK, intent)
 
         assertTrue(onSingleFileSelectionWasCalled)
         verify(store).dispatch(ContentAction.ConsumePromptRequestAction(selected.id))
@@ -197,7 +198,7 @@ class FilePickerTest {
 
         stubContext()
 
-        filePicker.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, RESULT_OK, intent)
+        filePicker.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, RESULT_OK, intent)
 
         assertTrue(onMultipleFileSelectionWasCalled)
         verify(store).dispatch(ContentAction.ConsumePromptRequestAction(selected.id))
@@ -214,7 +215,7 @@ class FilePickerTest {
         val selected = prepareSelectedSession(filePickerRequest)
         val intent = Intent()
 
-        filePicker.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, RESULT_CANCELED, intent)
+        filePicker.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, RESULT_CANCELED, intent)
 
         assertTrue(onDismissWasCalled)
         verify(store).dispatch(ContentAction.ConsumePromptRequestAction(selected.id))

components/feature/prompts/src/test/java/mozilla/components/feature/prompts/FilePickerTest.kt

@@ -37,6 +37,7 @@ import mozilla.components.concept.engine.prompt.PromptRequest.MenuChoice
 import mozilla.components.concept.engine.prompt.PromptRequest.MultipleChoice
 import mozilla.components.concept.engine.prompt.PromptRequest.SingleChoice
 import mozilla.components.concept.engine.prompt.PromptRequest.TextPrompt
+import mozilla.components.feature.prompts.FilePicker.Companion.FILE_PICKER_ACTIVITY_REQUEST_CODE
 import mozilla.components.support.test.any
 import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.mock
@@ -410,7 +411,7 @@ class PromptFeatureTest {
         intent.data = mock()
         store.dispatch(ContentAction.UpdatePromptRequestAction(tabId, filePickerRequest)).joinBlocking()
 
-        feature.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, RESULT_OK, intent)
+        feature.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, RESULT_OK, intent)
         processActions()
         assertTrue(onSingleFileSelectionWasCalled)
         assertNull(tab()?.content?.promptRequest)
@@ -442,7 +443,7 @@ class PromptFeatureTest {
 
         store.dispatch(ContentAction.UpdatePromptRequestAction(tabId, filePickerRequest)).joinBlocking()
 
-        feature.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, RESULT_OK, intent)
+        feature.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, RESULT_OK, intent)
         processActions()
         assertTrue(onMultipleFileSelectionWasCalled)
         assertNull(tab()?.content?.promptRequest)
@@ -462,7 +463,7 @@ class PromptFeatureTest {
 
         store.dispatch(ContentAction.UpdatePromptRequestAction(tabId, filePickerRequest)).joinBlocking()
 
-        feature.onActivityResult(R.id.mozac_feature_prompts_file_picker_activity_request_code, RESULT_CANCELED, intent)
+        feature.onActivityResult(FILE_PICKER_ACTIVITY_REQUEST_CODE, RESULT_CANCELED, intent)
         processActions()
         assertTrue(onDismissWasCalled)
         assertNull(tab()?.content?.promptRequest)