Skip to content

Commit 7946a88

Browse files
committed
Fix fiam vendoring issue.
It looks like AGP has stopped "transforming" test classes, so switching to Provider instead of `dagger.Lazy` to avoid the problem. It's not an issue since the injected class is has FirebaseAppScope(which is singleton-like).
1 parent 2631ba7 commit 7946a88

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestApiClientModule.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
2727
import com.google.firebase.inappmessaging.internal.time.Clock;
2828
import com.google.firebase.installations.FirebaseInstallationsApi;
29-
import dagger.Lazy;
3029
import dagger.Module;
3130
import dagger.Provides;
31+
import javax.inject.Provider;
3232
import javax.inject.Singleton;
3333

3434
/** Test bindings for API client */
@@ -77,7 +77,9 @@ TestDeviceHelper providesTestDeviceHelper() {
7777
@Provides
7878
@FirebaseAppScope
7979
ApiClient providesApiClient(
80-
Lazy<GrpcClient> grpcClient, Application application, ProviderInstaller providerInstaller) {
80+
Provider<GrpcClient> grpcClient,
81+
Application application,
82+
ProviderInstaller providerInstaller) {
8183
return new ApiClient(grpcClient, firebaseApp, application, clock, providerInstaller);
8284
}
8385
}

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ApiClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import com.google.internal.firebase.inappmessaging.v1.sdkserving.ClientAppInfo;
2828
import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsRequest;
2929
import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsResponse;
30-
import dagger.Lazy;
3130
import java.util.Locale;
3231
import java.util.TimeZone;
3332
import java.util.concurrent.TimeUnit;
3433
import javax.annotation.Nullable;
34+
import javax.inject.Provider;
3535

3636
/**
3737
* Interface to speak to the fiam backend
@@ -43,14 +43,14 @@ public class ApiClient {
4343

4444
private static final String FETCHING_CAMPAIGN_MESSAGE = "Fetching campaigns from service.";
4545

46-
private final Lazy<GrpcClient> grpcClient;
46+
private final Provider<GrpcClient> grpcClient;
4747
private final FirebaseApp firebaseApp;
4848
private final Application application;
4949
private final Clock clock;
5050
private final ProviderInstaller providerInstaller;
5151

5252
public ApiClient(
53-
Lazy<GrpcClient> grpcClient,
53+
Provider<GrpcClient> grpcClient,
5454
FirebaseApp firebaseApp,
5555
Application application,
5656
Clock clock,

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/injection/modules/ApiClientModule.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
2727
import com.google.firebase.inappmessaging.internal.time.Clock;
2828
import com.google.firebase.installations.FirebaseInstallationsApi;
29-
import dagger.Lazy;
3029
import dagger.Module;
3130
import dagger.Provides;
31+
import javax.inject.Provider;
3232

3333
/**
3434
* Provider for ApiClient
@@ -77,7 +77,9 @@ TestDeviceHelper providesTestDeviceHelper(SharedPreferencesUtils sharedPreferenc
7777
@Provides
7878
@FirebaseAppScope
7979
ApiClient providesApiClient(
80-
Lazy<GrpcClient> grpcClient, Application application, ProviderInstaller providerInstaller) {
80+
Provider<GrpcClient> grpcClient,
81+
Application application,
82+
ProviderInstaller providerInstaller) {
8183
return new ApiClient(grpcClient, firebaseApp, application, clock, providerInstaller);
8284
}
8385
}

0 commit comments

Comments
 (0)