From ec6c861f759350256c0a0d58a751b366d156c9a5 Mon Sep 17 00:00:00 2001
From: Ryan Lepinski <ryan.lepinski@airship.com>
Date: Fri, 23 Jun 2023 16:01:52 -0700
Subject: [PATCH] Release 14.10.1 (#414)

* [PF-2468] Avoid exception for invalid config on Android

* Release 14.10.1
---
 CHANGELOG.md                                        | 8 +++++++-
 urbanairship-accengage-cordova/package.json         | 2 +-
 urbanairship-accengage-cordova/plugin.xml           | 6 +++---
 urbanairship-cordova/package.json                   | 2 +-
 urbanairship-cordova/plugin.xml                     | 6 +++---
 urbanairship-cordova/src/android/PluginManager.java | 5 ++++-
 urbanairship-hms-cordova/package.json               | 2 +-
 urbanairship-hms-cordova/plugin.xml                 | 4 ++--
 8 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5fead77..94529f2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Cordova Plugin Changelog
 
-## Version 14.10.0 - Jun 14, 2023
+## Version 14.10.1 - June 23, 2023
+Patch release that fixes a crash if takeOff is called with invalid config on Android.
+
+### Changes
+- Fix crash due to an invalid config exception on Android
+
+## Version 14.10.0 - June 14, 2023
 Minor release that updates the iOS SDK to 16.12.1 and the Android SDK to 16.11.1.
 
 ### Changes
diff --git a/urbanairship-accengage-cordova/package.json b/urbanairship-accengage-cordova/package.json
index d0528328..0809cb75 100644
--- a/urbanairship-accengage-cordova/package.json
+++ b/urbanairship-accengage-cordova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "urbanairship-accengage-cordova",
-  "version": "14.10.0",
+  "version": "14.10.1",
   "description": "Urban Airship-Accengage Cordova plugin",
   "cordova": {
     "id": "urbanairship-accengage-cordova",
diff --git a/urbanairship-accengage-cordova/plugin.xml b/urbanairship-accengage-cordova/plugin.xml
index b1b1349a..5a8e891b 100644
--- a/urbanairship-accengage-cordova/plugin.xml
+++ b/urbanairship-accengage-cordova/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="urbanairship-accengage-cordova"
-        version="14.10.0"
+        version="14.10.1"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -16,13 +16,13 @@
         <engine name="cordova" version=">=9.0.1"/>
     </engines>
 
-    <dependency id="urbanairship-cordova" version="14.10.0"/>
+    <dependency id="urbanairship-cordova" version="14.10.1"/>
 
     <!-- ios -->
     <platform name="ios">
 
         <config-file target="*-Info.plist" parent="UACordovaPluginVersion">
-            <string>14.10.0</string>
+            <string>14.10.1</string>
         </config-file>
 
         <!-- Airship Accengage Module -->
diff --git a/urbanairship-cordova/package.json b/urbanairship-cordova/package.json
index da50c311..0bd7dbf1 100644
--- a/urbanairship-cordova/package.json
+++ b/urbanairship-cordova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "urbanairship-cordova",
-  "version": "14.10.0",
+  "version": "14.10.1",
   "description": "Urban Airship Cordova plugin",
   "cordova": {
     "id": "urbanairship-cordova",
diff --git a/urbanairship-cordova/plugin.xml b/urbanairship-cordova/plugin.xml
index c8c378f1..d33a1b61 100644
--- a/urbanairship-cordova/plugin.xml
+++ b/urbanairship-cordova/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin id="urbanairship-cordova"
-        version="14.10.0"
+        version="14.10.1"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -40,7 +40,7 @@
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data
                 android:name="com.urbanairship.cordova.version"
-                android:value="14.10.0"/>
+                android:value="14.10.1"/>
 
             <meta-data
                 android:name="com.urbanairship.autopilot"
@@ -145,7 +145,7 @@
         </config-file>
 
         <config-file target="*-Info.plist" parent="UACordovaPluginVersion">
-            <string>14.10.0</string>
+            <string>14.10.1</string>
         </config-file>
 
         <config-file parent="/widget" target="config.xml">
diff --git a/urbanairship-cordova/src/android/PluginManager.java b/urbanairship-cordova/src/android/PluginManager.java
index 16296eb1..b2235bdf 100644
--- a/urbanairship-cordova/src/android/PluginManager.java
+++ b/urbanairship-cordova/src/android/PluginManager.java
@@ -376,9 +376,12 @@ public AirshipConfigOptions getAirshipConfig() {
         }
 
         try {
-            configOptions = builder.build();
+            AirshipConfigOptions config = builder.build();
+            config.validate();
+            configOptions = config;
             return configOptions;
         } catch (IllegalArgumentException e) {
+            PluginLogger.error(e, "Invalid AirshipConfig");
             return null;
         }
     }
diff --git a/urbanairship-hms-cordova/package.json b/urbanairship-hms-cordova/package.json
index 2f10d59b..8ea8fecc 100644
--- a/urbanairship-hms-cordova/package.json
+++ b/urbanairship-hms-cordova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "urbanairship-hms-cordova",
-  "version": "14.10.0",
+  "version": "14.10.1",
   "description": "Urban Airship HMS Cordova plugin",
   "cordova": {
     "id": "urbanairship-hms-cordova",
diff --git a/urbanairship-hms-cordova/plugin.xml b/urbanairship-hms-cordova/plugin.xml
index 74158d0d..91fa13ba 100644
--- a/urbanairship-hms-cordova/plugin.xml
+++ b/urbanairship-hms-cordova/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="urbanairship-hms-cordova"
-        version="14.10.0"
+        version="14.10.1"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -15,7 +15,7 @@
         <engine name="cordova" version=">=9.0.1"/>
     </engines>
 
-    <dependency id="urbanairship-cordova" version="14.10.0"/>
+    <dependency id="urbanairship-cordova" version="14.10.1"/>
 
     <!-- android -->
     <platform name="android">