Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 05:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restore waiting for analysis

Browse Source
This commit is contained in:
M66B
2022-07-29 11:20:16 +02:00
parent 2fc6e5d603
commit 0fa73cc733
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/extra/java/eu/faircode/email/VirusTotal.java
View File

@@ -93,8 +93,7 @@ public class VirusTotal {
return result;
}
static void upload(Context context, File file, String apiKey, Runnable analyzing)
throws IOException, JSONException, InterruptedException, TimeoutException {
static String upload(Context context, File file, String apiKey) throws IOException, JSONException {
// Get upload URL
Pair<Integer, String> response = call(context, "api/v3/files/upload_url", apiKey);
if (response.first != HttpsURLConnection.HTTP_OK)
@@ -103,7 +102,6 @@ public class VirusTotal {
String upload_url = jurl.getString("data");
// Upload file
String id;
String boundary = "----FairEmail." + System.currentTimeMillis();
URL url = new URL(upload_url);
@@ -164,16 +162,16 @@ public class VirusTotal {
Log.i("VT response=" + r);
JSONObject jfile = new JSONObject(r);
JSONObject jdata = jfile.getJSONObject("data");
id = jdata.getString("id");
return jdata.getString("id");
} finally {
connection.disconnect();
}
}
static void waitForAnalysis(Context context, String id, String apiKey) throws IOException, JSONException, InterruptedException, TimeoutException {
// Get analysis result
for (int i = 0; i < VT_ANALYSIS_CHECKS; i++) {
analyzing.run();
Pair<Integer, String> analyses = call(context, "api/v3/analyses/" + id, apiKey);
if (analyses.first != HttpsURLConnection.HTTP_OK)
throw new FileNotFoundException(analyses.second);