RAMP customizations for v1

.github/workflows/rampcapture-github-release-signed-apk.yml

@@ -0,0 +1,130 @@
+name: Build signed RAMPcapture APK release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - ramp-main
+
+concurrency:
+  group: rampcapture-github-release-signed-apk
+  cancel-in-progress: false
+
+env:
+  MAIN_PROJECT_MODULE: app
+
+jobs:
+  rampcapture-github-release-signed-apk:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      CURRENT_FORK_REPOSITORY: ${{ github.repository }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Get current date and time
+        id: date-time
+        run: echo "dateTimeUtc=$(date -u +'%Y-%m-%d-%H%M')" >> "$GITHUB_OUTPUT"
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: zulu
+          java-version: '17'
+          cache: gradle
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      - name: Read upstream app version
+        id: read-version
+        working-directory: ./gradle
+        run: echo "vName=$(grep '^vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '\"')" >> "$GITHUB_OUTPUT"
+
+      - name: Determine next RAMPcapture fork release
+        id: release-info
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+
+          last_fork_number=0
+
+          while IFS= read -r tag_name; do
+            [[ "$tag_name" =~ ^RAMPcapture-DHIS2-v[0-9]+(\.[0-9]+)*-fork-([0-9]+)$ ]] || continue
+
+            candidate_fork_number="${BASH_REMATCH[2]}"
+            if (( candidate_fork_number > last_fork_number )); then
+              last_fork_number="$candidate_fork_number"
+            fi
+          done < <(
+            gh api --paginate "repos/$CURRENT_FORK_REPOSITORY/releases?per_page=100" --jq '.[].tag_name'
+          )
+
+          next_fork_number=$((last_fork_number + 1))
+          release_tag="RAMPcapture-DHIS2-v${{ steps.read-version.outputs.vName }}-fork-${next_fork_number}"
+          release_apk_name="${release_tag}-signed-release.apk"
+          release_apk_path="$RUNNER_TEMP/$release_apk_name"
+
+          {
+            echo "forkNumber=$next_fork_number"
+            echo "releaseTag=$release_tag"
+            echo "releaseApkName=$release_apk_name"
+            echo "releaseApkPath=$release_apk_path"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Decode keystore
+        id: decode-keystore
+        # Third-party action - pinned to commit SHA.
+        uses: timheuer/base64-to-file@604a8926a81a2da120d09b06bb76da9bba5aee6e
+        with:
+          fileName: dhis_keystore.jks
+          encodedString: ${{ secrets.KEYSTORE_BASE64 }}
+
+      - name: Build signed release APK
+        run: ./gradlew app:assembleDhis2Release
+        env:
+          SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          SIGNING_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          SIGNING_KEYSTORE_PATH: ${{ steps.decode-keystore.outputs.filePath }}
+
+      - name: Rename signed release APK for RAMPcapture release
+        run: |
+          set -euo pipefail
+
+          cp \
+            "${MAIN_PROJECT_MODULE}/build/outputs/apk/dhis2/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk" \
+            "${{ steps.release-info.outputs.releaseApkPath }}"
+
+      - name: Upload signed release APK artifact
+        uses: actions/upload-artifact@v7.0.0
+        with:
+          name: ${{ steps.release-info.outputs.releaseTag }}
+          path: ${{ steps.release-info.outputs.releaseApkPath }}
+
+      - name: Create GitHub release with signed APK
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+
+          release_notes=$(cat <<EOF
+          RAMPcapture signed APK release.
+
+          Fork version: ${{ steps.release-info.outputs.forkNumber }}.
+          Based on upstream DHIS2 version: v${{ steps.read-version.outputs.vName }}.
+
+          Release time: ${{ steps.date-time.outputs.dateTimeUtc }} UTC.
+          EOF
+          )
+
+          gh release create "${{ steps.release-info.outputs.releaseTag }}" \
+            "${{ steps.release-info.outputs.releaseApkPath }}" \
+            --repo "$CURRENT_FORK_REPOSITORY" \
+            --target "${{ github.sha }}" \
+            --title "${{ steps.release-info.outputs.releaseTag }}" \
+            --notes "$release_notes"

app/src/main/java/org/dhis2/data/service/SyncDataWorkerModule.kt

@@ -4,6 +4,7 @@ import dagger.Module
 import dagger.Provides
 import org.dhis2.commons.di.dagger.PerService
 import org.dhis2.commons.prefs.PreferenceProvider
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository as SimprintsRampDatastoreRepository
 import org.dhis2.data.service.workManager.WorkManagerController
 import org.dhis2.utils.analytics.AnalyticsHelper
 import org.hisp.dhis.android.core.D2
@@ -31,5 +32,6 @@ class SyncDataWorkerModule {
             analyticsHelper,
             syncStatusController,
             syncRepository,
+            SimprintsRampDatastoreRepository(d2),
         )
 }

app/src/main/java/org/dhis2/data/service/SyncGranularRxModule.kt

@@ -4,6 +4,7 @@ import dagger.Module
 import dagger.Provides
 import org.dhis2.commons.di.dagger.PerService
 import org.dhis2.commons.prefs.PreferenceProvider
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository as SimprintsRampDatastoreRepository
 import org.dhis2.data.service.workManager.WorkManagerController
 import org.dhis2.utils.analytics.AnalyticsHelper
 import org.hisp.dhis.android.core.D2
@@ -31,5 +32,6 @@ class SyncGranularRxModule {
             analyticsHelper,
             syncStatusController,
             syncRepository,
+            SimprintsRampDatastoreRepository(d2),
         )
 }

