Firefox · Core
CVE-2025-1939
Logic Error in Core
Overview
High
Severity
—
CVSS
No
Exploited ITW
Fixed
Fix Status
Changed Functions
| Function | Change | Notes |
|---|---|---|
ifmobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt |
modified |
Files Changed
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.ktmobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
Patch
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index cf5c73b4f90..15c41299aa1 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -972,7 +972,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
return false
}
- final override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+ override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
ProfilerMarkers.addForDispatchTouchEvent(components.core.engine.profiler, ev)
return super.dispatchTouchEvent(ev)
}
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
index 774c0525a36..452f3dcbbc9 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.customtabs
import android.app.assist.AssistContent
import android.net.Uri
import android.os.Build
+import android.view.MotionEvent
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import mozilla.components.browser.state.selector.findCustomTab
@@ -24,6 +25,8 @@ const val EXTRA_IS_SANDBOX_CUSTOM_TAB = "org.mozilla.fenix.customtabs.EXTRA_IS_S
*/
@Suppress("TooManyFunctions")
open class ExternalAppBrowserActivity : HomeActivity() {
+ var isFinishedAnimating = false
+
override fun onResume() {
super.onResume()
@@ -74,4 +77,17 @@ open class ExternalAppBrowserActivity : HomeActivity() {
val currentTabUrl = getExternalTab()?.content?.url
outContent?.webUri = currentTabUrl?.let { Uri.parse(it) }
}
+
+ override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+ if (!isFinishedAnimating) {
+ return true
+ }
+
+ return super.dispatchTouchEvent(ev)
+ }
+
+ override fun onEnterAnimationComplete() {
+ super.onEnterAnimationComplete()
+ isFinishedAnimating = true
+ }
}
Loading diff…
References
On This Page