Skip to content

MS-886 Unnecessary licence checks #1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luhmirin-s merged 1 commit into from
Feb 24, 2025
Merged

MS-886 Unnecessary licence checks #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions face/capture/src/main/java/com/simprints/face/capture/screens/FaceCaptureViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import com.simprints.face.capture.usecases.SaveFaceImageUseCase
import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
import com.simprints.face.infra.biosdkresolver.ResolveFaceBioSdkUseCase
import com.simprints.infra.authstore.AuthStore
import com.simprints.infra.config.store.models.experimental
import com.simprints.infra.config.sync.ConfigManager
import com.simprints.infra.license.LicenseRepository
import com.simprints.infra.license.LicenseStatus
Expand Down Expand Up @@ -56,6 +55,7 @@ internal class FaceCaptureViewModel @Inject constructor(
// Updated in live feedback screen
var attemptNumber: Int = 0
var samplesToCapture = 1
var initialised = false

var shouldCheckCameraPermissions = AtomicBoolean(true)

Expand Down Expand Up @@ -90,6 +90,11 @@ internal class FaceCaptureViewModel @Inject constructor(
}

fun initFaceBioSdk(activity: Activity) = viewModelScope.launch {
if (initialised) {
Simber.i("Face bio SDK already initialised", tag = FACE_CAPTURE)
return@launch
}

Simber.i("Starting face capture flow", tag = FACE_CAPTURE)

val licenseVendor = Vendor.RankOne
Expand Down Expand Up @@ -124,10 +129,9 @@ internal class FaceCaptureViewModel @Inject constructor(
saveLicenseCheckEvent(licenseVendor, licenseStatus)
}

fun setupAutoCapture() =
viewModelScope.launch {
_isAutoCaptureEnabled.postValue(isUsingAutoCapture())
}
fun setupAutoCapture() = viewModelScope.launch {
_isAutoCaptureEnabled.postValue(isUsingAutoCapture())
}

private suspend fun initialize(
activity: Activity,
Expand All @@ -139,6 +143,7 @@ internal class FaceCaptureViewModel @Inject constructor(
// This is should reported as an error
return LicenseStatus.ERROR
}
initialised = true
return LicenseStatus.VALID
}

Expand Down
8 changes: 5 additions & 3 deletions face/capture/src/test/java/com/simprints/face/capture/screens/FaceCaptureViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import com.simprints.face.capture.usecases.SimpleCaptureEventReporter
import com.simprints.face.infra.basebiosdk.initialization.FaceBioSdkInitializer
import com.simprints.infra.authstore.AuthStore
import com.simprints.infra.config.store.models.FaceConfiguration.ImageSavingStrategy
import com.simprints.infra.config.store.models.experimental
import com.simprints.infra.config.sync.ConfigManager
import com.simprints.infra.license.LicenseRepository
import com.simprints.infra.license.LicenseStatus
Expand Down Expand Up @@ -161,7 +160,7 @@ class FaceCaptureViewModelTest {
}

@Test
fun `test initFaceBioSdk should initialize faceBioSdk`() {
fun `test initFaceBioSdk should initialize faceBioSdk only once`() {
// Given
val license = "license"
every { faceBioSdkInitializer.tryInitWithLicense(any(), license) } returns true
Expand All @@ -173,8 +172,11 @@ class FaceCaptureViewModelTest {

// When
viewModel.initFaceBioSdk(mockk())
viewModel.initFaceBioSdk(mockk())
viewModel.initFaceBioSdk(mockk())

// Then
coVerify { faceBioSdkInitializer.tryInitWithLicense(any(), license) }
coVerify(exactly = 1) { faceBioSdkInitializer.tryInitWithLicense(any(), license) }
assertThat(licenseStatusSlot.captured).isEqualTo(LicenseStatus.VALID)
}

Expand Down