Skip to content

Commit

Permalink
Reapply "Handle possibility of a null token."
Browse files Browse the repository at this point in the history
This reverts commit cefb046.
  • Loading branch information
kring committed Sep 3, 2024
1 parent cefb046 commit cd606bc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

##### Fixes :wrench:

- Fixed a bug that prevented using the Token panel with a new Cesium ion Server that had never had its token set before.
- Fixed a bug that could cause a crash in `CesiumIonSession` when the object was garbage collected or the AppDomain was unloaded while network requests were in progress.
- Fixed a bug that could cause `CesiumFlyToController` to unexpectedly interrupt a flight.
- glTF `doubleSided` materials are now supported. Previously, models using this property would appear inside-out.
Expand Down
2 changes: 1 addition & 1 deletion Editor/SelectIonTokenWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private void OnGUI()
// The source will be set to "UseExisting" later by RefreshTokens
// if the _specifiedToken is from the currently signed-in ion account.
this._source = IonTokenSource.Specify;
if (this._specifiedToken.Length == 0 && session.IsConnected())
if (string.IsNullOrEmpty(this._specifiedToken) && session.IsConnected())
{
this._source = IonTokenSource.Create;
}
Expand Down
4 changes: 2 additions & 2 deletions Runtime/CesiumIonServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ public class CesiumIonServer : ScriptableObject
/// found by searching the logged-in Cesium ion account for the
/// DefaultIonAccessToken.
/// </summary>
public string defaultIonAccessTokenId;
public string defaultIonAccessTokenId = "";

/// <summary>
/// The default token used to access Cesium ion assets at runtime. This token
/// is embedded in packaged games for use at runtime.
/// </summary>
public string defaultIonAccessToken;
public string defaultIonAccessToken = "";

// The server URL for which we are currently attempting to deduce an API URL. When this property
// is null, we're not currently loading a config.json in order to deduce an API URL for the server.
Expand Down

0 comments on commit cd606bc

Please sign in to comment.