[MS 450] Merge Landscape Support epic with the main branch

.clabot

@@ -21,7 +21,7 @@
     "ybourgery",
     "simprints-cloud-ci-bot", 
     "dependabot[bot]",
-    "transifex-integration"
+    "transifex-integration[bot]"
   ],
   "message": "We require contributors to sign our Contributor License Agreement. For us to review and merge your code, don't hesitate to get in touch with @chrisjroyce, @TristramN or @mharvey83 to get yourself added.",
   "label": "...",

.github/workflows/deploy-to-firebase-distribution.yml

@@ -11,6 +11,7 @@ on:
 jobs:
     deploy-to-firebase:
         runs-on: ubuntu-latest
+        timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT_MINUTES) }}
 
         concurrency:
             group: firebase-${{ inputs.buildType }}-workflow #only one instance of this workflow can run at a time

.github/workflows/deploy-to-internal.yml

@@ -15,14 +15,12 @@ jobs:
     deploy-to-internal:
 
         runs-on: ubuntu-latest
+        timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT_MINUTES) }}
 
         concurrency:
             group: release-internal-workflow #only one instance of this workflow can run at a time
             cancel-in-progress: true
 
-        permissions:
-            contents: write # A write permission For Auto tagging the releases
-
         environment: internal
 
         env:
@@ -66,9 +64,12 @@ jobs:
 
             -   name: Build the Release bundle
                 run: ./gradlew id:bundleRelease
+            -   name: Upload Release bundle
+                uses: actions/upload-artifact@v4
+                with:
+                    name: release-bundle
+                    path: id/build/outputs/bundle/release/*.aab
 
             -   name: Publish Release bundle
                 run: ./gradlew id:publishReleaseBundle
-
-            -   name: Set release tag
-                run: bash ci/deployment/release_tag_setup
+                continue-on-error: true

.github/workflows/pr-checks.yml

@@ -14,7 +14,6 @@ jobs:
         secrets: inherit
         with:
             modules: |
-                id
                 infra:core
                 infra:ui-base
                 infra:network
@@ -32,7 +31,7 @@ jobs:
                 infra:realm
                 infra:recent-user-activity
                 infra:config-store
-                infra:config-sync
+                infra:sync
                 infra:auth-store
                 infra:auth-logic
             reportsId: infra1
@@ -46,7 +45,6 @@ jobs:
                 infra:events
                 infra:event-sync
                 infra:enrolment-records-store
-                infra:enrolment-records-sync
                 infra:license
                 infra:images
             reportsId: infra2

.github/workflows/promote-artifact.yml

@@ -19,9 +19,13 @@ on:
 jobs:
     promote-artifact:
         runs-on: ubuntu-latest
+        timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT_MINUTES) }}
 
         environment: ${{inputs.deployment-track}}   # Dynamically set the job environment based on the input
 
+        permissions:
+            contents: write # A write permission For Auto tagging the releases
+
         concurrency:
             group: promote-release-workflow #only one instance of this workflow can run at a time
 
@@ -55,6 +59,10 @@ jobs:
                 if: ${{inputs.deployment-track == 'Prod-25-Percent-Rollout'}}
                 run: ./gradlew promoteArtifact --from-track alpha --promote-track production --release-status inProgress --user-fraction .25
 
+            -   name: Set release tag
+                if: ${{inputs.deployment-track == 'Prod-25-Percent-Rollout'}}
+                run: bash ci/deployment/release_tag_setup
+
             -   name: Promote to production 50%
                 if: ${{inputs.deployment-track == 'Prod-50-Percent-Rollout'}}
                 run: ./gradlew promoteArtifact --update production --user-fraction .5

.github/workflows/refresh-gradle-cache.yml

@@ -9,6 +9,7 @@ on:
 jobs:
     refresh-caches:
         runs-on: ubuntu-latest
+        timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT_MINUTES) }}
 
         env:
             GOOGLE_SERVICES_FILE: ${{ secrets.GOOGLE_SERVICES_FILE}}

.github/workflows/run-unit-tests.yml

@@ -18,6 +18,7 @@ jobs:
 
     test-modules:
         runs-on: ubuntu-latest
+        timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT_MINUTES) }}
 
         env:
             GOOGLE_SERVICES_FILE: ${{ secrets.GOOGLE_SERVICES_FILE}}

.github/workflows/sonar-scan.yml

@@ -10,6 +10,7 @@ jobs:
             GOOGLE_SERVICES_FILE: ${{ secrets.GOOGLE_SERVICES_FILE}}
 
         runs-on: ubuntu-latest
+        timeout-minutes: ${{ fromJSON(vars.JOB_TIMEOUT_MINUTES) }}
         steps:
             -   name: Checkout
                 uses: actions/checkout@v4

build-logic/build_properties.gradle.kts

@@ -16,7 +16,7 @@ extra.apply {
      * Dev version >= 2023.4.1 is required for receiving encryption Tokens from BFSID [CORE-2502]
      * Dev version >= 2023.4.0 is required for receiving new fingerprint configurations  [CORE-3033]
      */
