diff options
| author | Vincent <valodim@mugenguild.com> | 2016-03-24 14:26:03 +0100 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-03-24 14:26:03 +0100 |
| commit | f005bbad96e257c2e9a68a274504bcfbea2a178d (patch) | |
| tree | 92a20588ecfbf27435d7eafd1f1fff558e6130b6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | c4de57d4f6f58c946409d2982a5bbb5627d09244 (diff) | |
| parent | cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638 (diff) | |
| download | open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.tar.gz open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.tar.bz2 open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.zip | |
Merge pull request #1785 from advaita13/wifi-only-fix
Sync only when unmetered internet is available #1670
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java index ea70cde2a..a01637d84 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -19,8 +19,6 @@ package org.sufficientlysecure.keychain.ui; -import java.util.List; - import android.Manifest; import android.accounts.Account; import android.accounts.AccountManager; @@ -59,6 +57,8 @@ import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.orbot.OrbotHelper; +import java.util.List; + public class SettingsActivity extends AppCompatPreferenceActivity { public static final int REQUEST_CODE_KEYSERVER_PREF = 0x00007005; @@ -405,7 +405,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { } /** - * This fragment shows the keyserver/contacts sync preferences + * This fragment shows the keyserver/wifi-only-sync/contacts sync preferences */ public static class SyncPrefsFragment extends PresetPreferenceFragment { |