Merge pull request #13 from tiritea/master

Update to ODK Collect v2024.2.4 release

Author: tiritea

.circleci/config.yml

@@ -7,7 +7,7 @@ references:
   android_config: &android_config
     working_directory: ~/work
     docker:
-      - image: cimg/android:2023.10.1
+      - image: cimg/android:2024.01
     resource_class: medium+
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
       - checkout
       - run:
           name: Generate combined build.gradle file for cache key
-          command: cat build.gradle */build.gradle .circleci/gradle.properties .circleci/config.yml buildSrc/src/main/java/dependencies/Dependencies.kt buildSrc/src/main/java/dependencies/Versions.kt > deps.txt
+          command: cat build.gradle */build.gradle */build.gradle.kts .circleci/gradle.properties .circleci/config.yml buildSrc/src/main/java/dependencies/Dependencies.kt buildSrc/src/main/java/dependencies/Versions.kt > deps.txt
       - restore_cache:
           keys:
             - compile-deps-{{ checksum "deps.txt" }}
@@ -230,8 +230,8 @@ jobs:
           command: ./gradlew assembleSelfSignedRelease
 
       - run:
-          name: Check APK size isn't larger than 10.6MB
-          command: if [ $(ls -l collect_app/build/outputs/apk/selfSignedRelease/*.apk | awk '{print $5}') -gt 10600000 ]; then exit 1; fi
+          name: Check APK size isn't larger than 11.5MB
+          command: ./check-size.sh
 
       - run:
           name: Copy APK to predictable path for artifact storage
@@ -282,7 +282,7 @@ jobs:
               --type instrumentation \
               --app collect_app/build/outputs/apk/debug/*.apk \
               --test collect_app/build/outputs/apk/androidTest/debug/*.apk \
-              --device model=MediumPhone.arm,version=30,locale=en,orientation=portrait \
+              --device model=MediumPhone.arm,version=34,locale=en,orientation=portrait \
               --results-bucket opendatakit-collect-test-results \
               --directories-to-pull /sdcard --timeout 20m \
               --test-targets "package org.odk.collect.android.feature.smoke"
@@ -333,9 +333,10 @@ jobs:
               --num-uniform-shards=25 \
               --app collect_app/build/outputs/apk/debug/*.apk \
               --test collect_app/build/outputs/apk/androidTest/debug/*.apk \
-              --device model=MediumPhone.arm,version=30,locale=en,orientation=portrait \
+              --device model=MediumPhone.arm,version=34,locale=en,orientation=portrait \
               --results-bucket opendatakit-collect-test-results \
-              --directories-to-pull /sdcard --timeout 20m
+              --directories-to-pull /sdcard --timeout 20m \
+              --test-targets "notPackage org.odk.collect.android.regression"
             fi
           no_output_timeout: 25m
 

.circleci/test_modules.txt

@@ -1,10 +1,10 @@
 shared
-formstest
+forms-test
 androidshared
 async
 strings
-audioclips
-audiorecorder
+audio-clips
+audio-recorder
 projects
 location
 geo
@@ -21,3 +21,5 @@ metadata
 selfie-camera
 draw
 printer
+lists
+web-page

.editorconfig

@@ -0,0 +1,23 @@
+root = true
+
+[*.{kt,kts}]
+ktlint_standard_no-blank-lines-in-chained-method-calls = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_no-empty-first-line-in-class-body = disabled
+ktlint_standard_argument-list-wrapping = disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_max-line-length = disabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_value-parameter-comment = disabled
+ktlint_standard_property-naming = disabled
+ktlint_standard_value-argument-comment = disabled
+ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_no-consecutive-comments = disabled
+ktlint_standard_enum-wrapping = disabled
+ktlint_standard_statement-wrapping = disabled
+ktlint_standard_try-catch-finally-spacing = disabled
+ktlint_standard_wrapping = disabled

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,5 +19,6 @@ https://github.com/getodk/collect/blob/master/docs/CONTRIBUTING.md
 - [ ] added or modified tests for any new or changed behavior
 - [ ] run `./gradlew connectedAndroidTest` (or `./gradlew testLab`) and confirmed all checks still pass
 - [ ] added a comment above any new strings describing it for translators
+- [ ] added any new strings with date formatting to `DateFormatsTest`
 - [ ] verified that any code or assets from external sources are properly credited in comments and/or in the [about file](https://github.com/getodk/collect/blob/master/collect_app/src/main/assets/open_source_licenses.html).
 - [ ] verified that any new UI elements use theme colors. [UI Components Style guidelines](https://github.com/getodk/collect/blob/master/docs/CODE-GUIDELINES.md#ui-components-style-guidelines)

analytics/build.gradle.kts

@@ -37,7 +37,5 @@ dependencies {
     implementation(Dependencies.kotlin_stdlib)
     implementation(Dependencies.androidx_core_ktx)
     implementation(Dependencies.firebase_crashlytics)
-    implementation(Dependencies.firebase_analytics) {
-        exclude(group = "com.google.guava")
-    }
+    implementation(Dependencies.firebase_analytics)
 }

analytics/src/main/java/org/odk/collect/analytics/Analytics.kt

@@ -41,5 +41,9 @@ interface Analytics {
         fun setParam(key: String, value: String) {
             params[key] = value
         }
+
+        fun setUserProperty(name: String, value: String) {
+            instance.setUserProperty(name, value)
+        }
     }
 }

androidshared/build.gradle.kts

@@ -59,6 +59,7 @@ dependencies {
     implementation(Dependencies.play_services_location)
 
     testImplementation(project(":test-shared"))
+    testImplementation(project(":androidtest"))
     testImplementation(Dependencies.junit)
     testImplementation(Dependencies.androidx_test_ext_junit)
     testImplementation(Dependencies.androidx_test_espresso_core)

androidshared/src/androidTest/java/org/odk/collect/androidshared/bitmap/ImageCompressorTest.kt

@@ -153,7 +153,6 @@ class ImageCompressorTest {
             ExifInterface.TAG_GPS_SATELLITES to "8",
             ExifInterface.TAG_GPS_STATUS to "A",
             ExifInterface.TAG_ORIENTATION to "1",
-
             // unsupported exif tags
             ExifInterface.TAG_THUMBNAIL_IMAGE_LENGTH to "5",
             ExifInterface.TAG_DNG_VERSION to "100"

androidshared/src/main/java/org/odk/collect/androidshared/async/TrackableWorker.kt

@@ -3,6 +3,7 @@ package org.odk.collect.androidshared.async
 import org.odk.collect.androidshared.livedata.MutableNonNullLiveData
 import org.odk.collect.androidshared.livedata.NonNullLiveData
 import org.odk.collect.async.Scheduler
+import java.util.concurrent.atomic.AtomicInteger
 import java.util.function.Consumer
 import java.util.function.Supplier
 
@@ -11,10 +12,15 @@ class TrackableWorker(private val scheduler: Scheduler) {
     private val _isWorking = MutableNonNullLiveData(false)
     val isWorking: NonNullLiveData<Boolean> = _isWorking
 
+    private var activeBackgroundJobsCounter = AtomicInteger(0)
+
     fun <T> immediate(background: Supplier<T>, foreground: Consumer<T>) {
+        activeBackgroundJobsCounter.incrementAndGet()
         _isWorking.value = true
         scheduler.immediate(background) { result ->
-            _isWorking.value = false
+            if (activeBackgroundJobsCounter.decrementAndGet() == 0) {
+                _isWorking.value = false
+            }
             foreground.accept(result)
         }
     }

androidshared/src/main/java/org/odk/collect/androidshared/bitmap/ImageFileUtils.kt

@@ -150,12 +150,12 @@ object ImageFileUtils {
         }
         if (sourceFileExif == null ||
             !EXIF_ORIENTATION_ROTATIONS.contains(
-                    sourceFileExif
-                        .getAttributeInt(
-                                ExifInterface.TAG_ORIENTATION,
-                                ExifInterface.ORIENTATION_UNDEFINED
-                            )
-                )
+                sourceFileExif
+                    .getAttributeInt(
+                        ExifInterface.TAG_ORIENTATION,
+                        ExifInterface.ORIENTATION_UNDEFINED
+                    )
+            )
         ) {
             // Source Image doesn't have any EXIF Rotations, so a normal file copy will suffice
             sourceFile.copyTo(destFile, true)