Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Mailbox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Mailbox
Commits
e8b589a3
Commit
e8b589a3
authored
2 years ago
by
Torsten Grote
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-imports' into 'main'
Fix stale import caused by merge race See merge request
!173
parents
68128fb0
cdb237f3
No related branches found
Branches containing commit
Tags
alpha-1.0.9
beta-1.0.9
release-1.0.9
1 merge request
!173
Fix stale import caused by merge race
Pipeline
#14523
passed
2 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt
+1
-1
1 addition, 1 deletion
...arproject/mailbox/android/ui/settings/SettingsFragment.kt
with
1 addition
and
1 deletion
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/settings/SettingsFragment.kt
+
1
−
1
View file @
e8b589a3
...
@@ -13,7 +13,6 @@ import kotlinx.coroutines.launch
...
@@ -13,7 +13,6 @@ import kotlinx.coroutines.launch
import
org.briarproject.mailbox.R
import
org.briarproject.mailbox.R
import
org.briarproject.mailbox.android.ui.MailboxViewModel
import
org.briarproject.mailbox.android.ui.MailboxViewModel
import
org.briarproject.mailbox.core.settings.SettingsManager
import
org.briarproject.mailbox.core.settings.SettingsManager
import
org.briarproject.mailbox.core.system.LocationUtils
import
org.briarproject.mailbox.core.tor.NetworkManager
import
org.briarproject.mailbox.core.tor.NetworkManager
import
org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO
import
org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO
import
org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO_DEFAULT
import
org.briarproject.mailbox.core.tor.TorConstants.BRIDGE_AUTO_DEFAULT
...
@@ -30,6 +29,7 @@ import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.MEEK
...
@@ -30,6 +29,7 @@ import org.briarproject.onionwrapper.CircumventionProvider.BridgeType.MEEK
import
org.briarproject.onionwrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4
import
org.briarproject.onionwrapper.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4
import
org.briarproject.onionwrapper.CircumventionProvider.BridgeType.SNOWFLAKE
import
org.briarproject.onionwrapper.CircumventionProvider.BridgeType.SNOWFLAKE
import
org.briarproject.onionwrapper.CircumventionProvider.BridgeType.VANILLA
import
org.briarproject.onionwrapper.CircumventionProvider.BridgeType.VANILLA
import
org.briarproject.onionwrapper.LocationUtils
import
javax.inject.Inject
import
javax.inject.Inject
@AndroidEntryPoint
@AndroidEntryPoint
...
...
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
register
or
sign in
to comment