From df4f60bcf463444ebc140f15e4f9286813357895 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Tue, 2 Jun 2020 20:21:08 +0100 Subject: [PATCH] HandbookDownloader: grab last modified time from MQTT, too --- .../acmetensortoys/ctfwstimer/utils/HandbookDownloader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java index a69ccec..2e11862 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java @@ -141,6 +141,7 @@ public class HandbookDownloader implements IMqttMessageListener { public void messageArrived(String topic, MqttMessage message) throws Exception { /* Try to parse the message: URL timestamp checksum */ String url, checksum_str; + long ts; Log.d(TAG, "Begin processing download via '" + message.toString()); if (this.downloader != null) { @@ -151,7 +152,7 @@ public class HandbookDownloader implements IMqttMessageListener { try { Scanner s = new Scanner(message.toString().trim()); url = s.next(); - s.next(); /* discard timestamp */ + ts = s.nextLong(); /* discard timestamp */ checksum_str = s.next(); } catch (NoSuchElementException nsee) { /* Malformed message; give up */ @@ -194,7 +195,7 @@ public class HandbookDownloader implements IMqttMessageListener { } this.downloader = new Task(this); - this.download = new CheckedAsyncDownloader.DL(new URL(url), checksum, HAND_MAX_LEN, + this.download = new CheckedAsyncDownloader.DL(new URL(url), checksum, HAND_MAX_LEN, ts, new File(mCtx.getFilesDir(), HandbookActivity.HAND_FILE_NAME)); this.downloader.execute(this.download); } -- 2.50.1