Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
firefox-android
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This project is archived. Its data is
read-only
.
Show more breadcrumbs
The Tor Project
Applications
firefox-android
Commits
75972ca2
Commit
75972ca2
authored
Nov 13, 2023
by
Dan Ballard
Browse files
Options
Downloads
Patches
Plain Diff
fixup! Disable features and functionality
disable reengagement service
parent
b80a9acc
No related branches found
No related tags found
1 merge request
!38
Bug 41846: Remove more useage of nimbus
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+1
-1
1 addition, 1 deletion
fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+4
-4
4 additions, 4 deletions
fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
with
5 additions
and
5 deletions
fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+
1
−
1
View file @
75972ca2
...
...
@@ -214,7 +214,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
OpenBrowserIntentProcessor
(
this
,
::
getIntentSessionId
),
OpenSpecificTabIntentProcessor
(
this
),
OpenPasswordManagerIntentProcessor
(),
ReEngagementIntentProcessor
(
this
,
settings
()),
//
ReEngagementIntentProcessor(this, settings()),
)
}
...
...
...
...
This diff is collapsed.
Click to expand it.
fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+
4
−
4
View file @
75972ca2
...
...
@@ -651,7 +651,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var
shouldUseCookieBanner
by
lazyFeatureFlagPreference
(
appContext
.
getPreferenceKey
(
R
.
string
.
pref_key_cookie_banner_v1
),
featureFlag
=
true
,
default
=
{
tru
e
/* cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE] == 1 */
},
default
=
{
fals
e
/* cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE] == 1 */
},
)
var
userOptOutOfReEngageCookieBannerDialog
by
booleanPreference
(
...
...
@@ -672,7 +672,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
)
val
shouldShowCookieBannerUI
:
Boolean
get
()
=
tru
e
// cookieBannersSection[CookieBannersSection.FEATURE_UI] == 1
get
()
=
fals
e
// cookieBannersSection[CookieBannersSection.FEATURE_UI] == 1
/**
* Indicates after how many hours a cookie banner dialog should be shown again
...
...
@@ -801,13 +801,13 @@ class Settings(private val appContext: Context) : PreferencesHolder {
)
val
enabledTotalCookieProtection
:
Boolean
get
()
=
/*mr2022Sections[Mr2022Section.TCP_FEATURE] ==*/
tru
e
get
()
=
/*mr2022Sections[Mr2022Section.TCP_FEATURE] ==*/
fals
e
/**
* Indicates if the total cookie protection CRF feature is enabled.
*/
val
enabledTotalCookieProtectionCFR
:
Boolean
get
()
=
/* mr2022Sections[Mr2022Section.TCP_CFR] ==*/
tru
e
get
()
=
/* mr2022Sections[Mr2022Section.TCP_CFR] ==*/
fals
e
/**
* Indicates if the total cookie protection CRF should be shown.
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment