Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported

2016-01-10 17:17:57 +01:00
parent 9163b93a90
commit 0fd5b45df9
57 changed files with 753 additions and 727 deletions
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -761,7 +761,7 @@
              taskAffinity and allowTaskReparenting somehow prevents this from happening!
         -->
        <activity
-            android:name=".ui.NfcOperationActivity"
+            android:name=".ui.SecurityTokenOperationActivity"
            android:allowTaskReparenting="true"
            android:launchMode="singleTop"
            android:taskAffinity=":Nfc"