diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-16 14:36:18 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | 2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8 (patch) | |
tree | 3b6e9eb10f21be97e94582616e309c230ae5f327 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | |
parent | f6d0f88ac973328b3b7a9d426214beb76efefb3f (diff) | |
download | open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.tar.gz open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.tar.bz2 open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.zip |
ensuring code style is preserved
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 12 |
1 files changed, 5 insertions, 7 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 6605995eb..1b8d71d23 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -245,7 +245,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { } public Preference automaticallyFindPreference(String key) { - if(mFragment != null) { + if (mFragment != null) { return mFragment.findPreference(key); } else { return mActivity.findPreference(key); @@ -259,8 +259,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { Preferences.setPreferenceManagerFileAndMode(mFragment.getPreferenceManager()); // Load the preferences from an XML resource mFragment.addPreferencesFromResource(R.xml.proxy_prefs); - } - else { + } else { Preferences.setPreferenceManagerFileAndMode(mActivity.getPreferenceManager()); // Load the preferences from an XML resource mActivity.addPreferencesFromResource(R.xml.proxy_prefs); @@ -285,7 +284,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { Activity activity = mFragment != null ? mFragment.getActivity() : mActivity; - if ((Boolean)newValue) { + if ((Boolean) newValue) { boolean installed = OrbotHelper.isOrbotInstalled(activity); if (!installed) { Log.d(Constants.TAG, "Prompting to install Tor"); @@ -298,8 +297,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { // let the enable tor box be checked return true; } - } - else { + } else { // we're unchecking Tor, so enable other proxy enableNormalProxyPrefs(); return true; @@ -350,7 +348,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { Activity activity = mFragment != null ? mFragment.getActivity() : mActivity; try { int port = Integer.parseInt((String) newValue); - if(port < 0 || port > 65535) { + if (port < 0 || port > 65535) { Notify.create( activity, R.string.pref_proxy_port_err_invalid, |