n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update pendingIntent for api31

Browse Source
This commit is contained in:
PeratX 2022-05-23 14:29:22 +08:00
parent dd05170112
commit 60a9834e9e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -59,7 +59,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTask" android:launchMode="singleTask"
android:theme="@style/AppTheme.NoActionBar.TransparentStatusBar" android:theme="@style/AppTheme.NoActionBar.TransparentStatusBar"
android:exported="false"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>

12
app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
View File

@ -78,6 +78,10 @@ public class DaedalusVpnService extends VpnService implements Runnable {
return activated; return activated;
} }
private static int getPendingIntent(int flag) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE | flag : flag;
}
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
@ -144,7 +148,7 @@ public class DaedalusVpnService extends VpnService implements Runnable {
Intent settingsIntent = new Intent(StatusBarBroadcastReceiver.STATUS_BAR_BTN_SETTINGS_CLICK_ACTION); Intent settingsIntent = new Intent(StatusBarBroadcastReceiver.STATUS_BAR_BTN_SETTINGS_CLICK_ACTION);
settingsIntent.setClass(this, StatusBarBroadcastReceiver.class); settingsIntent.setClass(this, StatusBarBroadcastReceiver.class);
PendingIntent pIntent = PendingIntent.getActivity(this, 0, PendingIntent pIntent = PendingIntent.getActivity(this, 0,
new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); new Intent(this, MainActivity.class), getPendingIntent(PendingIntent.FLAG_UPDATE_CURRENT));
builder.setWhen(0) builder.setWhen(0)
.setContentTitle(getResources().getString(R.string.notice_activated)) .setContentTitle(getResources().getString(R.string.notice_activated))
.setDefaults(NotificationCompat.DEFAULT_LIGHTS) .setDefaults(NotificationCompat.DEFAULT_LIGHTS)
@ -156,10 +160,10 @@ public class DaedalusVpnService extends VpnService implements Runnable {
.setContentIntent(pIntent) .setContentIntent(pIntent)
.addAction(R.drawable.ic_clear, getResources().getString(R.string.button_text_deactivate), .addAction(R.drawable.ic_clear, getResources().getString(R.string.button_text_deactivate),
PendingIntent.getBroadcast(this, 0, PendingIntent.getBroadcast(this, 0,
deactivateIntent, PendingIntent.FLAG_UPDATE_CURRENT)) deactivateIntent, getPendingIntent(PendingIntent.FLAG_UPDATE_CURRENT)))
.addAction(R.drawable.ic_settings, getResources().getString(R.string.action_settings), .addAction(R.drawable.ic_settings, getResources().getString(R.string.action_settings),
PendingIntent.getBroadcast(this, 0, PendingIntent.getBroadcast(this, 0,
settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT)); settingsIntent, getPendingIntent(PendingIntent.FLAG_UPDATE_CURRENT)));
Notification notification = builder.build(); Notification notification = builder.build();
@ -289,7 +293,7 @@ public class DaedalusVpnService extends VpnService implements Runnable {
.setSession("Daedalus") .setSession("Daedalus")
.setConfigureIntent(PendingIntent.getActivity(this, 0, .setConfigureIntent(PendingIntent.getActivity(this, 0,
new Intent(this, MainActivity.class).putExtra(MainActivity.LAUNCH_FRAGMENT, MainActivity.FRAGMENT_SETTINGS), new Intent(this, MainActivity.class).putExtra(MainActivity.LAUNCH_FRAGMENT, MainActivity.FRAGMENT_SETTINGS),
PendingIntent.FLAG_ONE_SHOT)); getPendingIntent(PendingIntent.FLAG_ONE_SHOT)));
if (Daedalus.getPrefs().getBoolean("settings_app_filter_switch", false)) { if (Daedalus.getPrefs().getBoolean("settings_app_filter_switch", false)) {
ArrayList<String> apps = Daedalus.configurations.getAppObjects(); ArrayList<String> apps = Daedalus.configurations.getAppObjects();