cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1785 from advaita13/wifi-only-fix

Browse Source 
Sync only when unmetered internet is available #1670
This commit is contained in:
Vincent
2016-03-24 14:26:03 +01:00
parent c4de57d4f6 cab3fa7874
commit f005bbad96
9 changed files with 119 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
View File

@@ -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 {