MaintainTeam/Hypatia
1
0
Fork 0
mirror of https://github.com/MaintainTeam/Hypatia.git synced 2025-03-01 05:48:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Really fix notifications on Oreo

Browse source
This commit is contained in:
Tad 2018-04-05 21:46:24 -04:00
parent 0eb386f8ce
commit 23e76dd8cf
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -6,8 +6,8 @@ android {
applicationId "us.spotco.malwarescanner" applicationId "us.spotco.malwarescanner"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 26
versionCode 30 versionCode 31
versionName "2.5" versionName "2.6"
} }
buildTypes { buildTypes {
debug { debug {

10
app/src/main/java/us/spotco/malwarescanner/MalwareScanner.java
View file

@ -2,8 +2,10 @@ package us.spotco.malwarescanner;
import android.app.Activity; import android.app.Activity;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
@ -40,6 +42,11 @@ class MalwareScanner extends AsyncTask<Set<File>, Object, String> {
logOutput = activity.findViewById(R.id.txtLogOutput); logOutput = activity.findViewById(R.id.txtLogOutput);
} else { } else {
notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel detectionChannel = new NotificationChannel("DETECTION", context.getString(R.string.lblNotificationMalwareDetectionTitle), NotificationManager.IMPORTANCE_HIGH);
detectionChannel.setDescription(context.getString(R.string.lblNotificationMalwareDetectionDescription));
notificationManager.createNotificationChannel(detectionChannel);
}
} }
} }
@ -58,6 +65,9 @@ class MalwareScanner extends AsyncTask<Set<File>, Object, String> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mBuilder.setVisibility(Notification.VISIBILITY_SECRET); mBuilder.setVisibility(Notification.VISIBILITY_SECRET);
} }
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mBuilder.setChannelId("DETECTION");
}
notificationManager.notify(new Random().nextInt(), mBuilder.build()); notificationManager.notify(new Random().nextInt(), mBuilder.build());
//Log.d("Theia", result); //Log.d("Theia", result);
} }

12
app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java
View file

@ -52,6 +52,12 @@ public class MalwareScannerService extends Service {
} }
notificationManager = (NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE); notificationManager = (NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel foregroundChannel = new NotificationChannel("FOREGROUND", getString(R.string.lblNotificationRealtimeTitle), NotificationManager.IMPORTANCE_LOW);
foregroundChannel.setDescription(getString(R.string.lblNotificationRealtimeDescription));
foregroundChannel.setShowBadge(false);
notificationManager.createNotificationChannel(foregroundChannel);
}
setForeground(); setForeground();
return START_STICKY; return START_STICKY;
} }
@ -96,13 +102,7 @@ public class MalwareScannerService extends Service {
.setShowWhen(false); .setShowWhen(false);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel foregroundChannel = new NotificationChannel("FOREGROUND", getString(R.string.lblNotificationRealtimeTitle), NotificationManager.IMPORTANCE_LOW);
foregroundChannel.setShowBadge(false);
foregroundChannel.setDescription(getString(R.string.lblNotificationRealtimeDescription));
notificationManager.createNotificationChannel(foregroundChannel);
foregroundNotification.setChannelId("FOREGROUND"); foregroundNotification.setChannelId("FOREGROUND");
//Importance seems to be getting ignored
//Users will have to manually set it to 'Low' in order to hide it from the lock screen and status bar
} }
startForeground(-1, foregroundNotification.build()); startForeground(-1, foregroundNotification.build());

2
app/src/main/res/values/strings.xml
View file

@ -7,6 +7,8 @@
<string name="lblScanApps">Scan App APKs</string> <string name="lblScanApps">Scan App APKs</string>
<string name="lblScanInternal">Scan Internal Storage</string> <string name="lblScanInternal">Scan Internal Storage</string>
<string name="lblScanExternal">Scan External Storage</string> <string name="lblScanExternal">Scan External Storage</string>
<string name="lblNotificationMalwareDetectionTitle">Malware Detection</string>
<string name="lblNotificationMalwareDetectionDescription">Used to alert when malware is detected</string>
<string name="lblNotificationRealtimeTitle">Realtime Scanner</string> <string name="lblNotificationRealtimeTitle">Realtime Scanner</string>
<string name="lblNotificationRealtimeDescription">Used to show files scanned counter and maintain the background service</string> <string name="lblNotificationRealtimeDescription">Used to show files scanned counter and maintain the background service</string>
<string name="lblNotificationRealtimeText">Malware will be detected in realtime</string> <string name="lblNotificationRealtimeText">Malware will be detected in realtime</string>