Skip to content

Commit cdab5fc

Browse files
authored
Possible fix for FIAM crash when trying to clear image loading (#3506)
* Possible fix for FIAM crash when trying to clear image loading when activity is paused. This could happen when the parent activity is paused and FIAM image loading is in progress (ie. FIAM window is not yet shown) Internal tracking bug: b/221776899 * Changing tests to account for the fix.
1 parent d6df524 commit cdab5fc

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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
@@ -224,7 +224,6 @@ private void unbindFiamFromActivity(Activity activity) {
224224
&& currentlyBoundActivityName.equals(activity.getLocalClassName())) {
225225
Logging.logi("Unbinding from activity: " + activity.getLocalClassName());
226226
headlessInAppMessaging.clearDisplayListener();
227-
imageLoader.cancelTag(activity.getClass());
228227
removeDisplayedFiam(activity);
229228
currentlyBoundActivityName = null;
230229
}
@@ -507,6 +506,7 @@ private void dismissFiam(Activity activity) {
507506

508507
private void removeDisplayedFiam(Activity activity) {
509508
if (windowManager.isFiamDisplayed()) {
509+
imageLoader.cancelTag(activity.getClass());
510510
windowManager.destroy(activity);
511511
cancelTimers();
512512
}

firebase-inappmessaging-display/src/test/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ public void onActivityPaused_clearsDisplayListener() {
247247
@Test
248248
public void onActivityPaused_clearsImageDownload() {
249249
resumeActivity(activity);
250+
when(windowManager.isFiamDisplayed()).thenReturn(true);
250251
pauseActivity(activity);
251252

252253
verify(imageLoader).cancelTag(activity.getClass());

0 commit comments

Comments
 (0)