diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-29 21:32:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-29 21:32:21 +0200 |
commit | 0b16a4edfd102972b48b96b4de1ce30e029a47b5 (patch) | |
tree | bb4c3df979f22325995dacaced7cfbb1ff1ba2ac /OpenKeychain/src/main/AndroidManifest.xml | |
parent | 7f547afe42da896697ae605dbfb6e4734ac42c36 (diff) | |
parent | f7fe236bd535e62f60a7f76768b7455ef102255e (diff) | |
download | open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.tar.gz open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.tar.bz2 open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/AndroidManifest.xml
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 a18e45a8e..ddec381c8 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.NfcIntentActivity" |