Commit a3ef16e6 authored 2 years ago by akwizgran

Merge branch '83-tor-settings' into 'main'

Add setting for opting in or out of Tor bridges

Closes #83

See merge request !169

parents 6b407e03 217d57de

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

mailbox-android/src/main/AndroidManifest.xml 19 additions, 15 deletions

mailbox-android/src/main/AndroidManifest.xml
mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxPreferences.kt 1 addition, 1 deletion

...va/org/briarproject/mailbox/android/MailboxPreferences.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt 4 additions, 4 deletions

...n/java/org/briarproject/mailbox/android/MailboxService.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/BackFragment.kt 34 additions, 0 deletions

.../java/org/briarproject/mailbox/android/ui/BackFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MailboxViewModel.kt 6 additions, 0 deletions

...a/org/briarproject/mailbox/android/ui/MailboxViewModel.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt 54 additions, 40 deletions

.../java/org/briarproject/mailbox/android/ui/MainActivity.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsActivity.kt 41 additions, 0 deletions

...arproject/mailbox/android/ui/settings/SettingsActivity.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt 166 additions, 0 deletions

...arproject/mailbox/android/ui/settings/SettingsFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsStore.kt 94 additions, 0 deletions

...briarproject/mailbox/android/ui/settings/SettingsStore.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/setup/QrCodeFragment.kt 3 additions, 1 deletion

...g/briarproject/mailbox/android/ui/setup/QrCodeFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/setup/QrCodeLinkFragment.kt 6 additions, 22 deletions

...iarproject/mailbox/android/ui/setup/QrCodeLinkFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/setup/SetupCompleteFragment.kt 1 addition, 1 deletion

...project/mailbox/android/ui/setup/SetupCompleteFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/startup/InitFragment.kt 1 addition, 1 deletion

...g/briarproject/mailbox/android/ui/startup/InitFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/startup/OnboardingContainerFragment.kt 2 additions, 1 deletion

...mailbox/android/ui/startup/OnboardingContainerFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/startup/OnboardingFragment.kt 2 additions, 1 deletion

...rproject/mailbox/android/ui/startup/OnboardingFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/startup/StartupFailureActivity.kt 4 additions, 4 deletions

...ject/mailbox/android/ui/startup/StartupFailureActivity.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/startup/StartupFragment.kt 3 additions, 1 deletion

...riarproject/mailbox/android/ui/startup/StartupFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/status/ClockSkewFragment.kt 1 addition, 1 deletion

...iarproject/mailbox/android/ui/status/ClockSkewFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/status/NoNetworkFragment.kt 1 addition, 1 deletion

...iarproject/mailbox/android/ui/status/NoNetworkFragment.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/status/StatusFragment.kt 3 additions, 1 deletion

.../briarproject/mailbox/android/ui/status/StatusFragment.kt

with 446 additions and 95 deletions

Please register or to comment