diff --git a/app/lint.xml b/app/lint.xml index 26a65657e..cf2226aea 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -8,7 +8,13 @@ Let's just ignore issues in the Sentry code since that is a third-party dependency anyways. --> + + + + + + diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 8acd3d709..00a9911be 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -33,8 +33,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import mozilla.components.browser.search.SearchEngine -import mozilla.components.browser.session.Session import mozilla.components.browser.session.SessionManager +import mozilla.components.browser.state.state.SessionState import mozilla.components.browser.state.state.WebExtensionState import mozilla.components.browser.state.store.BrowserStore import mozilla.components.browser.tabstray.BrowserTabsTray @@ -545,7 +545,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { components.useCases.searchUseCases.newTabSearch .invoke( searchTerms, - Session.Source.USER_ENTERED, + SessionState.Source.USER_ENTERED, true, mode.isPrivate, searchEngine = engine diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 326b01b60..475052804 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -808,7 +808,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session protected open fun removeSessionIfNeeded(): Boolean { getSessionById()?.let { session -> val sessionManager = requireComponents.core.sessionManager - return if (session.source == Session.Source.ACTION_VIEW) { + return if (session.source == SessionState.Source.ACTION_VIEW) { activity?.finish() sessionManager.remove(session) true diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt index de67a087d..db76b423c 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt @@ -11,9 +11,9 @@ import androidx.annotation.VisibleForTesting import androidx.core.content.ContextCompat import kotlinx.coroutines.runBlocking import mozilla.components.browser.session.Session -import mozilla.components.browser.session.Session.Source import mozilla.components.browser.session.SessionManager import mozilla.components.browser.state.state.CustomTabConfig +import mozilla.components.browser.state.state.SessionState import mozilla.components.concept.engine.EngineSession import mozilla.components.concept.engine.manifest.WebAppManifest import mozilla.components.concept.engine.manifest.WebAppManifestParser @@ -60,7 +60,7 @@ class FennecWebAppIntentProcessor( return if (!url.isNullOrEmpty() && matches(intent)) { val webAppManifest = runBlocking { loadManifest(safeIntent, url) } - val session = Session(url, private = false, source = Source.HOME_SCREEN) + val session = Session(url, private = false, source = SessionState.Source.HOME_SCREEN) session.webAppManifest = webAppManifest session.customTabConfig = webAppManifest?.toCustomTabConfig() ?: createFallbackCustomTabConfig() diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessor.kt index fa51bcc37..cf3625956 100644 --- a/app/src/main/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessor.kt +++ b/app/src/main/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessor.kt @@ -9,6 +9,7 @@ import android.content.Intent.ACTION_VIEW import androidx.annotation.VisibleForTesting import mozilla.components.browser.session.Session import mozilla.components.browser.session.SessionManager +import mozilla.components.browser.state.state.SessionState import mozilla.components.concept.engine.EngineSession import mozilla.components.feature.intent.ext.putSessionId import mozilla.components.feature.intent.processing.IntentProcessor @@ -40,7 +41,7 @@ class FennecBookmarkShortcutsIntentProcessor( val url = safeIntent.dataString return if (!url.isNullOrEmpty() && matches(intent)) { - val session = Session(url, private = false, source = Session.Source.HOME_SCREEN) + val session = Session(url, private = false, source = SessionState.Source.HOME_SCREEN) sessionManager.add(session, selected = true) loadUrlUseCase(url, session, EngineSession.LoadUrlFlags.external()) diff --git a/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt b/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt index bd5ecc6b8..f39c8dd0f 100644 --- a/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt +++ b/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt @@ -12,7 +12,8 @@ import android.graphics.Color import android.os.Build import android.os.Build.VERSION.SDK_INT import android.util.TypedValue -import android.view.View +import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR +import android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR import android.view.Window import androidx.annotation.StyleRes import mozilla.components.support.ktx.android.content.getColorFromAttr @@ -77,7 +78,7 @@ abstract class ThemeManager { window.statusBarColor = context.getColorFromAttr(android.R.attr.statusBarColor) window.decorView.systemUiVisibility = - window.decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + window.decorView.systemUiVisibility or SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } else { window.statusBarColor = Color.BLACK } @@ -85,7 +86,7 @@ abstract class ThemeManager { if (SDK_INT >= Build.VERSION_CODES.O) { // API level can display handle light navigation bar color window.decorView.systemUiVisibility = - window.decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR + window.decorView.systemUiVisibility or SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR updateNavigationBar(window, context) } } @@ -93,8 +94,13 @@ abstract class ThemeManager { private fun clearLightSystemBars(window: Window) { if (SDK_INT >= Build.VERSION_CODES.M) { window.decorView.systemUiVisibility = window.decorView.systemUiVisibility and - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() and - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv() + SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() + } + + if (SDK_INT >= Build.VERSION_CODES.O) { + // API level can display handle light navigation bar color + window.decorView.systemUiVisibility = window.decorView.systemUiVisibility and + SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv() } } diff --git a/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml b/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml index 51eea4b84..7f5f71e4a 100644 --- a/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml +++ b/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml @@ -3,10 +3,9 @@ - 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/. --> - + android:layout_height="fill_parent"> - - + + - \ No newline at end of file + diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt index 34db89fb5..8c8751d0f 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt @@ -15,6 +15,7 @@ import io.mockk.verifyAll import kotlinx.coroutines.runBlocking import mozilla.components.browser.session.Session import mozilla.components.browser.session.SessionManager +import mozilla.components.browser.state.state.SessionState import mozilla.components.concept.engine.EngineSession import mozilla.components.feature.intent.ext.getSessionId import mozilla.components.feature.session.SessionUseCases @@ -56,7 +57,7 @@ class FennecBookmarkShortcutsIntentProcessorTest { val fennecShortcutsIntent = Intent(ACTION_FENNEC_HOMESCREEN_SHORTCUT) val testUrl = "http://mozilla.org" fennecShortcutsIntent.data = Uri.parse(testUrl) - val expectedSession = Session(testUrl, private = false, source = Session.Source.HOME_SCREEN) + val expectedSession = Session(testUrl, private = false, source = SessionState.Source.HOME_SCREEN) val wasIntentProcessed = processor.process(fennecShortcutsIntent) diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index 83590512e..e1129d311 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -3,5 +3,5 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ object AndroidComponents { - const val VERSION = "51.0.20200717130954" + const val VERSION = "51.0.20200718130042" }