diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 07:18:50 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:16 +0530 |
commit | 89f017aa9c1750de7574865baf29d071ff2862a5 (patch) | |
tree | f45d53ee95e50f782256e094f2ca740198520b7c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util | |
parent | 4d81a83baab301fafbf8ac0559ddc00341ac760c (diff) | |
download | open-keychain-89f017aa9c1750de7574865baf29d071ff2862a5.tar.gz open-keychain-89f017aa9c1750de7574865baf29d071ff2862a5.tar.bz2 open-keychain-89f017aa9c1750de7574865baf29d071ff2862a5.zip |
reformatted code
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java | 8 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java index 661650824..b00b03ec7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java @@ -34,7 +34,9 @@ public class ParcelableProxy implements Parcelable { public ParcelableProxy(String hostName, int port, Proxy.Type type) { mProxyHost = hostName; - if (hostName == null) return; // represents a null proxy + if (hostName == null) { + return; // represents a null proxy + } mProxyPort = port; @@ -46,7 +48,9 @@ public class ParcelableProxy implements Parcelable { } public Proxy getProxy() { - if (mProxyHost == null) return null; + if (mProxyHost == null) { + return null; + } return new Proxy(mProxyType, new InetSocketAddress(mProxyHost, mProxyPort)); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java index 6a78b34f5..b73d90f9b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java @@ -59,7 +59,6 @@ import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentActivity; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.service.ConsolidateInputParcel; import org.sufficientlysecure.keychain.ui.dialog.SupportInstallDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.OrbotStartDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.PreferenceInstallDialogFragment; |