diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-29 21:20:01 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-29 21:20:01 +0200 |
| commit | 654d98ac2a2df847df15c72cde4af0dd99d3c180 (patch) | |
| tree | 04ed8f3bc0b19293988b324ba71f1d879301e9d2 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | d20f657151b038c25dc071dd9d227380d09ff866 (diff) | |
| download | open-keychain-654d98ac2a2df847df15c72cde4af0dd99d3c180.tar.gz open-keychain-654d98ac2a2df847df15c72cde4af0dd99d3c180.tar.bz2 open-keychain-654d98ac2a2df847df15c72cde4af0dd99d3c180.zip | |
Fix NfcActivity task stack problem
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index d4ff5d2d7..2c8de0372 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -620,9 +620,18 @@ <activity android:name=".ui.PassphraseDialogActivity" android:theme="@android:style/Theme.NoDisplay" /> + <!-- + NOTE: singleTop is set to get NFC foreground dispatch to work. + Then, all NFC intents will be broadcasted to onNewIntent() of this activity! + If more than one task stack of OpenKeychain exists, the broadcast + restarts the activity with onCreate() instead of calling onNewIntent(). + taskAffinity and allowTaskReparenting somehow prevents this from happening! + --> <activity android:name=".ui.NfcActivity" - android:launchMode="singleTop" /> + android:launchMode="singleTop" + android:taskAffinity=":Nfc" + android:allowTaskReparenting="true" /> <activity android:name=".ui.HelpActivity" android:label="@string/title_help" /> |