Skip to content

Commit 98e0e25

Browse files
ankitaj224ankitaj224
committed
Merge branch 'master' of github.com:firebase/firebase-android-sdk
2 parents 519ae71 + 973c911 commit 98e0e25

23 files changed

+586
-414
lines changed

‎fiamui-app/fiamui-app.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ dependencies {
5858
implementation project(path: ":firebase-inappmessaging")
5959
implementation 'com.google.guava:guava:24.1-jre-android'
6060

61-
implementation('com.google.firebase:firebase-analytics:17.0.0') {
61+
implementation('com.google.firebase:firebase-analytics:17.4.0') {
6262
exclude group: 'com.google.firebase', module: 'firebase-common'
6363
}
6464

65-
implementation "com.android.installreferrer:installreferrer:1.0"
66-
implementation 'com.google.android.material:material:1.0.0'
67-
implementation 'androidx.appcompat:appcompat:1.0.2'
65+
implementation "com.android.installreferrer:installreferrer:1.1.2"
66+
implementation 'com.google.android.material:material:1.1.0'
67+
implementation 'androidx.appcompat:appcompat:1.1.0'
6868
implementation 'androidx.annotation:annotation:1.1.0'
69-
implementation 'androidx.media:media:1.0.1'
69+
implementation 'androidx.media:media:1.1.0'
7070
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
7171
implementation "com.google.code.findbugs:jsr305:3.0.2"
72-
implementation "com.squareup.okio:okio:1.13.0"
72+
implementation "com.squareup.okio:okio:2.2.2"
7373
implementation "com.squareup.okhttp:okhttp:2.7.5"
74-
implementation "com.google.auto.value:auto-value-annotations:1.6.5"
75-
implementation "com.google.android.gms:play-services-basement:17.0.0"
74+
implementation "com.google.auto.value:auto-value-annotations:1.6.6"
75+
implementation "com.google.android.gms:play-services-basement:17.2.1"
7676

7777
// The following dependencies are not required to use the FIAM UI library.
7878
// They are used to make some aspects of the demo app implementation simpler for

‎firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,18 @@ dependencies {
6464
implementation project(':firebase-inappmessaging')
6565
implementation project(':firebase-components')
6666

67-
implementation('com.google.firebase:firebase-iid:20.0.1') {
68-
exclude group: 'com.google.firebase', module: 'firebase-common'
69-
}
70-
7167
implementation('com.google.firebase:firebase-measurement-connector:18.0.0') {
7268
exclude group: 'com.google.firebase', module: 'firebase-common'
7369
}
7470

75-
implementation 'com.google.android.gms:play-services-tasks:17.0.0'
71+
implementation 'com.google.android.gms:play-services-tasks:17.0.2'
7672
implementation 'androidx.appcompat:appcompat:1.1.0'
7773
implementation 'androidx.cardview:cardview:1.0.0'
7874
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
7975
implementation 'androidx.browser:browser:1.0.0'
8076
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
81-
implementation 'com.google.auto.value:auto-value-annotations:1.6.5'
82-
implementation "com.google.dagger:dagger:2.24"
77+
implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
78+
implementation "com.google.dagger:dagger:2.27"
8379

8480
implementation "com.squareup.picasso:picasso:2.71828"
8581
implementation "com.squareup.okhttp:okhttp:2.7.5"
@@ -100,7 +96,7 @@ dependencies {
10096
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
10197
androidTestImplementation 'androidx.test:runner:1.2.0'
10298
androidTestImplementation 'androidx.test:rules:1.2.0'
103-
androidTestImplementation ("com.google.firebase:firebase-analytics:17.0.0") {
99+
androidTestImplementation ("com.google.firebase:firebase-analytics:17.4.0") {
104100
exclude group: "com.google.firebase", module: "firebase-common"
105101
}
106102

‎firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
* </ul>
7777
*
7878
* <p>To delete the Instance ID and the data associated with it, see {@link
79-
* com.google.firebase.iid.FirebaseInstanceId#deleteInstanceId}.
79+
* FirebaseInstallationsApi#delete}.
8080
*/
8181
@Keep
8282
@FirebaseAppScope

‎firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,21 +116,20 @@ dependencies {
116116
implementation project(':protolite-well-known-types')
117117
implementation project(':transport:transport-api')
118118
implementation project(':firebase-datatransport')
119+
implementation project(':firebase-installations-interop')
120+
runtimeOnly project(':firebase-installations')
119121

120122
//To provide @Generated annotations
121123
compileOnly 'javax.annotation:jsr250-api:1.0'
122124

123-
implementation 'com.google.android.gms:play-services-tasks:17.0.0'
125+
implementation 'com.google.android.gms:play-services-tasks:17.0.2'
124126
implementation 'io.grpc:grpc-stub:1.21.0'
125127
implementation 'io.grpc:grpc-protobuf-lite:1.21.0'
126128
implementation 'io.grpc:grpc-okhttp:1.21.0'
127-
implementation 'com.google.dagger:dagger:2.24'
129+
implementation 'com.google.dagger:dagger:2.27'
128130
implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
129131
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
130-
implementation 'com.google.auto.value:auto-value-annotations:1.6.5'
131-
implementation('com.google.firebase:firebase-iid:20.0.1') {
132-
exclude group: 'com.google.firebase', module: 'firebase-common'
133-
}
132+
implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
134133

135134
implementation('com.google.firebase:firebase-measurement-connector:18.0.0') {
136135
exclude group: 'com.google.firebase', module: 'firebase-common'

‎firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
import com.google.firebase.FirebaseOptions;
5454
import com.google.firebase.analytics.connector.AnalyticsConnector;
5555
import com.google.firebase.events.Subscriber;
56-
import com.google.firebase.iid.FirebaseInstanceId;
57-
import com.google.firebase.iid.InstanceIdResult;
5856
import com.google.firebase.inappmessaging.CommonTypesProto.Event;
5957
import com.google.firebase.inappmessaging.CommonTypesProto.Priority;
6058
import com.google.firebase.inappmessaging.CommonTypesProto.TriggeringCondition;
@@ -72,6 +70,8 @@
7270
import com.google.firebase.inappmessaging.model.BannerMessage;
7371
import com.google.firebase.inappmessaging.model.CampaignMetadata;
7472
import com.google.firebase.inappmessaging.model.InAppMessage;
73+
import com.google.firebase.installations.FirebaseInstallationsApi;
74+
import com.google.firebase.installations.InstallationTokenResult;
7575
import com.google.internal.firebase.inappmessaging.v1.CampaignProto.ThickContent;
7676
import com.google.internal.firebase.inappmessaging.v1.CampaignProto.VanillaCampaignPayload;
7777
import com.google.internal.firebase.inappmessaging.v1.sdkserving.CampaignImpression;
@@ -115,6 +115,8 @@ public class FirebaseInAppMessagingFlowableTest {
115115

116116
public static final String PROJECT_NUMBER = "gcm-sender-id";
117117
public static final String APP_ID = "app-id";
118+
private static final String INSTALLATION_ID = "instance_id";
119+
private static final String INSTALLATION_TOKEN = "instance_token";
118120
private static final long PAST = 1000000;
119121
private static final long NOW = PAST + 100000;
120122
private static final long FUTURE = NOW + 1000000;
@@ -155,6 +157,29 @@ public class FirebaseInAppMessagingFlowableTest {
155157
eligibleCampaignsBuilder.build();
156158
private static final RuntimeException t = new RuntimeException("boom!");
157159
private static final TestAnalyticsConnector analyticsConnector = new TestAnalyticsConnector();
160+
private static final InstallationTokenResult INSTALLATION_TOKEN_RESULT =
161+
new InstallationTokenResult() {
162+
@NonNull
163+
@Override
164+
public String getToken() {
165+
return INSTALLATION_TOKEN;
166+
}
167+
168+
@Override
169+
public long getTokenExpirationTimestamp() {
170+
return 0;
171+
}
172+
173+
@Override
174+
public long getTokenCreationTimestamp() {
175+
return 0;
176+
}
177+
178+
@Override
179+
public Builder toBuilder() {
180+
return null;
181+
}
182+
};
158183

159184
static {
160185
FirebaseApp.initializeApp(InstrumentationRegistry.getContext(), options);
@@ -167,7 +192,7 @@ public class FirebaseInAppMessagingFlowableTest {
167192
@Mock
168193
private MetricsLoggerClient.EngagementMetricsLoggerInterface engagementMetricsLoggerInterface;
169194

170-
@Mock private FirebaseInstanceId instanceId;
195+
@Mock private FirebaseInstallationsApi firebaseInstallations;
171196
@Mock private TestDeviceHelper testDeviceHelper;
172197
@Mock private Subscriber firebaseEventSubscriber;
173198
@Mock private AbtIntegrationHelper abtIntegrationHelper;
@@ -223,24 +248,9 @@ public void setUp() {
223248
clearProtoDiskCache(InstrumentationRegistry.getTargetContext());
224249
application =
225250
spy((Application) InstrumentationRegistry.getTargetContext().getApplicationContext());
226-
String id = FirebaseInstanceId.getInstance().getId();
227-
when(instanceId.getId()).thenReturn(id);
228-
when(instanceId.getInstanceId())
229-
.thenReturn(
230-
Tasks.forResult(
231-
new InstanceIdResult() {
232-
@NonNull
233-
@Override
234-
public String getId() {
235-
return id;
236-
}
237-
238-
@NonNull
239-
@Override
240-
public String getToken() {
241-
return "token";
242-
}
243-
}));
251+
when(firebaseInstallations.getId()).thenReturn(Tasks.forResult(INSTALLATION_ID));
252+
when(firebaseInstallations.getToken(false))
253+
.thenReturn(Tasks.forResult(INSTALLATION_TOKEN_RESULT));
244254
when(testDeviceHelper.isAppInstallFresh()).thenReturn(false);
245255
when(testDeviceHelper.isDeviceInTestMode()).thenReturn(false);
246256

@@ -272,7 +282,7 @@ public String getToken() {
272282
.grpcClientModule(new GrpcClientModule(app))
273283
.testApiClientModule(
274284
new TestApiClientModule(
275-
app, instanceId, testDeviceHelper, universalComponent.clock()));
285+
app, firebaseInstallations, testDeviceHelper, universalComponent.clock()));
276286
TestAppComponent appComponent = appComponentBuilder.build();
277287

278288
instance = appComponent.providesFirebaseInAppMessaging();
@@ -686,7 +696,7 @@ public void logImpression_writesExpectedLogToEngagementMetrics()
686696
.setClientTimestampMillis(NOW)
687697
.setClientApp(
688698
ClientAppInfo.newBuilder()
689-
.setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
699+
.setFirebaseInstanceId(INSTALLATION_ID)
690700
.setGoogleAppId(APP_ID))
691701
.setEventType(EventType.IMPRESSION_EVENT_TYPE)
692702
.build();
@@ -716,7 +726,7 @@ public void logAction_writesExpectedLogToEngagementMetrics()
716726
.setClientTimestampMillis(NOW)
717727
.setClientApp(
718728
ClientAppInfo.newBuilder()
719-
.setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
729+
.setFirebaseInstanceId(INSTALLATION_ID)
720730
.setGoogleAppId(APP_ID))
721731
.setEventType(EventType.IMPRESSION_EVENT_TYPE)
722732
.build();
@@ -747,7 +757,7 @@ public void logRenderError_writesExpectedLogToEngagementMetrics()
747757
.setClientTimestampMillis(NOW)
748758
.setClientApp(
749759
ClientAppInfo.newBuilder()
750-
.setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
760+
.setFirebaseInstanceId(INSTALLATION_ID)
751761
.setGoogleAppId(APP_ID))
752762
.setRenderErrorReason(RenderErrorReason.IMAGE_DISPLAY_ERROR)
753763
.build();
@@ -778,7 +788,7 @@ public void logDismiss_writesExpectedLogToEngagementMetrics()
778788
.setClientTimestampMillis(NOW)
779789
.setClientApp(
780790
ClientAppInfo.newBuilder()
781-
.setFirebaseInstanceId(FirebaseInstanceId.getInstance().getId())
791+
.setFirebaseInstanceId(INSTALLATION_ID)
782792
.setGoogleAppId(APP_ID))
783793
.setDismissType(DismissType.AUTO)
784794
.build();

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import android.app.Application;
1818
import com.google.firebase.FirebaseApp;
1919
import com.google.firebase.events.Subscriber;
20-
import com.google.firebase.iid.FirebaseInstanceId;
2120
import com.google.firebase.inappmessaging.internal.ApiClient;
2221
import com.google.firebase.inappmessaging.internal.DataCollectionHelper;
2322
import com.google.firebase.inappmessaging.internal.GrpcClient;
@@ -26,6 +25,7 @@
2625
import com.google.firebase.inappmessaging.internal.TestDeviceHelper;
2726
import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
2827
import com.google.firebase.inappmessaging.internal.time.Clock;
28+
import com.google.firebase.installations.FirebaseInstallationsApi;
2929
import dagger.Lazy;
3030
import dagger.Module;
3131
import dagger.Provides;
@@ -36,26 +36,26 @@
3636
public class TestApiClientModule {
3737

3838
private final FirebaseApp firebaseApp;
39-
private final FirebaseInstanceId firebaseInstanceId;
39+
private final FirebaseInstallationsApi firebaseInstallations;
4040
private SharedPreferencesUtils sharedPreferencesUtils;
4141
private TestDeviceHelper testDeviceHelper;
4242
private Clock clock;
4343

4444
public TestApiClientModule(
4545
FirebaseApp firebaseApp,
46-
FirebaseInstanceId instanceId,
46+
FirebaseInstallationsApi firebaseInstallations,
4747
TestDeviceHelper testDeviceHelper,
4848
Clock clock) {
4949
this.firebaseApp = firebaseApp;
50-
this.firebaseInstanceId = instanceId;
50+
this.firebaseInstallations = firebaseInstallations;
5151
this.testDeviceHelper = testDeviceHelper;
5252
this.sharedPreferencesUtils = new SharedPreferencesUtils(firebaseApp);
5353
this.clock = clock;
5454
}
5555

5656
@Provides
57-
FirebaseInstanceId providesFirebaseInstanceId() {
58-
return firebaseInstanceId;
57+
FirebaseInstallationsApi providesFirebaseInstallations() {
58+
return firebaseInstallations;
5959
}
6060

6161
@Provides
@@ -66,8 +66,7 @@ public FirebaseApp providesfirebaseApp() {
6666

6767
@Provides
6868
DataCollectionHelper providesDataCollectionHelper(Subscriber firebaseEventSubscriber) {
69-
return new DataCollectionHelper(
70-
firebaseApp, sharedPreferencesUtils, firebaseInstanceId, firebaseEventSubscriber);
69+
return new DataCollectionHelper(firebaseApp, sharedPreferencesUtils, firebaseEventSubscriber);
7170
}
7271

7372
@Provides

‎firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/TestEngagementMetricsLoggerClientModule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
import com.google.firebase.FirebaseApp;
1818
import com.google.firebase.analytics.connector.AnalyticsConnector;
19-
import com.google.firebase.iid.FirebaseInstanceId;
2019
import com.google.firebase.inappmessaging.internal.DeveloperListenerManager;
2120
import com.google.firebase.inappmessaging.internal.MetricsLoggerClient;
2221
import com.google.firebase.inappmessaging.internal.MetricsLoggerClient.EngagementMetricsLoggerInterface;
2322
import com.google.firebase.inappmessaging.internal.injection.scopes.FirebaseAppScope;
2423
import com.google.firebase.inappmessaging.internal.time.Clock;
24+
import com.google.firebase.installations.FirebaseInstallationsApi;
2525
import dagger.Module;
2626
import dagger.Provides;
2727

@@ -39,15 +39,15 @@ public TestEngagementMetricsLoggerClientModule(
3939
@Provides
4040
@FirebaseAppScope
4141
public MetricsLoggerClient providesMetricLoggerClient(
42-
FirebaseInstanceId firebaseInstanceId,
42+
FirebaseInstallationsApi firebaseInstallations,
4343
AnalyticsConnector analyticsConnector,
4444
Clock clock,
4545
DeveloperListenerManager developerListenerManager) {
4646
return new MetricsLoggerClient(
4747
engagementMetricsLoggerInterface,
4848
analyticsConnector,
4949
firebaseApp,
50-
firebaseInstanceId,
50+
firebaseInstallations,
5151
clock,
5252
developerListenerManager);
5353
}

0 commit comments

Comments
 (0)