app/src/main/java/org/dhis2/data/service/SyncInitWorkerModule.kt

@@ -4,6 +4,7 @@ import dagger.Module
 import dagger.Provides
 import org.dhis2.commons.di.dagger.PerService
 import org.dhis2.commons.prefs.PreferenceProvider
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository as SimprintsRampDatastoreRepository
 import org.dhis2.data.service.workManager.WorkManagerController
 import org.dhis2.utils.analytics.AnalyticsHelper
 import org.hisp.dhis.android.core.D2
@@ -31,5 +32,6 @@ class SyncInitWorkerModule {
             analyticsHelper,
             syncStatusController,
             syncRepository,
+            SimprintsRampDatastoreRepository(d2),
         )
 }

app/src/main/java/org/dhis2/data/service/SyncMetadataWorkerModule.kt

@@ -4,6 +4,7 @@ import dagger.Module
 import dagger.Provides
 import org.dhis2.commons.di.dagger.PerService
 import org.dhis2.commons.prefs.PreferenceProvider
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository as SimprintsRampDatastoreRepository
 import org.dhis2.data.service.workManager.WorkManagerController
 import org.dhis2.utils.analytics.AnalyticsHelper
 import org.hisp.dhis.android.core.D2
@@ -31,5 +32,6 @@ class SyncMetadataWorkerModule {
             analyticsHelper,
             syncStatusController,
             syncRepository,
+            SimprintsRampDatastoreRepository(d2),
         )
 }

app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.kt

@@ -22,6 +22,7 @@ import org.dhis2.commons.prefs.Preference.Companion.TIME_DAILY
 import org.dhis2.commons.prefs.Preference.Companion.TIME_DATA
 import org.dhis2.commons.prefs.Preference.Companion.TIME_META
 import org.dhis2.commons.prefs.PreferenceProvider
+import org.dhis2.commons.simprints.ramp.repository.RampDatastoreRepository as SimprintsRampDatastoreRepository
 import org.dhis2.data.service.workManager.WorkManagerController
 import org.dhis2.data.service.workManager.WorkerItem
 import org.dhis2.data.service.workManager.WorkerType
@@ -49,6 +50,7 @@ class SyncPresenterImpl(
     private val analyticsHelper: AnalyticsHelper,
     private val syncStatusController: SyncStatusController,
     private val syncRepository: SyncRepository,
+    private val simprintsRampDatastoreRepository: SimprintsRampDatastoreRepository,
 ) : SyncPresenter {
     override fun initSyncControllerMap() {
         Completable
@@ -266,6 +268,10 @@ class SyncPresenterImpl(
                         .eq(FileResourceDomainType.ICON)
                         .download(),
                 ),
+            ).andThen(
+                Completable
+                    .fromAction { simprintsRampDatastoreRepository.sync() }
+                    .doOnError { Timber.e(it, "Error syncing Simprints RAMP datastore") },
             ).blockingAwait()
     }
 

app/src/main/java/org/dhis2/simprints/SimprintsMapBiometricSearchResultUseCase.kt

@@ -0,0 +1,62 @@
+package org.dhis2.simprints
+
+import android.app.Activity
+import android.content.Intent
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.dhis2.commons.simprints.repository.SimprintsSessionRepository
+import org.dhis2.commons.simprints.usecases.SimprintsHasAutoOpenEligibleIdentificationUseCase
+import org.dhis2.commons.simprints.utils.SimprintsIntentUtils
+import org.dhis2.mobile.commons.model.CustomIntentResponseDataModel
+import timber.log.Timber
+
+class SimprintsMapBiometricSearchResultUseCase(
+    private val sessionRepository: SimprintsSessionRepository,
+    private val hasAutoOpenEligibleIdentification: SimprintsHasAutoOpenEligibleIdentificationUseCase,
+    private val resultMapper: SimprintsCustomIntentResultMapper,
+) {
+    sealed class Result {
+        data class Identification(
+            val value: String,
+            val hasAutoOpenEligibleIdentification: Boolean,
+        ) : Result()
+
+        object SearchDropout : Result()
+
+        object NoMatches : Result()
+    }
+
+    operator fun invoke(
+        responseDataJson: String?,
+        resultCode: Int,
+        data: Intent?,
+        capturesSessionId: Boolean,
+    ): Result {
+        if (resultCode != Activity.RESULT_OK || !SimprintsIntentUtils.hasIdentificationResult(data)) {
+            return Result.SearchDropout
+        }
+
+        if (capturesSessionId) {
+            SimprintsIntentUtils.extractSessionId(data?.extras)?.let(sessionRepository::save)
+        }
+
+        val responseData = responseDataJson?.parseResponseData() ?: return Result.NoMatches
+        val value = resultMapper.map(responseData, data) ?: return Result.NoMatches
+
+        return Result.Identification(
+            value = value,
+            hasAutoOpenEligibleIdentification = hasAutoOpenEligibleIdentification(data?.extras),
+        )
+    }
+
+    private fun String.parseResponseData(): List<CustomIntentResponseDataModel>? =
+        try {
+            Gson().fromJson<List<CustomIntentResponseDataModel>>(
+                this,
+                object : TypeToken<List<CustomIntentResponseDataModel>>() {}.type,
+            )
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to parse CustomIntentResponseDataModel")
+            null
+        }
+}