aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-10 13:47:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-10 13:47:58 +0200
commit2ac8be28584c452d2ec0e0550aff5c4e20dbed2d (patch)
tree2f053b858d3617ff3c3aca2213d54a648675d0b6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
parenteba0640d3eb39c23686cd54925aedde44141e8d9 (diff)
downloadopen-keychain-2ac8be28584c452d2ec0e0550aff5c4e20dbed2d.tar.gz
open-keychain-2ac8be28584c452d2ec0e0550aff5c4e20dbed2d.tar.bz2
open-keychain-2ac8be28584c452d2ec0e0550aff5c4e20dbed2d.zip
Integrate NFC functionality into ViewKeyActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 03a8413d4..63f4ec7c4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -315,12 +315,7 @@ public class KeyListFragment extends Fragment
*/
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
- Intent viewIntent = null;
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
- viewIntent = new Intent(getActivity(), ViewKeyActivity.class);
- } else {
- viewIntent = new Intent(getActivity(), ViewKeyActivityJB.class);
- }
+ Intent viewIntent = new Intent(getActivity(), ViewKeyActivity.class);
viewIntent.setData(
KeyRings.buildGenericKeyRingUri(Long.toString(mAdapter.getMasterKeyId(position))));
startActivity(viewIntent);