diff options
author | senecaso <senecaso@bertha> | 2011-10-17 10:07:37 +0900 |
---|---|---|
committer | senecaso <senecaso@bertha> | 2011-10-17 10:07:37 +0900 |
commit | debb90409a0a90ce9351c83e42cb72f8935bacb1 (patch) | |
tree | 7e61de006c0cad43019698f7e2267285f550e198 /src/org/thialfihar/android/apg/KeyListActivity.java | |
parent | 6f2333b7d3ff892697e993e4af2053a695f19402 (diff) | |
download | open-keychain-debb90409a0a90ce9351c83e42cb72f8935bacb1.tar.gz open-keychain-debb90409a0a90ce9351c83e42cb72f8935bacb1.tar.bz2 open-keychain-debb90409a0a90ce9351c83e42cb72f8935bacb1.zip |
-implementation of "--send-key"
-implementation of "--sign-key"
-partial implementation of exchanging/verifying keys via QR Code
Diffstat (limited to 'src/org/thialfihar/android/apg/KeyListActivity.java')
-rw-r--r-- | src/org/thialfihar/android/apg/KeyListActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/org/thialfihar/android/apg/KeyListActivity.java b/src/org/thialfihar/android/apg/KeyListActivity.java index 585d0259b..e35061da7 100644 --- a/src/org/thialfihar/android/apg/KeyListActivity.java +++ b/src/org/thialfihar/android/apg/KeyListActivity.java @@ -33,6 +33,9 @@ import org.thialfihar.android.apg.provider.KeyRings; import org.thialfihar.android.apg.provider.Keys; import org.thialfihar.android.apg.provider.UserIds; +import com.google.zxing.integration.android.IntentIntegrator; +import com.google.zxing.integration.android.IntentResult; + import android.app.AlertDialog; import android.app.Dialog; import android.app.SearchManager; @@ -150,7 +153,7 @@ public class KeyListActivity extends BaseActivity { showDialog(Id.dialog.export_keys); return true; } - + default: { return super.onOptionsItemSelected(item); } @@ -792,7 +795,7 @@ public class KeyListActivity extends BaseActivity { } return; } - + default: { break; } |