Addressing review comments.

Author: ankitaj224

firebase-installations-interop/gradle.properties

@@ -1 +1 @@
-version=17.1.1
+version=17.1.1

firebase-installations-interop/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
 <!-- limitations under the License. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.installations.interop" />
+    package="com.google.firebase.installations.interop" />

firebase-installations-interop/src/main/java/com/google/firebase/installations/FirebaseInstallationsApi.java

@@ -31,7 +31,7 @@ public interface FirebaseInstallationsApi {
   Task<String> getId();
 
   /** Async function that returns a auth token(public key) of this Firebase app installation. */
-  Task<String> getAuthToken();
+  Task<InstallationTokenResult> getAuthToken(boolean forceRefresh);
 
   /**
    * Async function that deletes this Firebase app installation from Firebase backend. This call

firebase-installations-interop/src/main/java/com/google/firebase/installations/InstallationTokenResult.java

@@ -0,0 +1,43 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.installations;
+
+import androidx.annotation.NonNull;
+
+/** A set of values describing a FIS Auth Token Result. */
+public class InstallationTokenResult {
+
+  /** A new FIS Auth-Token, created for this firebase installation. */
+  private final String authToken;
+  /**
+   * The amount of time, in milliseconds, before the auth-token expires for this firebase
+   * installation.
+   */
+  private final long tokenExpirationTimestampMillis;
+
+  public InstallationTokenResult(@NonNull String authToken, long tokenExpirationTimestampMillis) {
+    this.authToken = authToken;
+    this.tokenExpirationTimestampMillis = tokenExpirationTimestampMillis;
+  }
+
+  @NonNull
+  public String getAuthToken() {
+    return authToken;
+  }
+
+  public long getTokenExpirationTimestampMillis() {
+    return tokenExpirationTimestampMillis;
+  }
+}

firebase-installations/firebase-installations.gradle

@@ -15,39 +15,6 @@
 
 plugins {
     id 'firebase-library'
-    id 'com.google.protobuf'
-}
-
-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.21.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 {
@@ -59,13 +26,6 @@ android {
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    sourceSets {
-        main {
-            proto {
-                srcDir 'src/main/proto'
-            }
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -80,12 +40,8 @@ android {
 dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-installations-interop')
-    implementation project(':protolite-well-known-types')
 
-    implementation 'io.grpc:grpc-stub:1.21.0'
-    implementation 'io.grpc:grpc-protobuf-lite:1.21.0'
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.android.gms:play-services-tasks:17.0.0'
 
@@ -94,4 +50,5 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
+    implementation 'com.google.guava:guava:16.0.+'
 }

firebase-installations/gradle.properties

@@ -1 +1 @@
-version=17.1.1
+version=17.1.1

firebase-installations/lint.xml

@@ -8,4 +8,4 @@
 
     <!-- Disable the given check in this project -->
     <issue id="GradleCompatible" severity="ignore" />
-</lint>
+</lint>

firebase-installations/proguard-rules.pro

@@ -11,4 +11,4 @@
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
-</manifest>
+</manifest>

firebase-installations/src/main/AndroidManifest.xml

@@ -20,7 +20,6 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.firebase.FirebaseApp;
-import okhttp3.OkHttpClient;
 
 /**
  * Entry point for Firebase Installations.
@@ -35,14 +34,11 @@
  */
 public class FirebaseInstallations implements FirebaseInstallationsApi {
 
-  private final OkHttpClient httpClient;
-
   private final FirebaseApp firebaseApp;
 
   /** package private constructor. */
   FirebaseInstallations(FirebaseApp firebaseApp) {
     this.firebaseApp = firebaseApp;
-    httpClient = new OkHttpClient();
   }
 
   /**
@@ -81,8 +77,8 @@ public Task<String> getId() {
   /** Returns a auth token(public key) of this Firebase app installation. */
   @NonNull
   @Override
-  public Task<String> getAuthToken() {
-    return Tasks.forResult("dummy_auth_token");
+  public Task<InstallationTokenResult> getAuthToken(boolean forceRefresh) {
+    return Tasks.forResult(new InstallationTokenResult("dummy_auth_token", 1000l));
   }
 
   /**