diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 2c643dc..0000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f680537..807a598 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
new file mode 100644
index 0000000..a19a0e2
Binary files /dev/null and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/dictionaries/tad.xml b/.idea/dictionaries/tad.xml
deleted file mode 100644
index f51229c..0000000
--- a/.idea/dictionaries/tad.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- autostart
- eicar
- hypatia
- malware
- realtime
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 89624cc..2996d53 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,14 +3,11 @@
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 47eabe0..29bb4c5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,49 +1,14 @@
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
- Android API 19 Platform
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8f6eebb..ad860ea 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6596ed1..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ce7f9e9..8867363 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
+ compileSdkVersion 28
defaultConfig {
applicationId "us.spotco.malwarescanner"
minSdkVersion 16
@@ -30,9 +30,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:appcompat-v7:26.1.0'
- implementation 'com.android.support:design:26.1.0'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'com.android.support:support-v4:26.1.0'
- implementation 'com.android.support:preference-v7:26.1.0'
+ implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+ implementation 'com.google.android.material:material:1.1.0-alpha03'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.preference:preference:1.1.0-alpha03'
}
diff --git a/app/src/main/java/us/spotco/malwarescanner/DatabaseFragment.java b/app/src/main/java/us/spotco/malwarescanner/DatabaseFragment.java
index 807761a..2eb87bb 100644
--- a/app/src/main/java/us/spotco/malwarescanner/DatabaseFragment.java
+++ b/app/src/main/java/us/spotco/malwarescanner/DatabaseFragment.java
@@ -2,7 +2,7 @@ package us.spotco.malwarescanner;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/us/spotco/malwarescanner/LogFragment.java b/app/src/main/java/us/spotco/malwarescanner/LogFragment.java
index 95ce2ba..e01b8b6 100644
--- a/app/src/main/java/us/spotco/malwarescanner/LogFragment.java
+++ b/app/src/main/java/us/spotco/malwarescanner/LogFragment.java
@@ -19,7 +19,7 @@ package us.spotco.malwarescanner;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
index cab3718..716407a 100644
--- a/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
+++ b/app/src/main/java/us/spotco/malwarescanner/MainActivity.java
@@ -20,13 +20,13 @@ package us.spotco.malwarescanner;
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.content.ContextCompat;
import android.view.MenuItem;
public class MainActivity extends FragmentActivity {
diff --git a/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java b/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java
index 646fb47..532fd21 100644
--- a/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java
+++ b/app/src/main/java/us/spotco/malwarescanner/MalwareScannerService.java
@@ -27,7 +27,7 @@ import android.os.Build;
import android.os.Environment;
import android.os.FileObserver;
import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
import java.io.File;
import java.util.HashSet;
@@ -79,7 +79,7 @@ public class MalwareScannerService extends 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.notif_scanner_realtime), NotificationManager.IMPORTANCE_LOW);
- foregroundChannel.setDescription(getString(R.string.notif_scanner_realtime_summary));
+ foregroundChannel.setDescription(getString(R.string.notif_scanner_realtime_channel));
foregroundChannel.setShowBadge(false);
notificationManager.createNotificationChannel(foregroundChannel);
}
@@ -122,7 +122,7 @@ public class MalwareScannerService extends Service {
new NotificationCompat.Builder(this)
.setSmallIcon(R.drawable.ic_notification)
.setContentTitle(getText(R.string.notif_scanner_realtime))
- .setContentText(getText(R.string.notif_scanner_realtime_summary))
+ .setContentText(getText(R.string.notif_scanner_realtime_context))
.setPriority(Notification.PRIORITY_MIN)
.setShowWhen(false);
diff --git a/app/src/main/java/us/spotco/malwarescanner/ScannerFragment.java b/app/src/main/java/us/spotco/malwarescanner/ScannerFragment.java
index 8e763fb..40c70d9 100644
--- a/app/src/main/java/us/spotco/malwarescanner/ScannerFragment.java
+++ b/app/src/main/java/us/spotco/malwarescanner/ScannerFragment.java
@@ -19,7 +19,7 @@ package us.spotco.malwarescanner;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/us/spotco/malwarescanner/SettingsFragment.java b/app/src/main/java/us/spotco/malwarescanner/SettingsFragment.java
index 86a42ca..3f1b4a6 100644
--- a/app/src/main/java/us/spotco/malwarescanner/SettingsFragment.java
+++ b/app/src/main/java/us/spotco/malwarescanner/SettingsFragment.java
@@ -21,8 +21,8 @@ package us.spotco.malwarescanner;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceFragmentCompat;
import android.widget.Toast;
/**
diff --git a/app/src/main/java/us/spotco/malwarescanner/Utils.java b/app/src/main/java/us/spotco/malwarescanner/Utils.java
index 1a2d06b..4262dae 100644
--- a/app/src/main/java/us/spotco/malwarescanner/Utils.java
+++ b/app/src/main/java/us/spotco/malwarescanner/Utils.java
@@ -59,7 +59,7 @@ public class Utils {
public static int getMaxThreads() {
int maxThreads = Runtime.getRuntime().availableProcessors();
- if (maxThreads >= 2) {
+ if (maxThreads >= 4) {
maxThreads /= 2;
}
return maxThreads;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b9d146d..375eaed 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
-
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5745129..fb2ebd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,8 @@
Malware Detection
- Used to alert when malware is detected
+ Used to alert when malware is detected
+ Malware will be detected in realtime
diff --git a/build.gradle b/build.gradle
index 9dcc626..f94362a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
+ classpath 'com.android.tools.build:gradle:3.3.1'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bdec569..f2cd2f8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Dec 13 22:17:06 EST 2017
+#Tue Feb 12 16:15:07 GMT-05:00 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip