Fix workflow errors

Droid-ify · Mar 27, 2024 · 2036789 · 2036789
1 parent d22b225
commit 2036789
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/core/data/src/main/java/com/looker/core/data/fdroid/sync/IndexDownloader.kt b/core/data/src/main/java/com/looker/core/data/fdroid/sync/IndexDownloader.kt
@@ -1,5 +1,6 @@
 package com.looker.core.data.fdroid.sync
 
+import com.looker.core.domain.model.Fingerprint
 import com.looker.core.domain.model.Repo
 import org.fdroid.index.v1.IndexV1
 import org.fdroid.index.v2.Entry
@@ -20,7 +21,7 @@ interface IndexDownloader {
 
 data class IndexDownloadResponse<T>(
     val index: T,
-    val fingerprint: String,
+    val fingerprint: Fingerprint,
     val lastModified: Long?,
     val etag: String?
 )

diff --git a/core/data/src/main/java/com/looker/core/data/fdroid/sync/IndexDownloaderImpl.kt b/core/data/src/main/java/com/looker/core/data/fdroid/sync/IndexDownloaderImpl.kt
@@ -3,6 +3,7 @@ package com.looker.core.data.fdroid.sync
 import com.looker.core.common.signature.FileValidator
 import com.looker.core.data.fdroid.sync.signature.EntryValidator
 import com.looker.core.data.fdroid.sync.signature.IndexValidator
+import com.looker.core.domain.model.Fingerprint
 import com.looker.core.domain.model.Repo
 import com.looker.network.Downloader
 import com.looker.network.NetworkResponse
@@ -52,7 +53,7 @@ class IndexDownloaderImpl @Inject constructor(
         }
         IndexDownloadResponse(
             index = fileIndex!!,
-            fingerprint = repoFingerprint!!,
+            fingerprint = Fingerprint(repoFingerprint!!),
             lastModified = fileIndex?.repo?.timestamp,
             etag = (response as NetworkResponse.Success).etag
         )
@@ -90,7 +91,7 @@ class IndexDownloaderImpl @Inject constructor(
         require(isFingerprintAndIndexValid) { "Empty Fingerprint" }
         IndexDownloadResponse(
             index = fileEntry!!,
-            fingerprint = repoFingerprint!!,
+            fingerprint = Fingerprint(repoFingerprint!!),
             lastModified = fileEntry?.timestamp,
             etag = (response as NetworkResponse.Success).etag
         )

diff --git a/core/data/src/main/java/com/looker/core/data/fdroid/sync/signature/EntryValidator.kt b/core/data/src/main/java/com/looker/core/data/fdroid/sync/signature/EntryValidator.kt
@@ -6,6 +6,7 @@ import com.looker.core.common.extension.fingerprint
 import com.looker.core.common.extension.toJarFile
 import com.looker.core.common.signature.FileValidator
 import com.looker.core.common.signature.ValidationException
+import com.looker.core.domain.model.Fingerprint
 import com.looker.core.domain.model.Repo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -20,9 +21,7 @@ class EntryValidator(
 ) : FileValidator {
     override suspend fun validate(file: File) = withContext(Dispatchers.IO) {
         val (entry, fingerprint) = getEntryAndFingerprint(file)
-        if (repo.fingerprint.isNotBlank() &&
-            !repo.fingerprint.equals(fingerprint, ignoreCase = true)
-        ) {
+        if (repo.fingerprint.check(Fingerprint(fingerprint))) {
             throw ValidationException(
                 "Expected Fingerprint: ${repo.fingerprint}, Acquired Fingerprint: $fingerprint"
             )

diff --git a/core/data/src/main/java/com/looker/core/data/fdroid/sync/signature/IndexValidator.kt b/core/data/src/main/java/com/looker/core/data/fdroid/sync/signature/IndexValidator.kt
@@ -6,6 +6,7 @@ import com.looker.core.common.extension.fingerprint
 import com.looker.core.common.extension.toJarFile
 import com.looker.core.common.signature.FileValidator
 import com.looker.core.common.signature.ValidationException
+import com.looker.core.domain.model.Fingerprint
 import com.looker.core.domain.model.Repo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -20,9 +21,7 @@ class IndexValidator(
 ) : FileValidator {
     override suspend fun validate(file: File) = withContext(Dispatchers.IO) {
         val (index, fingerprint) = getIndexAndFingerprint(file)
-        if (repo.fingerprint.isNotBlank() &&
-            !repo.fingerprint.equals(fingerprint, ignoreCase = true)
-        ) {
+        if (repo.fingerprint.check(Fingerprint(fingerprint))) {
             throw ValidationException(
                 "Expected Fingerprint: ${repo.fingerprint}, Acquired Fingerprint: $fingerprint"
             )