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/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
| 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/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 8a115b245..10a178ae2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -194,7 +194,6 @@ public class OpenPgpService extends RemoteService { intent.putExtra(NfcActivity.EXTRA_NFC_HASH_TO_SIGN, hashToSign); intent.putExtra(NfcActivity.EXTRA_NFC_HASH_ALGO, hashAlgo); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); @@ -215,7 +214,6 @@ public class OpenPgpService extends RemoteService { intent.putExtra(NfcActivity.EXTRA_PIN, pin); intent.putExtra(NfcActivity.EXTRA_NFC_ENC_SESSION_KEY, encryptedSessionKey); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); |