Merge pull request #545 from Esri/Caleb/Fix-LicenseKeySetting

[Fix] Set license key bug

Author: CalebRas

Documentation/ConfigureAppSecrets.md

@@ -12,7 +12,7 @@ Note: License strings are not required for development. Without licensing or lic
   touch .secrets
   ```
 
-2. Add your **License String** to the secrets file. Licensing the app will remove the 'Licensed for Developer Use Only' watermark. Licensing the app is optional in development but required for production. Add your **Extension License String** and **API Key** access token to the secrets file if needed. Learn more about how to [Get a license](https://developers.arcgis.com/swift/license-and-deployment/get-a-license/).
+2. Add your **License String** to the secrets file. Licensing the app will remove the 'Licensed for Developer Use Only' watermark. Licensing the app is optional in development but required for production. Add your **Extension License String** and **API Key** access token to the secrets file if needed. If the license string is set, an **Advanced Editing** extension will be required to access all the samples, such as those with utility network capabilities. Learn more about how to [Get a license](https://developers.arcgis.com/swift/license-and-deployment/get-a-license/).
 
   ```sh
   echo ARCGIS_LICENSE_KEY=your-license-key >> .secrets

Shared/SamplesApp.swift

@@ -37,12 +37,19 @@ extension SamplesApp {
     /// a watermark on the map view).
     func license() {
         if let licenseStringLiteral = String.licenseKey,
-           let licenseKey = LicenseKey(licenseStringLiteral),
-           let extensionLicenseStringLiteral = String.extensionLicenseKey,
-           let extensionLicenseKey = LicenseKey(extensionLicenseStringLiteral) {
-            // Set both keys to access all samples, including utility network
-            // capability.
-            _ = try? ArcGISEnvironment.setLicense(with: licenseKey, extensions: [extensionLicenseKey])
+           let licenseKey = LicenseKey(licenseStringLiteral) {
+            // Sets the license with an extension if one is included. Both are
+            // required to access all samples, including utility network
+            // capabilities.
+            if let extensionLicenseStringLiteral = String.extensionLicenseKey,
+               let extensionLicenseKey = LicenseKey(extensionLicenseStringLiteral) {
+                _ = try? ArcGISEnvironment.setLicense(
+                    with: licenseKey,
+                    extensions: [extensionLicenseKey]
+                )
+            } else {
+                _ = try? ArcGISEnvironment.setLicense(with: licenseKey)
+            }
         }
         // Authentication with an API key or named user is required to access
         // basemaps and other location services.