Log time spent

This commit is contained in:
Tad 2017-12-14 22:09:36 -05:00
parent 07ac77f018
commit 8e2d1f80c6
2 changed files with 7 additions and 4 deletions

View file

@ -6,7 +6,7 @@ android {
applicationId "us.spotco.malwarescanner"
minSdkVersion 21
targetSdkVersion 26
versionCode 3
versionCode 5
versionName "1.1" }
buildTypes {
release {
@ -19,6 +19,5 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:design:26.1.0'
}

View file

@ -5,6 +5,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Environment;
import android.os.SystemClock;
import android.widget.TextView;
import java.io.File;
@ -23,6 +24,8 @@ public class MalwareScanner {
private static TextView log = null;
private static AsyncTask<Boolean, String, String> malwareScannerTask = null;
private static long scanTime = 0;
private static HashMap<String, File> fileHashesMD5 = new HashMap<>();
private static HashMap<String, File> fileHashesSHA1 = new HashMap<>();
private static HashMap<String, File> fileHashesSHA256 = new HashMap<>();
@ -52,6 +55,7 @@ public class MalwareScanner {
@Override
protected void onPreExecute() {
scanTime = SystemClock.elapsedRealtime();
log.append("Initiating scan...\n");
fileHashesMD5.clear();
fileHashesSHA1.clear();
@ -86,7 +90,7 @@ public class MalwareScanner {
if (scanExternal) {
filesToScan.addAll(getFilesRecursive(new File("/storage")));
}
publishProgress(filesToScan.size() + " files pending scan");
publishProgress(filesToScan.size() + " files pending scan\n");
Database.loadDatabase(Database.signatureDatabases);
publishProgress("Loaded " + Database.signaturesMD5.size() + " MD5 signatures");
@ -148,7 +152,7 @@ public class MalwareScanner {
@Override
protected void onPostExecute(String result) {
log.append("Scan complete!\n\n\n\n\n");
log.append("Scan complete in " + ((SystemClock.elapsedRealtime() - scanTime) / 1000) + " seconds!\n\n\n\n\n");
}
}