diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 17:13:31 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 17:13:35 +0100 |
| commit | 147003123fffc84b1d658f78d0a888479ce4ff35 (patch) | |
| tree | 5082c02f6907d36a3f3c2f31d1f93e5a6c629274 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |
| parent | 9ef2795fcd04fc228b4e3f30342f9eb79bab59fc (diff) | |
| download | open-keychain-147003123fffc84b1d658f78d0a888479ce4ff35.tar.gz open-keychain-147003123fffc84b1d658f78d0a888479ce4ff35.tar.bz2 open-keychain-147003123fffc84b1d658f78d0a888479ce4ff35.zip | |
first steps toward yubikey activity
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index ab76f693e..4ae901c6c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -17,12 +17,18 @@ package org.sufficientlysecure.keychain.ui; +import android.app.PendingIntent; +import android.content.Intent; +import android.content.IntentFilter; +import android.nfc.NfcAdapter; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import android.view.View; +import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.ui.base.BaseActivity; +import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Passphrase; import java.util.ArrayList; |