Skip to content

Commit 6d232cf

Browse files
committed
Added extra check for API 23
* No need to add the `AnimationListener` to other Android API devices
1 parent f65ae0b commit 6d232cf

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/InAppMessageView.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ private CardView createCardView(Context context) {
362362
// Set the initial elevation of the CardView to 0dp if using Android 6 API 23
363363
// Fixes bug when animating a elevated CardView class
364364
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M)
365-
cardView.setCardElevation(dpToPx(0));
365+
cardView.setCardElevation(0);
366366
else
367367
cardView.setCardElevation(dpToPx(5));
368368

@@ -486,7 +486,10 @@ private void dereferenceViews() {
486486

487487
private void animateInAppMessage(WebViewManager.Position displayLocation, View messageView, View backgroundView) {
488488
final CardView messageViewCardView = messageView.findViewWithTag(IN_APP_MESSAGE_CARD_VIEW_TAG);
489-
Animation.AnimationListener cardViewAnimCallback = createAnimationListenerForAndroidApi23Elevation(messageViewCardView);
489+
490+
Animation.AnimationListener cardViewAnimCallback = null;
491+
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M)
492+
cardViewAnimCallback = createAnimationListenerForAndroidApi23Elevation(messageViewCardView);
490493

491494
// Based on the location of the in app message apply and animation to match
492495
switch (displayLocation) {

0 commit comments

Comments
 (0)