Http client in Firebase Segmentation SDK to call backend service.

firebase-segmentation/firebase-segmentation.gradle

@@ -14,45 +14,12 @@
 
 plugins {
     id 'firebase-library'
-    id 'com.google.protobuf'
 }
 
 firebaseLibrary {
     testLab.enabled = true
 }
 
-protobuf {
-    // Configure the protoc executable
-    protoc {
-        // Download from repositories
-        artifact = 'com.google.protobuf:protoc:3.4.0'
-    }
-    plugins {
-        grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.12.0'
-        }
-        javalite {
-            // The codegen for lite comes as a separate artifact
-            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
-        }
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                // In most cases you don't need the full Java output
-                // if you use the lite output.
-                remove java
-            }
-            task.plugins {
-                grpc {
-                    option 'lite'
-                }
-                javalite {}
-            }
-        }
-    }
-}
-
 android {
     compileSdkVersion project.targetSdkVersion
 
@@ -65,8 +32,11 @@ android {
     }
     sourceSets {
         main {
-            proto {
-                srcDir 'src/main/proto'
+            java {
+            }
+        }
+        test {
+            java {
             }
         }
     }
@@ -83,14 +53,11 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
-    implementation project(':protolite-well-known-types')
 
     implementation('com.google.firebase:firebase-iid:17.0.3') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
-    implementation 'io.grpc:grpc-stub:1.21.0'
-    implementation 'io.grpc:grpc-protobuf-lite:1.21.0'
-    implementation 'io.grpc:grpc-okhttp:1.21.0'
+
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'com.google.android.gms:play-services-tasks:16.0.1'
@@ -103,7 +70,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
-    androidTestImplementation "androidx.annotation:annotation:1.1.0"
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'

firebase-segmentation/src/androidTest/java/com/google/firebase/segmentation/FirebaseSegmentationInstrumentedTest.java

@@ -69,19 +69,24 @@ public void setUp() {
     firebaseApp =
         FirebaseApp.initializeApp(
             ApplicationProvider.getApplicationContext(),
-            new FirebaseOptions.Builder().setApplicationId("1:123456789:android:abcdef").build());
+            new FirebaseOptions.Builder()
+                .setApplicationId("1:123456789:android:abcdef")
+                .setApiKey("api_key")
+                .build());
     actualCache = new CustomInstallationIdCache(firebaseApp);
 
     when(backendClientReturnsOk.updateCustomInstallationId(
-            anyLong(), anyString(), anyString(), anyString()))
+            anyLong(), anyString(), anyString(), anyString(), anyString()))
         .thenReturn(Tasks.forResult(SegmentationServiceClient.Code.OK));
-    when(backendClientReturnsOk.clearCustomInstallationId(anyLong(), anyString(), anyString()))
+    when(backendClientReturnsOk.clearCustomInstallationId(
+            anyLong(), anyString(), anyString(), anyString()))
         .thenReturn(Tasks.forResult(SegmentationServiceClient.Code.OK));
     when(backendClientReturnsError.updateCustomInstallationId(
+            anyLong(), anyString(), anyString(), anyString(), anyString()))
+        .thenReturn(Tasks.forResult(SegmentationServiceClient.Code.SERVER_ERROR));
+    when(backendClientReturnsError.clearCustomInstallationId(
             anyLong(), anyString(), anyString(), anyString()))
