generalize nfc crypto input structure

2015-03-18 18:25:44 +01:00
parent 4499caef1e
commit aca54e31ea
18 changed files with 883 additions and 235 deletions
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -680,6 +680,12 @@
            android:taskAffinity=":Nfc"
            android:allowTaskReparenting="true" />

+        <activity
+            android:name=".ui.NfcOperationActivity"
+            android:launchMode="singleTop"
+            android:taskAffinity=":Nfc"
+            android:allowTaskReparenting="true" />
+
        <!--<activity-->
        <!--android:name=".ui.NfcIntentActivity"-->
        <!--android:launchMode="singleTop">-->