From f99bc0de64035b473517cea6faa10521710cf9b9 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 13 Aug 2019 22:20:18 +0200 Subject: [PATCH] Move another file from AmazfitBip to Huami which is no longer Bip specific --- ...ailsParser.java => HuamiActivityDetailsParser.java} | 8 ++++---- .../huami/operations/FetchSportsDetailsOperation.java | 4 ++-- .../gadgetbridge/test/HexToBinaryInputStreamTest.java | 4 ++-- ...erTest.java => HuamiActivityDetailsParserTest.java} | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{amazfitbip/ActivityDetailsParser.java => HuamiActivityDetailsParser.java} (98%) rename app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/{ActivityDetailsParserTest.java => HuamiActivityDetailsParserTest.java} (90%) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java similarity index 98% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java index 65b27d2aa..2d2323015 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,8 +34,8 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack; import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; -public class ActivityDetailsParser { - private static final Logger LOG = LoggerFactory.getLogger(ActivityDetailsParser.class); +public class HuamiActivityDetailsParser { + private static final Logger LOG = LoggerFactory.getLogger(HuamiActivityDetailsParser.class); private static final byte TYPE_GPS = 0; private static final byte TYPE_HR = 1; @@ -65,7 +65,7 @@ public class ActivityDetailsParser { private boolean skipCounterByte; - public ActivityDetailsParser(BaseActivitySummary summary) { + public HuamiActivityDetailsParser(BaseActivitySummary summary) { this.summary = summary; // this.version = version; // this.baseDate = baseDate; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java index 3881fbf30..dddc326e6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java @@ -40,7 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip.ActivityDetailsParser; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiActivityDetailsParser; import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils; import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; import nodomain.freeyourgadget.gadgetbridge.util.GB; @@ -86,7 +86,7 @@ public class FetchSportsDetailsOperation extends AbstractFetchOperation { if (success) { - ActivityDetailsParser parser = new ActivityDetailsParser(summary); + HuamiActivityDetailsParser parser = new HuamiActivityDetailsParser(summary); parser.setSkipCounterByte(false); // is already stripped try { ActivityTrack track = parser.parse(buffer.toByteArray()); diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HexToBinaryInputStreamTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HexToBinaryInputStreamTest.java index a4b5f5b95..f879ea393 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HexToBinaryInputStreamTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HexToBinaryInputStreamTest.java @@ -19,10 +19,10 @@ public class HexToBinaryInputStreamTest extends TestBase { byte[] hexString; byte[] binString; - try (InputStream in = ActivityDetailsParserTest.class.getClassLoader().getResourceAsStream("ActivityDetailsDump1.txt")) { + try (InputStream in = HuamiActivityDetailsParserTest.class.getClassLoader().getResourceAsStream("ActivityDetailsDump1.txt")) { hexString = FileUtils.readAll(in, 1024 * 1024); assertTrue(hexString.length > 1); - try (InputStream in2 = getContents(ActivityDetailsParserTest.class.getClassLoader().getResource("ActivityDetailsDump1.txt"))) { + try (InputStream in2 = getContents(HuamiActivityDetailsParserTest.class.getClassLoader().getResource("ActivityDetailsDump1.txt"))) { binString = FileUtils.readAll(in2, 1024 * 1024); assertTrue(binString.length > 1); } diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/ActivityDetailsParserTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HuamiActivityDetailsParserTest.java similarity index 90% rename from app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/ActivityDetailsParserTest.java rename to app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HuamiActivityDetailsParserTest.java index 2730dc464..841f40338 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/ActivityDetailsParserTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/HuamiActivityDetailsParserTest.java @@ -17,15 +17,15 @@ import nodomain.freeyourgadget.gadgetbridge.export.GPXExporter; import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint; import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip.ActivityDetailsParser; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiActivityDetailsParser; import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils; import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class ActivityDetailsParserTest extends TestBase { - private static final URL DETAILS_1 = ActivityDetailsParserTest.class.getClassLoader().getResource("ActivityDetailsDump1.txt"); +public class HuamiActivityDetailsParserTest extends TestBase { + private static final URL DETAILS_1 = HuamiActivityDetailsParserTest.class.getClassLoader().getResource("ActivityDetailsDump1.txt"); private static final long MAX_DETAILS = 1024 * 1024; private static Date baseTime; @@ -38,7 +38,7 @@ public class ActivityDetailsParserTest extends TestBase { public void testActivityDetails() throws Exception { BipActivitySummary summary = createSummary(); - ActivityDetailsParser parser = new ActivityDetailsParser(summary); + HuamiActivityDetailsParser parser = new HuamiActivityDetailsParser(summary); parser.setSkipCounterByte(true); try (InputStream in = getContents(DETAILS_1)) { ActivityTrack track = parser.parse(FileUtils.readAll(in, MAX_DETAILS)); @@ -79,7 +79,7 @@ public class ActivityDetailsParserTest extends TestBase { summary.setBaseLatitude(baseLati); summary.setBaseAltitude(baseAlti); - ActivityDetailsParser parser = new ActivityDetailsParser(summary); + HuamiActivityDetailsParser parser = new HuamiActivityDetailsParser(summary); parser.setSkipCounterByte(true); try (InputStream in = getContents(DETAILS_1)) { ActivityTrack track = parser.parse(FileUtils.readAll(in, MAX_DETAILS));