aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-21 17:13:31 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-21 17:13:35 +0100
commit147003123fffc84b1d658f78d0a888479ce4ff35 (patch)
tree5082c02f6907d36a3f3c2f31d1f93e5a6c629274 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
parent9ef2795fcd04fc228b4e3f30342f9eb79bab59fc (diff)
downloadopen-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/UploadKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 4fb2074a5..ad13e390d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences;