Unverified Commit c211ca85 authored Sep 30, 2020 by Matthew Finkel

Merge branch 'bug_40041_09' into tor-browser-81.1.1-10.0-1

parents 0a4fbe8a 313a51e8

Branches

No related tags found

1 merge request!26Bug 40041 09

Show whitespace changes

Inline Side-by-side

Showing

app/src/main/java/org/mozilla/fenix/FenixApplication.kt 10 additions, 0 deletions

app/src/main/java/org/mozilla/fenix/FenixApplication.kt
app/src/main/java/org/mozilla/fenix/HomeActivity.kt 0 additions, 9 deletions

app/src/main/java/org/mozilla/fenix/HomeActivity.kt
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt 101 additions, 14 deletions

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
app/src/main/java/org/mozilla/fenix/home/Mode.kt 4 additions, 1 deletion

app/src/main/java/org/mozilla/fenix/home/Mode.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt 14 additions, 4 deletions

...lla/fenix/home/sessioncontrol/SessionControlController.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt 14 additions, 5 deletions

...lla/fenix/home/sessioncontrol/SessionControlInteractor.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt 0 additions, 2 deletions

...ntrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt 34 additions, 18 deletions

...ssioncontrol/viewholders/TorBootstrapConnectViewHolder.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt 14 additions, 14 deletions

...essioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt 0 additions, 5 deletions

...sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt 0 additions, 2 deletions

...l/viewholders/onboarding/TorOnboardingDonateViewHolder.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt 0 additions, 3 deletions

...olders/onboarding/TorOnboardingSecurityLevelViewHolder.kt
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt 1 addition, 0 deletions

...control/viewholders/torbootstrap/BootstrapPagerAdapter.kt
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt 3 additions, 0 deletions

.../main/java/org/mozilla/fenix/settings/SettingsFragment.kt
app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt 162 additions, 0 deletions

...ava/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt
app/src/main/java/org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt 162 additions, 0 deletions

.../org/mozilla/fenix/settings/TorNetworkSettingsFragment.kt
app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt 1 addition, 0 deletions

.../java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt
app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt 48 additions, 0 deletions

...rc/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt
app/src/main/java/org/mozilla/fenix/tor/TorController.kt 160 additions, 49 deletions

app/src/main/java/org/mozilla/fenix/tor/TorController.kt
app/src/main/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt 1 addition, 5 deletions

...ain/java/org/mozilla/fenix/tor/bootstrap/TorQuickStart.kt

with 729 additions and 131 deletions

Please to comment