updated the data encoding schema when uploading data; reduce the wait…

…time for re-upload
Local-Connectivity-Lab · Jun 2, 2023 · e598433 · e598433
1 parent 704634a
commit e598433
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/sync/UploadWorker.kt b/app/src/main/java/com/lcl/lclmeasurementtool/sync/UploadWorker.kt
@@ -59,8 +59,8 @@ class UploadWorker @AssistedInject constructor(
         fun periodicSyncWork() =
             PeriodicWorkRequestBuilder<DelegatingWorker>(4, TimeUnit.HOURS)
             .setConstraints(Constraints(requiredNetworkType = NetworkType.CONNECTED))
-            .setInitialDelay(10, TimeUnit.MINUTES)
-            .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, Duration.ofMinutes(5))
+            .setInitialDelay(5, TimeUnit.MINUTES)
+            .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, Duration.ofMinutes(10))
             .setInputData(UploadWorker::class.delegatedData())
             .build()
 

diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/util/NetworkUtil.kt b/app/src/main/java/com/lcl/lclmeasurementtool/util/NetworkUtil.kt
@@ -9,6 +9,6 @@ import kotlinx.serialization.json.Json
 fun prepareReportData(measureDataModel: BaseMeasureDataModel, userData: UserData): String {
     val serialized = Json.encodeToString(measureDataModel).toByteArray()
     val sig_m = ECDSA.Sign(serialized, ECDSA.DeserializePrivateKey(userData.skT.toByteArray()))
-    val report = MeasurementReportModel(sig_m.toString(), userData.hPKR.toStringUtf8(), serialized.toString(), userData.showData)
+    val report = MeasurementReportModel(Hex.encodeHexString(sig_m), Hex.encodeHexString(userData.hPKR.toByteArray()), Hex.encodeHexString(serialized), userData.showData)
     return Json.encodeToString(report)
 }