Merge pull request #1657 from urbanairship/release-18.7.1

Release 18.7.1

Author: rlepinski

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 [Migration Guides](https://github.com/urbanairship/android-library/tree/main/documentation/migration)
 
+## Version 18.7.1 February 25, 2025
+Patch release to fix a casting exception with Embedded Content.
+
+### Changes
+- Fixed exception due to a bad cast when using Embedded Content.
+
 ## Version 18.7.0 February 6, 2025
 Minor release that updates AndroidX libraries. A `compileSdk` of 35+ is required.
 

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // Airship Version - major.minor.patch
-        airshipVersion = '18.7.0'
+        airshipVersion = '18.7.1'
 
         // Airship Version Qualifier beta, release, etc...
         // airshipVersionQualifier = "alpha"

urbanairship-layout/src/main/java/com/urbanairship/android/layout/util/ResourceUtils.java

@@ -2,7 +2,15 @@
 
 package com.urbanairship.android.layout.util;
 
-import android.app.Activity;
+import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
+import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
+import static android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE;
+import static android.content.res.Configuration.SCREENLAYOUT_SIZE_NORMAL;
+import static android.content.res.Configuration.SCREENLAYOUT_SIZE_SMALL;
+import static android.content.res.Configuration.SCREENLAYOUT_SIZE_XLARGE;
+import static androidx.annotation.Dimension.DP;
+import static androidx.annotation.Dimension.SP;
+
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.content.res.Configuration;
@@ -15,6 +23,10 @@
 import android.view.WindowManager;
 import android.view.WindowMetrics;
 
+import androidx.annotation.Dimension;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.urbanairship.android.layout.property.Orientation;
 import com.urbanairship.android.layout.property.WindowSize;
 import com.urbanairship.json.JsonException;
@@ -28,19 +40,6 @@
 import java.util.List;
 import java.util.Scanner;
 
-import androidx.annotation.Dimension;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
-import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
-import static android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE;
-import static android.content.res.Configuration.SCREENLAYOUT_SIZE_NORMAL;
-import static android.content.res.Configuration.SCREENLAYOUT_SIZE_SMALL;
-import static android.content.res.Configuration.SCREENLAYOUT_SIZE_XLARGE;
-import static androidx.annotation.Dimension.DP;
-import static androidx.annotation.Dimension.SP;
-
 public final class ResourceUtils {
     private ResourceUtils() {}
 
@@ -130,7 +129,7 @@ public static int getDisplayHeightPixels(@NonNull Context context) {
     }
 
     public static int getWindowWidthPixels(@NonNull Context context, boolean ignoreSafeArea) {
-        WindowManager windowManager = ((Activity) context).getWindowManager();
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();
 
@@ -152,7 +151,7 @@ public static int getWindowWidthPixels(@NonNull Context context, boolean ignoreS
     }
 
     public static int getWindowHeightPixels(@NonNull Context context, boolean ignoreSafeArea) {
-        WindowManager windowManager = ((Activity) context).getWindowManager();
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();