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

Use FLAG_IMMUTABLE

Browse Source
This commit is contained in:
Dominik Schürmann
2016-02-15 18:09:27 +01:00
parent d1eacf9b27
commit 6379ce1faa
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ApiPendingIntentFactory.java
View File

@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.remote;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.remote.ui.RemoteCreateAccountActivity; import org.sufficientlysecure.keychain.remote.ui.RemoteCreateAccountActivity;
@@ -147,9 +148,16 @@ public class ApiPendingIntentFactory {
// re-attach "data" for pass through. It will be used later to repeat pgp operation // re-attach "data" for pass through. It will be used later to repeat pgp operation
intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_DATA, mPendingIntentData); intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_DATA, mPendingIntentData);
return PendingIntent.getActivity(mContext, 0, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
intent, //noinspection ResourceType, looks like lint is missing FLAG_IMMUTABLE
PendingIntent.FLAG_CANCEL_CURRENT); return PendingIntent.getActivity(mContext, 0,
intent,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} else {
return PendingIntent.getActivity(mContext, 0,
intent,
PendingIntent.FLAG_CANCEL_CURRENT);
}
} }
PendingIntent register(String packageName, byte[] packageCertificate) { PendingIntent register(String packageName, byte[] packageCertificate) {
@@ -158,9 +166,17 @@ public class ApiPendingIntentFactory {
intent.putExtra(RemoteRegisterActivity.EXTRA_PACKAGE_SIGNATURE, packageCertificate); intent.putExtra(RemoteRegisterActivity.EXTRA_PACKAGE_SIGNATURE, packageCertificate);
intent.putExtra(RemoteRegisterActivity.EXTRA_DATA, mPendingIntentData); intent.putExtra(RemoteRegisterActivity.EXTRA_DATA, mPendingIntentData);
return PendingIntent.getActivity(mContext, 0, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
intent, //noinspection ResourceType, looks like lint is missing FLAG_IMMUTABLE
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT); return PendingIntent.getActivity(mContext, 0,
intent,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
| PendingIntent.FLAG_IMMUTABLE);
} else {
return PendingIntent.getActivity(mContext, 0,
intent,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);
}
} }
} }