Update NDK and mfkey32 state

flipperdevices · Nov 2, 2023 · bd6d968 · bd6d968
1 parent b5d4bac
commit bd6d968
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.../mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/model/MfKey32State.kt b/.../mfkey32/screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/model/MfKey32State.kt
@@ -7,7 +7,7 @@ sealed class MfKey32State {
     data object WaitingForFlipper : MfKey32State()
 
     data class DownloadingRawFile(
-        val percent: Float?
+        val percent: Float
     ) : MfKey32State()
 
     data class Calculating(

diff --git a/.../screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/viewmodel/MfKey32ViewModel.kt b/.../screen/src/main/java/com/flipperdevices/nfc/mfkey32/screen/viewmodel/MfKey32ViewModel.kt
@@ -14,6 +14,7 @@ import com.flipperdevices.core.log.LogTagProvider
 import com.flipperdevices.core.log.error
 import com.flipperdevices.core.log.info
 import com.flipperdevices.core.preference.FlipperStorageProvider
+import com.flipperdevices.core.progress.ProgressWrapperTracker
 import com.flipperdevices.core.ui.lifecycle.LifecycleViewModel
 import com.flipperdevices.metric.api.MetricApi
 import com.flipperdevices.metric.api.events.SimpleEvent
@@ -143,16 +144,19 @@ class MfKey32ViewModel @VMInject constructor(
 
     private suspend fun prepare(): Boolean {
         info { "Flipper connected" }
-        mfKey32StateFlow.emit(MfKey32State.DownloadingRawFile(null))
+        mfKey32StateFlow.emit(MfKey32State.DownloadingRawFile(0f))
 
         try {
             flipperStorageApi.download(
                 pathOnFlipper = PATH_NONCE_LOG,
                 fileOnAndroid = fileWithNonce,
-                progressListener = {
-                    info { "Download file progress $it" }
-                    mfKey32StateFlow.emit(MfKey32State.DownloadingRawFile(it))
-                }
+                progressListener = ProgressWrapperTracker(
+                    progressListener = {
+                        info { "Download file progress $it" }
+                        mfKey32StateFlow.emit(MfKey32State.DownloadingRawFile(it))
+                    },
+                    max = 0.99f
+                )
             )
         } catch (error: Throwable) {
             error(error) { "Not found $PATH_NONCE_LOG" }

diff --git a/components/nfc/tools/impl/build.gradle.kts b/components/nfc/tools/impl/build.gradle.kts
@@ -10,8 +10,8 @@ android {
     externalNativeBuild {
         cmake {
             path("src/main/cpp/CMakeLists.txt")
-            version = "3.22.1"
-            ndkVersion = "25.1.8937393"
+            version = "3.27.7"
+            ndkVersion = "26.1.10909125"
         }
     }
 }