cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	OpenKeychain/src/main/AndroidManifest.xml
This commit is contained in:
Vincent Breitmoser
2014-09-29 21:32:21 +02:00
parent 7f547afe42 f7fe236bd5
commit 0b16a4edfd
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -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"