aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-30 19:25:39 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-30 19:25:39 +0200
commit7b53150ad55f732c6bf01e0d0fd2bea624068182 (patch)
treea9f9833a1a5ecb8b68bc55a42282a747cd9f7eee /OpenPGP-Keychain/src/main/java/org
parentfc4f9beb6a1b16acdd708f77d35659e23f2e7026 (diff)
downloadopen-keychain-7b53150ad55f732c6bf01e0d0fd2bea624068182.tar.gz
open-keychain-7b53150ad55f732c6bf01e0d0fd2bea624068182.tar.bz2
open-keychain-7b53150ad55f732c6bf01e0d0fd2bea624068182.zip
Remove FLAG_ONE_SHOT from most PIs
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java8
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index ad0c658ad..f85e342d8 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -99,7 +99,7 @@ public class OpenPgpService extends RemoteService {
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent,
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_CANCEL_CURRENT);
// return PendingIntent to be executed by client
Intent result = new Intent();
@@ -127,7 +127,7 @@ public class OpenPgpService extends RemoteService {
intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent,
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_CANCEL_CURRENT);
// return PendingIntent to be executed by client
Intent result = new Intent();
@@ -319,7 +319,7 @@ public class OpenPgpService extends RemoteService {
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent,
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_CANCEL_CURRENT);
result.putExtra(OpenPgpApi.RESULT_INTENT, pi);
}
@@ -360,7 +360,7 @@ public class OpenPgpService extends RemoteService {
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent,
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_CANCEL_CURRENT);
result.putExtra(OpenPgpApi.RESULT_INTENT, pi);
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
index 8cea3cd21..59a04a10e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
@@ -100,7 +100,7 @@ public abstract class RemoteService extends Service {
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent,
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_CANCEL_CURRENT);
// return PendingIntent to be executed by client
Intent result = new Intent();
@@ -165,7 +165,7 @@ public abstract class RemoteService extends Service {
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent,
- PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
+ PendingIntent.FLAG_CANCEL_CURRENT);
// return PendingIntent to be executed by client
Intent result = new Intent();