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

Formatting and cleanup

Browse source
This commit is contained in:
Tad 2017-12-14 21:29:43 -05:00
parent 1eb5055b50
commit 6933ca294b
3 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/us/spotco/malwarescanner/Database.java
View file

@ -6,32 +6,28 @@ import android.widget.TextView;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Scanner;
public class Database {
private static Context context = null;
private static TextView log = null;
private static File databasePath = null;
public static ArrayList<SignatureDatabase> signatureDatabases = new ArrayList<SignatureDatabase>();
public static ArrayList<SignatureDatabase> signatureDatabases = new ArrayList<>();
public static HashMap<String, String> signaturesMD5 = new HashMap<String, String>();
public static HashMap<String, String> signaturesSHA1 = new HashMap<String, String>();
public static HashMap<String, String> signaturesSHA256 = new HashMap<String, String>();
public static HashMap<String, String> signaturesMD5 = new HashMap<>();
public static HashMap<String, String> signaturesSHA1 = new HashMap<>();
public static HashMap<String, String> signaturesSHA256 = new HashMap<>();
public Database(Context context, TextView log) {
this.context = context;
this.log = log;
this.databasePath = new File(context.getFilesDir() + "/signatures/");
this.databasePath.mkdir();
Database.log = log;
databasePath = new File(context.getFilesDir() + "/signatures/");
databasePath.mkdir();
signatureDatabases.add(new SignatureDatabase("https://spotco.us/clamav-main.hdb", "clamav-main.hdb"));
signatureDatabases.add(new SignatureDatabase("https://spotco.us/clamav-main.hsb", "clamav-main.hsb"));

2
app/src/main/java/us/spotco/malwarescanner/MainActivity.java
View file

@ -42,7 +42,7 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
if (!scanner.isScannerRunning()) {
scanner.startScanner(scanSystem, scanApps, scanInternal, scanExternal);
MalwareScanner.startScanner(scanSystem, scanApps, scanInternal, scanExternal);
} else {
scanner.stopScanner();
}

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

@ -23,13 +23,13 @@ public class MalwareScanner {
private static TextView log = null;
private static AsyncTask<Boolean, String, String> malwareScannerTask = null;
private static HashMap<String, File> fileHashesMD5 = new HashMap<String, File>();
private static HashMap<String, File> fileHashesSHA1 = new HashMap<String, File>();
private static HashMap<String, File> fileHashesSHA256 = new HashMap<String, File>();
private static HashMap<String, File> fileHashesMD5 = new HashMap<>();
private static HashMap<String, File> fileHashesSHA1 = new HashMap<>();
private static HashMap<String, File> fileHashesSHA256 = new HashMap<>();
public MalwareScanner(Context context, TextView log) {
this.context = context;
this.log = log;
MalwareScanner.context = context;
MalwareScanner.log = log;
}
public static void startScanner(boolean scanSystem, boolean scanApps, boolean scanInternal, boolean scanExternal) {
@ -45,10 +45,7 @@ public class MalwareScanner {
}
public boolean isScannerRunning() {
if (malwareScannerTask == null) {
return false;
}
return malwareScannerTask.getStatus().equals(AsyncTask.Status.PENDING) || malwareScannerTask.getStatus().equals(AsyncTask.Status.RUNNING);
return malwareScannerTask != null && (malwareScannerTask.getStatus().equals(AsyncTask.Status.PENDING) || malwareScannerTask.getStatus().equals(AsyncTask.Status.RUNNING));
}
public static class MalwareScannerTask extends AsyncTask<Boolean, String, String> {
@ -128,7 +125,6 @@ public class MalwareScanner {
}
if (Database.signaturesSHA256.size() > 0) {
publishProgress("Calculated SHA-256 hashes for all files");
for (Map.Entry<String, File> file : fileHashesSHA256.entrySet()) {
if (Database.signaturesSHA256.containsKey(file.getKey())) {
String result = Database.signaturesSHA256.get(file.getKey());