-        .thenReturn(Tasks.forResult(SegmentationServiceClient.Code.SERVER_INTERNAL_ERROR));
-    when(backendClientReturnsError.clearCustomInstallationId(anyLong(), anyString(), anyString()))
-        .thenReturn(Tasks.forResult(SegmentationServiceClient.Code.SERVER_INTERNAL_ERROR));
+        .thenReturn(Tasks.forResult(SegmentationServiceClient.Code.SERVER_ERROR));
     when(firebaseInstanceId.getInstanceId())
         .thenReturn(
             Tasks.forResult(

firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentation.java

@@ -135,6 +135,7 @@ private Task<Void> updateCustomInstallationId(String customInstallationId) {
                 String iidToken = instanceIdResultTask.getResult().getToken();
                 return backendServiceClient.updateCustomInstallationId(
                     Utils.getProjectNumberFromAppId(firebaseApp.getOptions().getApplicationId()),
+                    firebaseApp.getOptions().getApiKey(),
                     customInstallationId,
                     iid,
                     iidToken);
@@ -154,7 +155,9 @@ private Task<Void> updateCustomInstallationId(String customInstallationId) {
                           customInstallationId,
                           instanceIdResultTask.getResult().getId(),
                           CustomInstallationIdCache.CacheStatus.SYNCED));
-                case ALREADY_EXISTS:
+                case HTTP_CLIENT_ERROR:
+                  throw new SetCustomInstallationIdException(Status.CLIENT_ERROR);
+                case CONFLICT:
                   throw new SetCustomInstallationIdException(
                       Status.DUPLICATED_CUSTOM_INSTALLATION_ID);
                 default:
@@ -209,6 +212,7 @@ private Task<Void> clearCustomInstallationId() {
                 String iidToken = instanceIdResultTask.getResult().getToken();
                 return backendServiceClient.clearCustomInstallationId(
                     Utils.getProjectNumberFromAppId(firebaseApp.getOptions().getApplicationId()),
+                    firebaseApp.getOptions().getApiKey(),
                     iid,
                     iidToken);
               } else {
@@ -220,10 +224,13 @@ private Task<Void> clearCustomInstallationId() {
     Task<Boolean> finalUpdateCacheResultTask =
         backendRequestResultTask.onSuccessTask(
             backendRequestResult -> {
-              if (backendRequestResult == Code.OK) {
-                return localCache.clear();
-              } else {
-                throw new SetCustomInstallationIdException(Status.BACKEND_ERROR);
+              switch (backendRequestResult) {
+                case OK:
+                  return localCache.clear();
+                case HTTP_CLIENT_ERROR:
+                  throw new SetCustomInstallationIdException(Status.CLIENT_ERROR);
+                default:
+                  throw new SetCustomInstallationIdException(Status.BACKEND_ERROR);
               }
             });
 

firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.segmentation;
 
+import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
@@ -25,6 +26,7 @@
 public class FirebaseSegmentationRegistrar implements ComponentRegistrar {
 
   @Override
+  @NonNull
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseSegmentation.class)

firebase-segmentation/src/main/java/com/google/firebase/segmentation/local/CustomInstallationIdCache.java

@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -53,7 +54,7 @@ public enum CacheStatus {
   private final SharedPreferences prefs;
   private final String persistenceKey;
 
-  public CustomInstallationIdCache(FirebaseApp firebaseApp) {
+  public CustomInstallationIdCache(@NonNull FirebaseApp firebaseApp) {
     // Different FirebaseApp in the same Android application should have the same application
     // context and same dir path
     prefs =
@@ -77,8 +78,9 @@ public synchronized CustomInstallationIdCacheEntryValue readCacheEntryValue() {
     return CustomInstallationIdCacheEntryValue.create(cid, iid, CacheStatus.values()[status]);
   }
 
+  @NonNull
   public synchronized Task<Boolean> insertOrUpdateCacheEntry(
-      CustomInstallationIdCacheEntryValue entryValue) {
+      @NonNull CustomInstallationIdCacheEntryValue entryValue) {
     SharedPreferences.Editor editor = prefs.edit();
     editor.putString(
         getSharedPreferencesKey(CUSTOM_INSTALLATION_ID_KEY), entryValue.getCustomInstallationId());
@@ -87,6 +89,7 @@ public synchronized Task<Boolean> insertOrUpdateCacheEntry(
     return commitSharedPreferencesEditAsync(editor);
   }
 
+  @NonNull
   public synchronized Task<Boolean> clear() {
     SharedPreferences.Editor editor = prefs.edit();
     editor.remove(getSharedPreferencesKey(CUSTOM_INSTALLATION_ID_KEY));

firebase-segmentation/src/main/java/com/google/firebase/segmentation/local/CustomInstallationIdCacheEntryValue.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.segmentation.local;
 
+import androidx.annotation.NonNull;
 import com.google.auto.value.AutoValue;
 import com.google.firebase.segmentation.local.CustomInstallationIdCache.CacheStatus;
 
@@ -23,14 +24,20 @@
  */
 @AutoValue
 public abstract class CustomInstallationIdCacheEntryValue {
+  @NonNull
   public abstract String getCustomInstallationId();
 
+  @NonNull
   public abstract String getFirebaseInstanceId();
 
+  @NonNull
   public abstract CacheStatus getCacheStatus();
 
+  @NonNull
   public static CustomInstallationIdCacheEntryValue create(
-      String customInstallationId, String firebaseInstanceId, CacheStatus cacheStatus) {
+      @NonNull String customInstallationId,
+      @NonNull String firebaseInstanceId,
+      @NonNull CacheStatus cacheStatus) {
     return new AutoValue_CustomInstallationIdCacheEntryValue(
         customInstallationId, firebaseInstanceId, cacheStatus);
   }