diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 00:58:28 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-30 00:58:28 +0200 |
| commit | 43b8170a446143028207d4d377c8f669ad32de67 (patch) | |
| tree | 7c8228b7794315a0f79c59e21369994ad53e6a26 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui | |
| parent | 6448de8f6ac84a8dcc91908af37c8826e32aa785 (diff) | |
| parent | 4457b4a24c4078723c94f949235e040de0328c63 (diff) | |
| download | open-keychain-43b8170a446143028207d4d377c8f669ad32de67.tar.gz open-keychain-43b8170a446143028207d4d377c8f669ad32de67.tar.bz2 open-keychain-43b8170a446143028207d4d377c8f669ad32de67.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index 0a1822798..2ba792f9a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -33,12 +33,10 @@ import android.widget.Button; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; -import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.ui.CreateKeyActivity; -import org.sufficientlysecure.keychain.ui.EditKeyActivityOld; import org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment; import org.sufficientlysecure.keychain.ui.adapter.KeyValueSpinnerAdapter; import org.sufficientlysecure.keychain.util.AlgorithmNames; |