From 2b64086e392e6e86a4b1d7641a4e73428cd1d5e0 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Mon, 15 Apr 2019 16:21:25 +0200 Subject: [PATCH] resubmission: expose the updated report ID --- src/main/java/io/ooni/mk/MKCollectorResubmitResults.java | 7 +++++++ src/mkall/cpp/collector.cpp | 4 ++++ src/test/java/io/ooni/mk/MKCollectorResubmitTest.java | 1 + 3 files changed, 12 insertions(+) diff --git a/src/main/java/io/ooni/mk/MKCollectorResubmitResults.java b/src/main/java/io/ooni/mk/MKCollectorResubmitResults.java index c77a0bb..45e0118 100644 --- a/src/main/java/io/ooni/mk/MKCollectorResubmitResults.java +++ b/src/main/java/io/ooni/mk/MKCollectorResubmitResults.java @@ -12,6 +12,8 @@ public class MKCollectorResubmitResults { final static native String Content(long handle); + final static native String ReportID(long handle); + final static native String Logs(long handle); final static native void Delete(long handle); @@ -33,6 +35,11 @@ public String getUpdatedSerializedMeasurement() { return Content(handle); } + /** getUpdatedReportID returns the updated report ID. */ + public String getUpdatedReportID() { + return ReportID(handle); + } + /** getLogs returns the logs as one-or-more newline-separated * lines containing only UTF-8 characters. */ public String getLogs() { diff --git a/src/mkall/cpp/collector.cpp b/src/mkall/cpp/collector.cpp index 38b4a24..cc6ba8a 100644 --- a/src/mkall/cpp/collector.cpp +++ b/src/mkall/cpp/collector.cpp @@ -16,6 +16,10 @@ MKALL_GET_STRING(MKCollectorResubmitResults_Content, mk_collector_resubmit_response_content, mk_collector_resubmit_response_t) +MKALL_GET_STRING(MKCollectorResubmitResults_ReportID, + mk_collector_resubmit_response_report_id, + mk_collector_resubmit_response_t) + MKALL_GET_LOGS(MKCollectorResubmitResults_Logs, mk_collector_resubmit_response_logs_size, mk_collector_resubmit_response_logs_at, diff --git a/src/test/java/io/ooni/mk/MKCollectorResubmitTest.java b/src/test/java/io/ooni/mk/MKCollectorResubmitTest.java index ddc41ba..2e9bc12 100644 --- a/src/test/java/io/ooni/mk/MKCollectorResubmitTest.java +++ b/src/test/java/io/ooni/mk/MKCollectorResubmitTest.java @@ -33,6 +33,7 @@ public static void main(String[] args) { MKCollectorResubmitResults results = settings.perform(); System.out.println("Good : " + results.isGood()); System.out.println("Measurement : " + results.getUpdatedSerializedMeasurement()); + System.out.println("Report ID : " + results.getUpdatedReportID()); System.out.print(results.getLogs()); } }