From 111e7309e45013b27b9213629ac21fa629b07710 Mon Sep 17 00:00:00 2001 From: pgilmorepf Date: Thu, 15 Dec 2016 14:15:41 -0800 Subject: [PATCH 1/2] Readme support link updated --- AndroidStudioExample/README.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidStudioExample/README.md b/AndroidStudioExample/README.md index 98ecfa3c8..8fbb78ad7 100644 --- a/AndroidStudioExample/README.md +++ b/AndroidStudioExample/README.md @@ -57,7 +57,7 @@ Do you have ideas on how we can make our products and services better? Our Developer Success Team can assist with answering any questions as well as process any feedback you have about PlayFab services. -[Forums, Support and Knowledge Base](https://community.playfab.com/hc/en-us) +[Forums, Support and Knowledge Base](https://community.playfab.com/index.html) 5. Copyright and Licensing Information: diff --git a/README.md b/README.md index d762e097b..9e0802da9 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Do you have ideas on how we can make our products and services better? Our Developer Success Team can assist with answering any questions as well as process any feedback you have about PlayFab services. -[Forums, Support and Knowledge Base](https://community.playfab.com/hc/en-us) +[Forums, Support and Knowledge Base](https://community.playfab.com/index.html) 8. Copyright and Licensing Information: From 57870f29a8f65bdee506dc11f8d43a8c024acce8 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Mon, 2 Jan 2017 23:53:40 +0000 Subject: [PATCH 2/2] https://api.playfab.com/releaseNotes/#170102 --- .../java/com/playfab/PlayFabClientAPI.java | 61 ------------ .../java/com/playfab/PlayFabClientModels.java | 99 +------------------ .../main/java/com/playfab/PlayFabErrors.java | 5 +- .../java/com/playfab/PlayFabSettings.java | 4 +- .../src/com/playfab/PlayFabClientAPI.java | 61 ------------ .../src/com/playfab/PlayFabClientModels.java | 99 +------------------ .../src/com/playfab/PlayFabErrors.java | 5 +- .../src/com/playfab/PlayFabSettings.java | 4 +- PlayFabSDK/src/PlayFabApiTest.java | 4 - .../src/com/playfab/PlayFabClientAPI.java | 61 ------------ .../src/com/playfab/PlayFabClientModels.java | 99 +------------------ PlayFabSDK/src/com/playfab/PlayFabErrors.java | 5 +- .../src/com/playfab/PlayFabServerModels.java | 2 +- .../src/com/playfab/PlayFabSettings.java | 4 +- .../src/com/playfab/PlayFabErrors.java | 5 +- .../src/com/playfab/PlayFabServerModels.java | 2 +- .../src/com/playfab/PlayFabSettings.java | 4 +- 17 files changed, 29 insertions(+), 495 deletions(-) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java index b6484d337..60cfc150b 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java @@ -1445,67 +1445,6 @@ private static PlayFabResult privateGetPlayFab return pfResult; } - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetUserCombinedInfoAsync(request); - } - }); - } - - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult GetUserCombinedInfo(final GetUserCombinedInfoRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetUserCombinedInfoAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - return null; - } - } - - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception { - if (_authKey == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetUserCombinedInfo", request, "X-Authorization", _authKey); - task.run(); - Object httpResult = task.get(); - if(httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - GetUserCombinedInfoResult result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Links the Android device identifier to the user's PlayFab account */ diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 8e34fa593..8cc2cfec9 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -1358,7 +1358,7 @@ public static class GetPlayerCombinedInfoRequestParams { */ public Boolean GetUserData; /** - * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false + * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false */ public ArrayList UserDataKeys; /** @@ -1862,103 +1862,6 @@ public static class GetTradeStatusResponse { } - /** - * @deprecated Do not use - */ - @Deprecated - public static class GetUserCombinedInfoRequest { - /** - * Unique PlayFab identifier of the user whose info is being requested. Optional, defaults to the authenticated user if no other lookup identifier set. - */ - public String PlayFabId; - /** - * PlayFab Username for the account to find (if no PlayFabId is specified). - */ - public String Username; - /** - * User email address for the account to find (if no Username is specified). - */ - public String Email; - /** - * Title-specific username for the account to find (if no Email is set). - */ - public String TitleDisplayName; - /** - * If set to false, account info will not be returned. Defaults to true. - */ - public Boolean GetAccountInfo; - /** - * If set to false, inventory will not be returned. Defaults to true. Inventory will never be returned for users other than yourself. - */ - public Boolean GetInventory; - /** - * If set to false, virtual currency balances will not be returned. Defaults to true. Currency balances will never be returned for users other than yourself. - */ - public Boolean GetVirtualCurrency; - /** - * If set to false, custom user data will not be returned. Defaults to true. - */ - public Boolean GetUserData; - /** - * User custom data keys to return. If set to null, all keys will be returned. For users other than yourself, only public data will be returned. - */ - public ArrayList UserDataKeys; - /** - * If set to false, read-only user data will not be returned. Defaults to true. - */ - public Boolean GetReadOnlyData; - /** - * User read-only custom data keys to return. If set to null, all keys will be returned. For users other than yourself, only public data will be returned. - */ - public ArrayList ReadOnlyDataKeys; - - } - - /** - * @deprecated Do not use - */ - @Deprecated - public static class GetUserCombinedInfoResult { - /** - * Unique PlayFab identifier of the owner of the combined info. - */ - public String PlayFabId; - /** - * Account information for the user. - */ - public UserAccountInfo AccountInfo; - /** - * Array of inventory items in the user's current inventory. - */ - @Unordered("ItemInstanceId") - public ArrayList Inventory; - /** - * Array of virtual currency balance(s) belonging to the user. - */ - public Map VirtualCurrency; - /** - * Array of remaining times and timestamps for virtual currencies. - */ - public Map VirtualCurrencyRechargeTimes; - /** - * User specific custom data. - */ - public Map Data; - /** - * The version of the UserData that was returned. - */ - public Long DataVersion; - /** - * User specific read-only data. - */ - public Map ReadOnlyData; - /** - * The version of the Read-Only UserData that was returned. - */ - public Long ReadOnlyDataVersion; - - } - public static class GetUserDataRequest { /** * Specific keys to search for in the custom data. Leave null to get all keys. diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java index 6df7c14bb..f0604b794 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java @@ -263,7 +263,10 @@ public static enum PlayFabErrorCode { LimitNotAnUpgradeOption(1259), NoSecretKeyEnabledForCloudScript(1260), TaskNotFound(1261), - TaskInstanceNotFound(1262); + TaskInstanceNotFound(1262), + InvalidIdentityProviderId(1263), + MisconfiguredIdentityProvider(1264), + InvalidScheduledTaskType(1265); public int id; diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java index eac3910d2..f035d8566 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java @@ -4,9 +4,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.41.161121"; + public static String SdkVersion = "0.42.170102"; public static String BuildIdentifier = "jbuild_javasdk_1"; - public static String SdkVersionString = "JavaSDK-0.41.161121"; + public static String SdkVersionString = "JavaSDK-0.42.170102"; public static String TitleId = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static ErrorCallback GlobalErrorHandler; diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java index cf2b22bfa..e6bac8909 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java @@ -1444,67 +1444,6 @@ private static PlayFabResult privateGetPlayFab return pfResult; } - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetUserCombinedInfoAsync(request); - } - }); - } - - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult GetUserCombinedInfo(final GetUserCombinedInfoRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetUserCombinedInfoAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - return null; - } - } - - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception { - if (_authKey == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetUserCombinedInfo", request, "X-Authorization", _authKey); - task.run(); - Object httpResult = task.get(); - if(httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - GetUserCombinedInfoResult result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Links the Android device identifier to the user's PlayFab account */ diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java index 8e34fa593..8cc2cfec9 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java @@ -1358,7 +1358,7 @@ public static class GetPlayerCombinedInfoRequestParams { */ public Boolean GetUserData; /** - * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false + * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false */ public ArrayList UserDataKeys; /** @@ -1862,103 +1862,6 @@ public static class GetTradeStatusResponse { } - /** - * @deprecated Do not use - */ - @Deprecated - public static class GetUserCombinedInfoRequest { - /** - * Unique PlayFab identifier of the user whose info is being requested. Optional, defaults to the authenticated user if no other lookup identifier set. - */ - public String PlayFabId; - /** - * PlayFab Username for the account to find (if no PlayFabId is specified). - */ - public String Username; - /** - * User email address for the account to find (if no Username is specified). - */ - public String Email; - /** - * Title-specific username for the account to find (if no Email is set). - */ - public String TitleDisplayName; - /** - * If set to false, account info will not be returned. Defaults to true. - */ - public Boolean GetAccountInfo; - /** - * If set to false, inventory will not be returned. Defaults to true. Inventory will never be returned for users other than yourself. - */ - public Boolean GetInventory; - /** - * If set to false, virtual currency balances will not be returned. Defaults to true. Currency balances will never be returned for users other than yourself. - */ - public Boolean GetVirtualCurrency; - /** - * If set to false, custom user data will not be returned. Defaults to true. - */ - public Boolean GetUserData; - /** - * User custom data keys to return. If set to null, all keys will be returned. For users other than yourself, only public data will be returned. - */ - public ArrayList UserDataKeys; - /** - * If set to false, read-only user data will not be returned. Defaults to true. - */ - public Boolean GetReadOnlyData; - /** - * User read-only custom data keys to return. If set to null, all keys will be returned. For users other than yourself, only public data will be returned. - */ - public ArrayList ReadOnlyDataKeys; - - } - - /** - * @deprecated Do not use - */ - @Deprecated - public static class GetUserCombinedInfoResult { - /** - * Unique PlayFab identifier of the owner of the combined info. - */ - public String PlayFabId; - /** - * Account information for the user. - */ - public UserAccountInfo AccountInfo; - /** - * Array of inventory items in the user's current inventory. - */ - @Unordered("ItemInstanceId") - public ArrayList Inventory; - /** - * Array of virtual currency balance(s) belonging to the user. - */ - public Map VirtualCurrency; - /** - * Array of remaining times and timestamps for virtual currencies. - */ - public Map VirtualCurrencyRechargeTimes; - /** - * User specific custom data. - */ - public Map Data; - /** - * The version of the UserData that was returned. - */ - public Long DataVersion; - /** - * User specific read-only data. - */ - public Map ReadOnlyData; - /** - * The version of the Read-Only UserData that was returned. - */ - public Long ReadOnlyDataVersion; - - } - public static class GetUserDataRequest { /** * Specific keys to search for in the custom data. Leave null to get all keys. diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java b/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java index 6df7c14bb..f0604b794 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java @@ -263,7 +263,10 @@ public static enum PlayFabErrorCode { LimitNotAnUpgradeOption(1259), NoSecretKeyEnabledForCloudScript(1260), TaskNotFound(1261), - TaskInstanceNotFound(1262); + TaskInstanceNotFound(1262), + InvalidIdentityProviderId(1263), + MisconfiguredIdentityProvider(1264), + InvalidScheduledTaskType(1265); public int id; diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabSettings.java b/PlayFabClientSDK/src/com/playfab/PlayFabSettings.java index e33f517fa..1a0ed4eff 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabSettings.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabSettings.java @@ -3,9 +3,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.41.161121"; + public static String SdkVersion = "0.42.170102"; public static String BuildIdentifier = "jbuild_javasdk_1"; - public static String SdkVersionString = "JavaSDK-0.41.161121"; + public static String SdkVersionString = "JavaSDK-0.42.170102"; public static String TitleId = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static ErrorCallback GlobalErrorHandler; diff --git a/PlayFabSDK/src/PlayFabApiTest.java b/PlayFabSDK/src/PlayFabApiTest.java index 1e852e6e2..89f0a79e2 100644 --- a/PlayFabSDK/src/PlayFabApiTest.java +++ b/PlayFabSDK/src/PlayFabApiTest.java @@ -25,7 +25,6 @@ public class PlayFabApiTest // Fixed values provided from testInputs private static String USER_EMAIL; private static String CHAR_NAME; - private static boolean TITLE_CAN_UPDATE_SETTINGS; // Cached values private static String playFabId = null; @@ -67,7 +66,6 @@ private class TitleData { public String titleId; public String developerSecretKey; - public String titleCanUpdateSettings; public String userEmail; public String characterName; } @@ -88,7 +86,6 @@ public static void oneTimeSetUp() { // NOTE: Un-Comment and put your title-specific information here to test your title, or use PF_TEST_TITLE_DATA_JSON above //PlayFabSettings.TitleId = "TODO: TitleID"; //PlayFabSettings.DeveloperSecretKey = "TODO: A big long secret key that you should NEVER publish with your client"; - //TITLE_CAN_UPDATE_SETTINGS = false; // TODO: Set to true if you've enabled this in your title. //USER_EMAIL = "TODO: an email associated with an existing account on your title"; //CHAR_NAME = "TODO: a test character (make this up for yourself)"; return; @@ -97,7 +94,6 @@ public static void oneTimeSetUp() { TitleData resultData = gson.fromJson(testTitleJson, new TypeToken(){}.getType()); PlayFabSettings.TitleId = resultData.titleId; PlayFabSettings.DeveloperSecretKey = resultData.developerSecretKey; - TITLE_CAN_UPDATE_SETTINGS = Boolean.parseBoolean(resultData.titleCanUpdateSettings); USER_EMAIL = resultData.userEmail; CHAR_NAME = resultData.characterName; } diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java b/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java index cf2b22bfa..e6bac8909 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java @@ -1444,67 +1444,6 @@ private static PlayFabResult privateGetPlayFab return pfResult; } - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetUserCombinedInfoAsync(request); - } - }); - } - - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult GetUserCombinedInfo(final GetUserCombinedInfoRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetUserCombinedInfoAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - return null; - } - } - - /** - * @deprecated Please use GetPlayerCombinedInfo instead. - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception { - if (_authKey == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetUserCombinedInfo", request, "X-Authorization", _authKey); - task.run(); - Object httpResult = task.get(); - if(httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - GetUserCombinedInfoResult result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Links the Android device identifier to the user's PlayFab account */ diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java index 8e34fa593..8cc2cfec9 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java @@ -1358,7 +1358,7 @@ public static class GetPlayerCombinedInfoRequestParams { */ public Boolean GetUserData; /** - * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false + * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false */ public ArrayList UserDataKeys; /** @@ -1862,103 +1862,6 @@ public static class GetTradeStatusResponse { } - /** - * @deprecated Do not use - */ - @Deprecated - public static class GetUserCombinedInfoRequest { - /** - * Unique PlayFab identifier of the user whose info is being requested. Optional, defaults to the authenticated user if no other lookup identifier set. - */ - public String PlayFabId; - /** - * PlayFab Username for the account to find (if no PlayFabId is specified). - */ - public String Username; - /** - * User email address for the account to find (if no Username is specified). - */ - public String Email; - /** - * Title-specific username for the account to find (if no Email is set). - */ - public String TitleDisplayName; - /** - * If set to false, account info will not be returned. Defaults to true. - */ - public Boolean GetAccountInfo; - /** - * If set to false, inventory will not be returned. Defaults to true. Inventory will never be returned for users other than yourself. - */ - public Boolean GetInventory; - /** - * If set to false, virtual currency balances will not be returned. Defaults to true. Currency balances will never be returned for users other than yourself. - */ - public Boolean GetVirtualCurrency; - /** - * If set to false, custom user data will not be returned. Defaults to true. - */ - public Boolean GetUserData; - /** - * User custom data keys to return. If set to null, all keys will be returned. For users other than yourself, only public data will be returned. - */ - public ArrayList UserDataKeys; - /** - * If set to false, read-only user data will not be returned. Defaults to true. - */ - public Boolean GetReadOnlyData; - /** - * User read-only custom data keys to return. If set to null, all keys will be returned. For users other than yourself, only public data will be returned. - */ - public ArrayList ReadOnlyDataKeys; - - } - - /** - * @deprecated Do not use - */ - @Deprecated - public static class GetUserCombinedInfoResult { - /** - * Unique PlayFab identifier of the owner of the combined info. - */ - public String PlayFabId; - /** - * Account information for the user. - */ - public UserAccountInfo AccountInfo; - /** - * Array of inventory items in the user's current inventory. - */ - @Unordered("ItemInstanceId") - public ArrayList Inventory; - /** - * Array of virtual currency balance(s) belonging to the user. - */ - public Map VirtualCurrency; - /** - * Array of remaining times and timestamps for virtual currencies. - */ - public Map VirtualCurrencyRechargeTimes; - /** - * User specific custom data. - */ - public Map Data; - /** - * The version of the UserData that was returned. - */ - public Long DataVersion; - /** - * User specific read-only data. - */ - public Map ReadOnlyData; - /** - * The version of the Read-Only UserData that was returned. - */ - public Long ReadOnlyDataVersion; - - } - public static class GetUserDataRequest { /** * Specific keys to search for in the custom data. Leave null to get all keys. diff --git a/PlayFabSDK/src/com/playfab/PlayFabErrors.java b/PlayFabSDK/src/com/playfab/PlayFabErrors.java index 6df7c14bb..f0604b794 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabErrors.java +++ b/PlayFabSDK/src/com/playfab/PlayFabErrors.java @@ -263,7 +263,10 @@ public static enum PlayFabErrorCode { LimitNotAnUpgradeOption(1259), NoSecretKeyEnabledForCloudScript(1260), TaskNotFound(1261), - TaskInstanceNotFound(1262); + TaskInstanceNotFound(1262), + InvalidIdentityProviderId(1263), + MisconfiguredIdentityProvider(1264), + InvalidScheduledTaskType(1265); public int id; diff --git a/PlayFabSDK/src/com/playfab/PlayFabServerModels.java b/PlayFabSDK/src/com/playfab/PlayFabServerModels.java index ffaeacd77..32d9eedb4 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabServerModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabServerModels.java @@ -1583,7 +1583,7 @@ public static class GetPlayerCombinedInfoRequestParams { */ public Boolean GetUserData; /** - * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false + * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false */ public ArrayList UserDataKeys; /** diff --git a/PlayFabSDK/src/com/playfab/PlayFabSettings.java b/PlayFabSDK/src/com/playfab/PlayFabSettings.java index 74384dd53..356eb686a 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabSettings.java +++ b/PlayFabSDK/src/com/playfab/PlayFabSettings.java @@ -3,9 +3,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.41.161121"; + public static String SdkVersion = "0.42.170102"; public static String BuildIdentifier = "jbuild_javasdk_1"; - public static String SdkVersionString = "JavaSDK-0.41.161121"; + public static String SdkVersionString = "JavaSDK-0.42.170102"; public static String TitleId = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static ErrorCallback GlobalErrorHandler; diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabErrors.java b/PlayFabServerSDK/src/com/playfab/PlayFabErrors.java index 6df7c14bb..f0604b794 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabErrors.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabErrors.java @@ -263,7 +263,10 @@ public static enum PlayFabErrorCode { LimitNotAnUpgradeOption(1259), NoSecretKeyEnabledForCloudScript(1260), TaskNotFound(1261), - TaskInstanceNotFound(1262); + TaskInstanceNotFound(1262), + InvalidIdentityProviderId(1263), + MisconfiguredIdentityProvider(1264), + InvalidScheduledTaskType(1265); public int id; diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java b/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java index ffaeacd77..32d9eedb4 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java @@ -1583,7 +1583,7 @@ public static class GetPlayerCombinedInfoRequestParams { */ public Boolean GetUserData; /** - * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false + * Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false */ public ArrayList UserDataKeys; /** diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabSettings.java b/PlayFabServerSDK/src/com/playfab/PlayFabSettings.java index 970d2cf06..207d11911 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabSettings.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabSettings.java @@ -3,9 +3,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.41.161121"; + public static String SdkVersion = "0.42.170102"; public static String BuildIdentifier = "jbuild_javasdk_1"; - public static String SdkVersionString = "JavaSDK-0.41.161121"; + public static String SdkVersionString = "JavaSDK-0.42.170102"; public static String TitleId = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static ErrorCallback GlobalErrorHandler;