Fixed AppIndexingUpdateService race condition (firebase#149)

samtstern · web-flow · commit afbab20b4bf0 · 2019-11-11T14:45:01.000-08:00
diff --git a/appindexing/app/src/main/java/com/google/firebase/example/appindexing/AppIndexingUpdateService.java b/appindexing/app/src/main/java/com/google/firebase/example/appindexing/AppIndexingUpdateService.java
@@ -5,6 +5,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 
+import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.appindexing.FirebaseAppIndex;
 import com.google.firebase.appindexing.Indexable;
 import com.google.firebase.appindexing.builders.Indexables;
@@ -15,6 +16,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import java.util.concurrent.ExecutionException;
+
 // [START appindexing_update_service]
 public class AppIndexingUpdateService extends JobIntentService {
 
@@ -49,7 +52,13 @@ protected void onHandleWork(@NonNull Intent intent) {
             notesArr = indexableNotes.toArray(notesArr);
 
             // batch insert indexable notes into index
-            FirebaseAppIndex.getInstance().update(notesArr);
+            try {
+                Tasks.await(FirebaseAppIndex.getInstance().update(notesArr));
+            } catch (ExecutionException e) {
+                // update failed
+            } catch (InterruptedException e) {
+                // await was interrupted
+            }
         }
     }
 
diff --git a/appindexing/app/src/main/java/com/google/firebase/example/appindexing/kotlin/AppIndexingUpdateService.kt b/appindexing/app/src/main/java/com/google/firebase/example/appindexing/kotlin/AppIndexingUpdateService.kt
@@ -3,10 +3,12 @@ package com.google.firebase.example.appindexing.kotlin
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.JobIntentService
+import com.google.android.gms.tasks.Tasks
 import com.google.firebase.appindexing.FirebaseAppIndex
 import com.google.firebase.appindexing.Indexable
 import com.google.firebase.appindexing.builders.Indexables
 import com.google.firebase.example.appindexing.model.Recipe
+import java.util.concurrent.ExecutionException
 
 // [START appindexing_update_service]
 class AppIndexingUpdateService : JobIntentService() {
@@ -43,7 +45,13 @@ class AppIndexingUpdateService : JobIntentService() {
             val notesArr: Array<Indexable> = indexableNotes.toTypedArray()
 
             // batch insert indexable notes into index
-            FirebaseAppIndex.getInstance().update(*notesArr)
+            try {
+                Tasks.await(FirebaseAppIndex.getInstance().update(*notesArr))
+            } catch (e: ExecutionException) {
+                // update failed
+            } catch (e: InterruptedException) {
+                // await was interrupted
+            }
         }
     }
 
