Skip to content

Commit 3cb2270

Browse files
SelaseKayLyokone
authored andcommitted
fix(in_app_messaging,ios): restore default display and format generated code
1 parent 17dda66 commit 3cb2270

4 files changed

Lines changed: 644 additions & 300 deletions

File tree

‎packages/firebase_in_app_messaging/firebase_in_app_messaging/android/src/main/kotlin/io/flutter/plugins/firebase/inappmessaging/FirebaseInAppMessagingPlugin.kt‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import com.google.firebase.inappmessaging.model.Action
2323
import com.google.firebase.inappmessaging.model.CardMessage
2424
import com.google.firebase.inappmessaging.model.InAppMessage
2525
import com.google.firebase.inappmessaging.model.MessageType
26-
import java.lang.ref.WeakReference
2726
import io.flutter.embedding.engine.plugins.FlutterPlugin
2827
import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding
2928
import io.flutter.plugin.common.BinaryMessenger
3029
import io.flutter.plugins.firebase.core.FlutterFirebasePlugin
3130
import io.flutter.plugins.firebase.core.FlutterFirebasePluginRegistry
31+
import java.lang.ref.WeakReference
3232
import java.util.concurrent.ConcurrentHashMap
3333
import java.util.concurrent.Executor
3434

@@ -90,9 +90,10 @@ class FirebaseInAppMessagingPlugin :
9090
override fun onActivityResumed(activity: Activity) {
9191
lastActivity = WeakReference(activity)
9292
if (customDisplayEnabled) {
93-
FirebaseInAppMessaging.getInstance().setMessageDisplayComponent(
94-
this@FirebaseInAppMessagingPlugin,
95-
)
93+
FirebaseInAppMessaging.getInstance()
94+
.setMessageDisplayComponent(
95+
this@FirebaseInAppMessagingPlugin,
96+
)
9697
}
9798
}
9899

@@ -255,9 +256,11 @@ class FirebaseInAppMessagingPlugin :
255256
if (pending != null && action != null) {
256257
pending.callbacks.messageClicked(action)
257258
} else {
258-
pending?.callbacks?.messageDismissed(
259-
FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType.CLICK,
260-
)
259+
pending
260+
?.callbacks
261+
?.messageDismissed(
262+
FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType.CLICK,
263+
)
261264
}
262265
callback(Result.success(Unit))
263266
} catch (exception: Exception) {
@@ -371,7 +374,8 @@ class FirebaseInAppMessagingPlugin :
371374
card?.portraitImageData?.imageUrl ?: message.imageUrl ?: message.imageData?.imageUrl,
372375
landscapeImageUrl = card?.landscapeImageData?.imageUrl,
373376
backgroundHexColor = message.backgroundHexColor,
374-
action = if (card == null) toDisplayAction("${campaignId}_action", message.action) else null,
377+
action =
378+
if (card == null) toDisplayAction("${campaignId}_action", message.action) else null,
375379
primaryAction = toDisplayAction("${campaignId}_primary", card?.primaryAction),
376380
secondaryAction = toDisplayAction("${campaignId}_secondary", card?.secondaryAction),
377381
data = toData(message.data),

0 commit comments

Comments
 (0)