CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix developer warning notification on Android 32

Browse Source 
Bug introduced in bd6034b. Now notification is correctly removed
This commit is contained in:
emanuele-f 2022-06-01 15:46:27 +02:00
parent ca063e3296
commit 33b68936ea
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
View File

@ -130,6 +130,7 @@ public class CaptureService extends VpnService implements Runnable {
private boolean mDnsEncrypted;
private boolean mStrictDnsNoticeShown;
private boolean mQueueFull;
private boolean mStopping;
private Blacklists mBlacklists;
private MatchList mBlocklist;
private MatchList mWhitelist;
@ -196,6 +197,8 @@ public class CaptureService extends VpnService implements Runnable {
@Override
public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
mStopping = false;
// startForeground must always be called since the Service is being started with
// ContextCompat.startForegroundService.
// NOTE: since Android 12, startForeground cannot be called when the app is in background
@ -516,6 +519,9 @@ public class CaptureService extends VpnService implements Runnable {
}
private void updateNotification() {
if(mStopping)
return;
Notification notification = getStatusNotification();
NotificationManagerCompat.from(this).notify(NOTIFY_ID_VPNSERVICE, notification);
}
@ -693,6 +699,8 @@ public class CaptureService extends VpnService implements Runnable {
if(captureService == null)
return;
captureService.mStopping = true;
stopPacketLoop();
captureService.signalServicesTermination();
@ -701,9 +709,6 @@ public class CaptureService extends VpnService implements Runnable {
else
captureService.stopForeground(true);
// this fixes notification not removed (reproduced on the Android 12 emulator)
NotificationManagerCompat.from(captureService).deleteNotificationChannel(NOTIFY_CHAN_VPNSERVICE);
captureService.stopSelf();
}