Issue #4257, #4279: Move intent related code from browser-session to …

…feature-intent.
mozilla-mobile · Sep 2, 2019 · 75986cc · 75986cc
1 parent f631ed2
commit 75986cc
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 17 deletions.
diff --git a/components/feature/customtabs/build.gradle b/components/feature/customtabs/build.gradle
@@ -28,6 +28,7 @@ dependencies {
     implementation project(':concept-engine')
     implementation project(':concept-fetch')
     implementation project(':feature-session')
+    implementation project(':feature-intent')
     implementation project(':support-base')
     implementation project(':support-ktx')
     implementation project(':support-utils')

diff --git a/...ustomtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabIntentProcessor.kt b/...ustomtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabIntentProcessor.kt
@@ -9,9 +9,9 @@ import android.content.Intent.ACTION_VIEW
 import android.content.res.Resources
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.SessionManager
-import mozilla.components.browser.session.intent.IntentProcessor
-import mozilla.components.browser.session.intent.putSessionId
 import mozilla.components.concept.engine.EngineSession
+import mozilla.components.feature.intent.ext.putSessionId
+import mozilla.components.feature.intent.processing.IntentProcessor
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.support.utils.SafeIntent
 import mozilla.components.support.utils.toSafeIntent

diff --git a/...mtabs/src/test/java/mozilla/components/feature/customtabs/CustomTabIntentProcessorTest.kt b/...mtabs/src/test/java/mozilla/components/feature/customtabs/CustomTabIntentProcessorTest.kt
@@ -12,10 +12,10 @@ import kotlinx.coroutines.test.runBlockingTest
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.Session.Source
 import mozilla.components.browser.session.SessionManager
-import mozilla.components.browser.session.intent.EXTRA_SESSION_ID
 import mozilla.components.concept.engine.Engine
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
+import mozilla.components.feature.intent.ext.EXTRA_SESSION_ID
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.support.test.any
 import mozilla.components.support.test.mock

diff --git a/components/feature/intent/build.gradle b/components/feature/intent/build.gradle
@@ -26,7 +26,6 @@ android {
 dependencies {
     implementation project(':concept-engine')
     implementation project(':browser-session')
-    implementation project(':feature-customtabs')
     implementation project(':feature-search')
     implementation project(':feature-session')
     implementation project(':support-utils')

diff --git a/...rowser/session/intent/IntentExtensions.kt → ...ts/feature/intent/ext/IntentExtensions.kt b/...rowser/session/intent/IntentExtensions.kt → ...ts/feature/intent/ext/IntentExtensions.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.browser.session.intent
+package mozilla.components.feature.intent.ext
 
 import android.content.Intent
 import mozilla.components.support.utils.SafeIntent

diff --git a/...browser/session/intent/IntentProcessor.kt → ...ture/intent/processing/IntentProcessor.kt b/...browser/session/intent/IntentProcessor.kt → ...ture/intent/processing/IntentProcessor.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.browser.session.intent
+package mozilla.components.feature.intent.processing
 
 import android.content.Intent
 

diff --git a/...ents/feature/intent/TabIntentProcessor.kt → ...e/intent/processing/TabIntentProcessor.kt b/...ents/feature/intent/TabIntentProcessor.kt → ...e/intent/processing/TabIntentProcessor.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.feature.intent
+package mozilla.components.feature.intent.processing
 
 import android.content.Intent
 import android.content.Intent.ACTION_SEND
@@ -11,7 +11,6 @@ import android.content.Intent.EXTRA_TEXT
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.Session.Source
 import mozilla.components.browser.session.SessionManager
-import mozilla.components.browser.session.intent.IntentProcessor
 import mozilla.components.concept.engine.EngineSession.LoadUrlFlags
 import mozilla.components.feature.search.SearchUseCases
 import mozilla.components.feature.session.SessionUseCases

diff --git a/...er/session/intent/IntentExtensionsTest.kt → ...eature/intent/ext/IntentExtensionsTest.kt b/...er/session/intent/IntentExtensionsTest.kt → ...eature/intent/ext/IntentExtensionsTest.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.browser.session.intent
+package mozilla.components.feature.intent.ext
 
 import android.content.Intent
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/.../feature/intent/TabIntentProcessorTest.kt → ...tent/processing/TabIntentProcessorTest.kt b/.../feature/intent/TabIntentProcessorTest.kt → ...tent/processing/TabIntentProcessorTest.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package mozilla.components.feature.intent
+package mozilla.components.feature.intent.processing
 
 import android.content.Intent
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/components/feature/pwa/build.gradle b/components/feature/pwa/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     implementation project(':concept-engine')
     implementation project(':concept-fetch')
     implementation project(':feature-customtabs')
+    implementation project(':feature-intent')
     implementation project(':feature-session')
     implementation project(':support-base')
     implementation project(':support-ktx')

diff --git a/.../src/main/java/mozilla/components/feature/pwa/intent/TrustedWebActivityIntentProcessor.kt b/.../src/main/java/mozilla/components/feature/pwa/intent/TrustedWebActivityIntentProcessor.kt
@@ -17,15 +17,15 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.SessionManager
-import mozilla.components.browser.session.intent.IntentProcessor
-import mozilla.components.browser.session.intent.putSessionId
 import mozilla.components.browser.state.state.CustomTabConfig.Companion.EXTRA_ADDITIONAL_TRUSTED_ORIGINS
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.fetch.Client
 import mozilla.components.feature.customtabs.createCustomTabConfigFromIntent
 import mozilla.components.feature.customtabs.feature.OriginVerifierFeature
 import mozilla.components.feature.customtabs.isTrustedWebActivityIntent
 import mozilla.components.feature.customtabs.store.CustomTabsServiceStore
+import mozilla.components.feature.intent.ext.putSessionId
+import mozilla.components.feature.intent.processing.IntentProcessor
 import mozilla.components.feature.pwa.ext.toOrigin
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.support.utils.SafeIntent

diff --git a/.../feature/pwa/src/main/java/mozilla/components/feature/pwa/intent/WebAppIntentProcessor.kt b/.../feature/pwa/src/main/java/mozilla/components/feature/pwa/intent/WebAppIntentProcessor.kt
@@ -8,9 +8,9 @@ import android.content.Intent
 import mozilla.components.browser.session.Session
 import mozilla.components.browser.session.Session.Source
 import mozilla.components.browser.session.SessionManager
-import mozilla.components.browser.session.intent.IntentProcessor
-import mozilla.components.browser.session.intent.putSessionId
 import mozilla.components.concept.engine.EngineSession
+import mozilla.components.feature.intent.ext.putSessionId
+import mozilla.components.feature.intent.processing.IntentProcessor
 import mozilla.components.feature.pwa.ManifestStorage
 import mozilla.components.feature.pwa.ext.putWebAppManifest
 import mozilla.components.feature.pwa.ext.toCustomTabConfig

diff --git a/...ture/pwa/src/test/java/mozilla/components/feature/pwa/intent/WebAppIntentProcessorTest.kt b/...ture/pwa/src/test/java/mozilla/components/feature/pwa/intent/WebAppIntentProcessorTest.kt
@@ -10,8 +10,8 @@ import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
-import mozilla.components.browser.session.intent.getSessionId
 import mozilla.components.concept.engine.manifest.WebAppManifest
+import mozilla.components.feature.intent.ext.getSessionId
 import mozilla.components.feature.pwa.ManifestStorage
 import mozilla.components.feature.pwa.ext.getWebAppManifest
 import mozilla.components.feature.pwa.intent.WebAppIntentProcessor.Companion.ACTION_VIEW_PWA

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -38,6 +38,9 @@ permalink: /changelog/
 * **service-telemetry**
   * This component is now deprecated. Please use the [Glean SDK](https://mozilla.github.io/glean/book/index.html) instead. This library will not be removed until all projects using it start using the Glean SDK.
 
+* **browser-session**, **feature-intent**
+  * ⚠️ **This is a breaking change**: Moved `Intent` related code from `browser-session` to `feature-intent`.
+
 # 10.0.1
 
 * [Commits](https://github.com/mozilla-mobile/android-components/compare/v10.0.0...v10.0.1)

diff --git a/samples/browser/src/main/java/org/mozilla/samples/browser/BrowserActivity.kt b/samples/browser/src/main/java/org/mozilla/samples/browser/BrowserActivity.kt
@@ -11,7 +11,7 @@ import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import mozilla.components.browser.session.intent.getSessionId
+import mozilla.components.feature.intent.ext.getSessionId
 import mozilla.components.browser.tabstray.BrowserTabsTray
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.concept.tabstray.TabsTray

diff --git a/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt b/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt
@@ -30,7 +30,7 @@ import mozilla.components.concept.engine.DefaultSettings
 import mozilla.components.concept.engine.Engine
 import mozilla.components.feature.customtabs.CustomTabIntentProcessor
 import mozilla.components.feature.customtabs.store.CustomTabsServiceStore
-import mozilla.components.feature.intent.TabIntentProcessor
+import mozilla.components.feature.intent.processing.TabIntentProcessor
 import mozilla.components.feature.media.MediaFeature
 import mozilla.components.feature.media.RecordingDevicesNotificationFeature
 import mozilla.components.feature.media.state.MediaStateMachine