Merge branch 'master' into ashobhit/2958/integrate-sequence-handler-l…

…atest
google · Jan 18, 2025 · 75335d5 · 75335d5
2 parents ecd6996 + 040cbb5
commit 75335d5
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 97 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing to Ground for Android
 
 This document covers everything you need to know about contributing to Ground
-for Android. Before you get started, please make sure you read all of the 
+for Android. Before you get started, please make sure you read all of the
 sections and are able to sign our CLA.
 
 ## Contributor License Agreement (CLA)
@@ -18,11 +18,12 @@ again.
 
 ## Code reviews
 
-Before starting work on a change, comment on one of the [open issues](https://github.com/google/ground-android/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen)
+Before starting work on a change, comment on one of
+the [open issues](https://github.com/google/ground-android/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen)
 saying you'd like to take it on. If one does not exist, you can also
 [create one here](https://github.com/google/ground-android/issues/new).
 
-Be sure to reference this issue number in your pull request (e.g., 
+Be sure to reference this issue number in your pull request (e.g.,
 "Fixes #27").
 
 Make sure all checks on GitHub are passing.
@@ -45,92 +46,92 @@ contribute to the ground-android codebase.
 1. Fork this repository, see <https://help.github.com/articles/fork-a-repo/>.
 
 2. Clone your fork:
-    
-    `git clone https://github.com/<username>/ground-android.git`
-    
-    Where `<username>` is your github username.
+
+   `git clone https://github.com/<username>/ground-android.git`
+
+   Where `<username>` is your github username.
 
 3. Add the base repository as a remote:
-    
-    `git remote add upstream https://github.com/google/ground-android.git`
+
+   `git remote add upstream https://github.com/google/ground-android.git`
 
 4. Follow the instructions under the [Initial build
-configuration](#initial-build-configuration) section of this readme to set up
-your development environment.
+   configuration](#initial-build-configuration) section of this readme to set up
+   your development environment.
 
 ## Developer workflow
 
 After you have forked and cloned the repository, use the following steps to make
 and manage changes. After you have finished making changes, you can submit them
-to the base repository using a pull request. 
+to the base repository using a pull request.
 
 1. Pull changes from the base repository's master branch:
-    
-    `git pull upstream master`
+
+   `git pull upstream master`
 
 1. Create a new branch to track your changes:
-    
-    `git checkout -b <branch>`
-    
-    Where `<branch>` is a meaningful name for the branch you'll use to track
-    changes.
+
+   `git checkout -b <branch>`
+
+   Where `<branch>` is a meaningful name for the branch you'll use to track
+   changes.
 
 1. Make and test changes locally.
 
 1. Run code health checks locally and fix any errors.
 
-   1. Using Command-line:
-      1. `$ ./gradlew checkCode`
-    
-   1. Using Android Studio
-      1. Expand `gradle` side-tab (top-right corner in Android Studio IDE).
-      1. Click on `Execute gradle task` button (the one with gradle logo)
-      1. Type `checkCode` and press OK
-      
+    1. Using Command-line:
+        1. `$ ./gradlew checkCode`
+
+    1. Using Android Studio
+        1. Expand `gradle` side-tab (top-right corner in Android Studio IDE).
+        1. Click on `Execute gradle task` button (the one with gradle logo)
+        1. Type `checkCode` and press OK
+
 1. Add your changes to the staging area:
-    
-    `git add <files>`
-    
-    Where `<files>` are the files you changed.
-    
-    > **Note:** Run `git add .` to add all currently modified files to the
-    > staging area.
+
+   `git add <files>`
+
+   Where `<files>` are the files you changed.
+
+   > **Note:** Run `git add .` to add all currently modified files to the
+   > staging area.
 
 1. Commit your changes:
-    
-    `git commit -m <message>`
-    
-    Where `<message>` is a meaningful, short message describing the purpose of
-    your changes.
+
+   `git commit -m <message>`
+
+   Where `<message>` is a meaningful, short message describing the purpose of
+   your changes.
 
 1. Pull changes from the base repository's master branch, resolve conflicts if
-necessary:
-      
-    `git pull upstream master`
+   necessary:
+
+   `git pull upstream master`
 
 1. Push your changes to your github account:
-    
-    `git push -u origin <branch>`
-    
-    Where `<branch>` is the branch name you used in step 2.
+
+   `git push -u origin <branch>`
+
+   Where `<branch>` is the branch name you used in step 2.
 
 1. Create a [pull
-request](https://help.github.com/articles/about-pull-requests/) to have your
-changes reviewed and merged into the base repository. Reference the
-[issue](https://github.com/google/ground-android/issues) your changes resolve in
-either the commit message for your changes or in your pull request.
-    
-    > :exclamation: Any subsequent changes committed to the branch you used
-    > to open your PR are automatically included in the PR. If you've opened a
-    > PR but would like to continue to work on unrelated changes, be sure to
-    > start a new branch to track those changes. 
-
-    For more information on creating pull requests, see
-    <https://help.github.com/articles/creating-a-pull-request/>. 
-    
-    To learn more about referencing issues in your pull request or commit
-    messages, see
-    <https://help.github.com/articles/closing-issues-using-keywords/>.
+   request](https://help.github.com/articles/about-pull-requests/) to have your
+   changes reviewed and merged into the base repository. Reference the
+   [issue](https://github.com/google/ground-android/issues) your changes resolve in
+   either the commit message for your changes or in your pull request.
+
+   > :exclamation: Any subsequent changes committed to the branch you used
+   > to open your PR are automatically included in the PR. If you've opened a
+   > PR but would like to continue to work on unrelated changes, be sure to
+   > start a new branch to track those changes.
+
+   For more information on creating pull requests, see
+   <https://help.github.com/articles/creating-a-pull-request/>.
+
+   To learn more about referencing issues in your pull request or commit
+   messages, see
+   <https://help.github.com/articles/closing-issues-using-keywords/>.
 
 1. Celebrate!
 
@@ -142,7 +143,7 @@ either the commit message for your changes or in your pull request.
 
 1. Create a new Firebase project at:
 
-    https://console.firebase.google.com/
+   https://console.firebase.google.com/
 
 2. Add a new Android app with package name `com.google.android.ground`.
 
@@ -156,44 +157,17 @@ either the commit message for your changes or in your pull request.
 
 4. Download the config file for the Android app to `app/src/debug/google-services.json`
 
-### Set up Google Cloud Build (optional)
-
-Used to build with Google Cloud and for running integration tests:
-
-1. Install [google-cloud-sdk](https://cloud.google.com/sdk/docs/install)
-
-2. gcloud init
- 
-3. gcloud auth login
-  
-4. gcloud config set project [PROJECT_ID]
-
-### Updating GCB Docker Image to latest android sdk tool
-
-1. Ensure that the gcloud project setup is done
-
-2. Open `cloud-builder/Dockerfile-base`
-
-3. Search for `build-tools` in the file and replace the version with the latest version
-
-4. Run the following command 
-
-```
-$ cd cloud-builder
-$ gcloud builds submit --config=cloudbuild.yaml --substitutions=_ANDROID_VERSION=30
-```
-
-5. Ensure that the Docker image is uploaded under "Container Registry" in cloud project
-
 ### Troubleshooting
 
 * App crashes on start with following stacktrace:
- 
+
    ```
    java.lang.RuntimeException: Unable to get provider com.google.firebase.provider.FirebaseInitProvider: java.lang.IllegalArgumentException: Given String is empty or null
    ```
-    
-  Solution: Ensure `app/src/debug/google-services.json` exists and is valid, as per instructions in [Set up Firebase](#set-up-firebase). You may need to perform a clean build in Android Studio by going to Build -> Clean Project.
+
+  Solution: Ensure `app/src/debug/google-services.json` exists and is valid, as per instructions
+  in [Set up Firebase](#set-up-firebase). You may need to perform a clean build in Android Studio by
+  going to Build -> Clean Project.
 
 * Gradle Build fails with "License for package Android SDK Platform ... not accepted":
 
@@ -207,4 +181,5 @@ $ gcloud builds submit --config=cloudbuild.yaml --substitutions=_ANDROID_VERSION
     com.google.android.gms.common.api.ApiException: 10:
     ```
 
-  Solution: Run `./gradlew :app:signingReport` in the terminal, and check if the 'SHA1' value of the current 'Build variants' type matches with your Firebase Project.
+  Solution: Run `./gradlew :app:signingReport` in the terminal, and check if the 'SHA1' value of the
+  current 'Build variants' type matches with your Firebase Project.
diff --git a/app/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt b/app/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt
@@ -294,12 +294,19 @@ internal constructor(
 
   /** Persists the collected data as draft to local storage. */
   private fun saveDraft(taskId: String) {
+    val deltas = getDeltas()
+
+    // Prevent saving draft if the task is submitted or there are no deltas.
+    if (_uiState.value == UiState.TaskSubmitted || deltas.isEmpty()) {
+      return
+    }
+
     externalScope.launch(ioDispatcher) {
       submissionRepository.saveDraftSubmission(
         jobId = jobId,
         loiId = loiId,
         surveyId = surveyId,
-        deltas = getDeltas(),
+        deltas = deltas,
         loiName = customLoiName,
         currentTaskId = taskId,
       )