-    set("VERSION_NAME", "2023.4.0")
+    set("VERSION_NAME", "2024.1.1")
 
     /**
      * Build type. The version code describes which build type was used for the build.

build-logic/convention/src/main/kotlin/PipelineSonarConventionPlugin.kt

@@ -38,6 +38,6 @@ class PipelineSonarConventionPlugin : Plugin<Project> {
         private val cacheDir = "${File.separator}build${File.separator}.sonar"
         private val jacocoDir = "${File.separator}build${File.separator}reports${File.separator}jacoco${File.separator}jacocoTestReport${File.separator}jacocoTestReport.xml"
         private val sourceDir = "${File.separator}src${File.separator}main${File.separator}java${File.separator}com${File.separator}simprints"
-        private val binariesDir = "${File.separator}build${File.separator}intermediates${File.separator}**"
+        private val binariesDir = "${File.separator}build${File.separator}"
     }
 }

build-logic/convention/src/main/kotlin/common/KotlinAndroid.kt

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = SdkVersions.TARGET
@@ -39,6 +39,6 @@ internal fun Project.configureKotlinAndroid(
     }
 }
 
-fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }

build-logic/sonarqube.gradle

@@ -2,7 +2,7 @@ apply plugin: "org.sonarqube"
 
 def jacocoDir = "${File.separator}build${File.separator}reports${File.separator}jacoco${File.separator}jacocoTestReport${File.separator}jacocoTestReport.xml"
 def sourceDir = "${File.separator}src${File.separator}main${File.separator}java${File.separator}com${File.separator}simprints"
-def binariesDir = "${File.separator}build${File.separator}intermediates${File.separator}**"
+def binariesDir = "${File.separator}build${File.separator}"
 
 sonarqube {
     properties {

face/capture/src/main/java/com/simprints/face/capture/screens/FaceCaptureViewModel.kt

@@ -18,7 +18,10 @@ import com.simprints.infra.config.store.ConfigRepository
 import com.simprints.infra.config.store.models.FaceConfiguration
 import com.simprints.infra.facebiosdk.initialization.FaceBioSdkInitializer
 import com.simprints.infra.license.LicenseRepository
+import com.simprints.infra.license.LicenseStatus
+import com.simprints.infra.license.SaveLicenseCheckEventUseCase
 import com.simprints.infra.license.Vendor
+import com.simprints.infra.license.determineLicenseStatus
 import com.simprints.infra.logging.LoggingConstants.CrashReportTag
 import com.simprints.infra.logging.Simber
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -33,7 +36,8 @@ internal class FaceCaptureViewModel @Inject constructor(
     private val eventReporter: SimpleCaptureEventReporter,
     private val bitmapToByteArray: BitmapToByteArrayUseCase,
     private val licenseRepository: LicenseRepository,
-    private val faceBioSdkInitializer: FaceBioSdkInitializer
+    private val faceBioSdkInitializer: FaceBioSdkInitializer,
+    private val saveLicenseCheckEvent: SaveLicenseCheckEventUseCase,
 ) : ViewModel() {
 
     // Updated in live feedback screen
@@ -73,11 +77,22 @@ internal class FaceCaptureViewModel @Inject constructor(
 
     fun initFaceBioSdk(activity: Activity) = viewModelScope.launch {
         val license = licenseRepository.getCachedLicense(Vendor.RANK_ONE)
-        if (!faceBioSdkInitializer.tryInitWithLicense(activity, license)) {
-            Simber.tag(CrashReportTag.LICENSE.name).i("License is invalid")
+        var licenseStatus = license.determineLicenseStatus()
+
+        if (licenseStatus == LicenseStatus.VALID) {
+            if (!faceBioSdkInitializer.tryInitWithLicense(activity, license!!.data)) {
+                // License is valid but the SDK failed to initialize
+                // This is should reported as an error
+                licenseStatus = LicenseStatus.ERROR
+            }
+        }
+        if (licenseStatus != LicenseStatus.VALID) {
+            Simber.tag(CrashReportTag.LICENSE.name).i("Face license is $licenseStatus")
             licenseRepository.deleteCachedLicense(Vendor.RANK_ONE)
             _invalidLicense.send()
         }
+        saveLicenseCheckEvent(Vendor.RANK_ONE, licenseStatus)
+
     }
 
     fun getSampleDetection() = faceDetections.firstOrNull()

face/capture/src/main/java/com/simprints/face/capture/screens/controller/FaceCaptureControllerFragment.kt

@@ -5,6 +5,7 @@ import android.view.View
 import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.simprints.core.livedata.LiveDataEventObserver
@@ -19,6 +20,7 @@ import com.simprints.feature.exitform.exitFormConfiguration
 import com.simprints.feature.exitform.toArgs
 import com.simprints.infra.uibase.navigation.finishWithResult
 import com.simprints.infra.uibase.navigation.handleResult
+import com.simprints.infra.uibase.navigation.navigateSafely
 import dagger.hilt.android.AndroidEntryPoint
 import com.simprints.infra.resources.R as IDR
 
@@ -29,9 +31,17 @@ internal class FaceCaptureControllerFragment : Fragment(R.layout.fragment_face_c
 
     private val viewModel: FaceCaptureViewModel by activityViewModels()
 
-    private fun internalNavController() = childFragmentManager
-        .findFragmentById(R.id.orchestrator_host_fragment)
-        ?.findNavController()
+
+    private val hostFragment: Fragment?
+        get() = childFragmentManager
+            .findFragmentById(R.id.orchestrator_host_fragment)
+
+    private val internalNavController: NavController?
+        get() = hostFragment?.findNavController()
+
+    private val currentlyDisplayedInternalFragment: Fragment?
+        get() = hostFragment?.childFragmentManager?.fragments?.first()
+
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -45,7 +55,7 @@ internal class FaceCaptureControllerFragment : Fragment(R.layout.fragment_face_c
             if (option != null) {
                 findNavController().finishWithResult(this, it)
             } else {
-                internalNavController()?.navigate(R.id.action_global_faceLiveFeedback)
+                internalNavController?.navigateSafely(currentlyDisplayedInternalFragment, R.id.action_global_faceLiveFeedback)
             }
         }
 
@@ -60,11 +70,12 @@ internal class FaceCaptureControllerFragment : Fragment(R.layout.fragment_face_c
         viewModel.setupCapture(args.samplesToCapture)
         initFaceBioSdk()
         viewModel.recaptureEvent.observe(viewLifecycleOwner, LiveDataEventObserver {
-            internalNavController()?.navigate(R.id.action_global_faceLiveFeedback)
+            internalNavController?.navigateSafely(currentlyDisplayedInternalFragment, R.id.action_global_faceLiveFeedback)
         })
 
         viewModel.exitFormEvent.observe(viewLifecycleOwner, LiveDataEventObserver {
-            findNavController().navigate(
+            findNavController().navigateSafely(
+                this,
                 R.id.action_global_refusalFragment,
                 exitFormConfiguration {
                     titleRes = IDR.string.exit_form_title_face
@@ -82,20 +93,21 @@ internal class FaceCaptureControllerFragment : Fragment(R.layout.fragment_face_c
         })
 
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
-            when (internalNavController()?.currentDestination?.id) {
+            when (internalNavController?.currentDestination?.id) {
                 R.id.facePreparationFragment,
                 R.id.faceLiveFeedbackFragment -> viewModel.handleBackButton()
 
                 else -> findNavController().popBackStack()
             }
         }
 
-        internalNavController()?.setGraph(R.navigation.graph_face_capture_internal)
+        internalNavController?.setGraph(R.navigation.graph_face_capture_internal)
     }
 
     private fun initFaceBioSdk() {
         viewModel.invalidLicense.observe(viewLifecycleOwner) {
-            findNavController().navigate(
+            findNavController().navigateSafely(
+                this,
                 R.id.action_global_errorFragment,
                 InvalidFaceLicenseAlert.toAlertArgs()
             )

face/capture/src/main/java/com/simprints/face/capture/screens/controller/InvalidFaceLicenseAlert.kt

@@ -1,13 +1,12 @@
 package com.simprints.face.capture.screens.controller
 
 import androidx.annotation.Keep
-import androidx.core.os.bundleOf
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.feature.alert.alertConfiguration
 import com.simprints.feature.alert.config.AlertButtonConfig
 import com.simprints.feature.alert.config.AlertColor
 import com.simprints.feature.alert.toArgs
-import com.simprints.infra.events.event.domain.models.AlertScreenEvent
+import com.simprints.infra.events.event.domain.models.AlertScreenEvent.AlertScreenPayload.AlertScreenEventType
 import com.simprints.infra.resources.R
 import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports
 
@@ -20,9 +19,7 @@ internal object InvalidFaceLicenseAlert {
         messageRes = R.string.configuration_licence_invalid_message
         image = R.drawable.ic_exclamation
         leftButton = AlertButtonConfig.Close
-        payload = bundleOf(PAYLOAD_TYPE_KEY to AppErrorReason.FACE_LICENSE_INVALID)
-        eventType = AlertScreenEvent.AlertScreenPayload.AlertScreenEventType.FACE_LICENSE_INVALID
+        appErrorReason = AppErrorReason.LICENSE_INVALID
+        eventType = AlertScreenEventType.LICENSE_INVALID
     }.toArgs()
-
-    private const val PAYLOAD_TYPE_KEY = "error_type"
 }