blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: fixes master (#5777)

master
Sawyer Blatz 2019-10-03 14:42:56 -07:00 committed by GitHub
parent 371e2ac3d8
commit 841b06b02f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/FenixApplication.kt
View File

@ -136,7 +136,7 @@ open class FenixApplication : Application() {
* private mode was in use during the previous session. * private mode was in use during the previous session.
*/ */
fun maybeClearPrivateMode(settings: Settings = settings()) { fun maybeClearPrivateMode(settings: Settings = settings()) {
if (!settings.alwaysOpenInPrivateMode) settings.usePrivateMode = false if (!settings.openLinksInAPrivateTab) settings.usePrivateMode = false
} }
private fun registerRxExceptionHandling() { private fun registerRxExceptionHandling() {

2
app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
View File

@ -50,7 +50,7 @@ class IntentReceiverActivity : Activity() {
if (didLaunchPrivateLink && Browsers.all(this).isDefaultBrowser) { if (didLaunchPrivateLink && Browsers.all(this).isDefaultBrowser) {
this.settings().openLinksInAPrivateTab = true this.settings().openLinksInAPrivateTab = true
} else if (!Browsers.all(this).isDefaultBrowser) { } else if (!Browsers.all(this).isDefaultBrowser) {
/* If the user has unset us as the default browser, unset alwaysOpenInPrivateMode */ /* If the user has unset us as the default browser, unset openLinksInAPrivateTab */
this.settings().openLinksInAPrivateTab = false this.settings().openLinksInAPrivateTab = false
} }

8
app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
View File

@ -30,8 +30,8 @@ class FenixApplicationTest {
} }
@Test @Test
fun `GIVEN alwaysOpenInPrivateMode is active WHEN maybeClearPrivateMode is called THEN private mode should not be changed`() { fun `GIVEN openLinksInAPrivateTab is active WHEN maybeClearPrivateMode is called THEN private mode should not be changed`() {
every { settings.alwaysOpenInPrivateMode } returns true every { settings.openLinksInAPrivateTab } returns true
application.maybeClearPrivateMode(settings) application.maybeClearPrivateMode(settings)
@ -39,8 +39,8 @@ class FenixApplicationTest {
} }
@Test @Test
fun `GIVEN alwaysOpenInPrivateMode is inactive WHEN maybeClearPrivateMode is called THEN private mode should be disabled`() { fun `GIVEN openLinksInAPrivateTab is inactive WHEN maybeClearPrivateMode is called THEN private mode should be disabled`() {
every { settings.alwaysOpenInPrivateMode } returns false every { settings.openLinksInAPrivateTab } returns false
application.maybeClearPrivateMode(settings) application.maybeClearPrivateMode(settings)

4
docs/metrics.md
View File

File diff suppressed because one or more lines are too long