From ab3e5de39b7233d880dbfbcd17c73ef728cb9367 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Mon, 18 Jan 2016 21:29:39 +0000 Subject: [PATCH 1/9] Automated build from Jenkins --- .../src/com/playfab/PlayFabAdminModels.java | 4 +- .../src/com/playfab/PlayFabServerAPI.java | 58 +++++++++++++++++++ .../src/com/playfab/PlayFabServerModels.java | 20 +++++++ .../src/com/playfab/PlayFabAdminModels.java | 4 +- .../src/com/playfab/PlayFabServerAPI.java | 58 +++++++++++++++++++ .../src/com/playfab/PlayFabServerModels.java | 20 +++++++ 6 files changed, 160 insertions(+), 4 deletions(-) diff --git a/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java b/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java index 5f4986f50..673f35455 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java @@ -1571,7 +1571,7 @@ public static enum ResultTableNodeType { public static class RevokeInventoryItemRequest { /** - * unique PlayFab identifier for the user account which is to have the specified item removed + * Unique PlayFab assigned ID of the user on whom the operation will be performed. */ public String PlayFabId; /** @@ -1579,7 +1579,7 @@ public static class RevokeInventoryItemRequest { */ public String CharacterId; /** - * unique PlayFab identifier for the item instance to be removed + * Unique PlayFab assigned instance identifier of the item */ public String ItemInstanceId; diff --git a/PlayFabSDK/src/com/playfab/PlayFabServerAPI.java b/PlayFabSDK/src/com/playfab/PlayFabServerAPI.java index f395ff4b9..171d76681 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabServerAPI.java +++ b/PlayFabSDK/src/com/playfab/PlayFabServerAPI.java @@ -2336,6 +2336,64 @@ private static PlayFabResult privateReportPlayerAsync( return pfResult; } + /** + * Revokes access to an item in a user's inventory + */ + @SuppressWarnings("unchecked") + public static FutureTask> RevokeInventoryItemAsync(final RevokeInventoryItemRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateRevokeInventoryItemAsync(request); + } + }); + } + + /** + * Revokes access to an item in a user's inventory + */ + @SuppressWarnings("unchecked") + public static PlayFabResult RevokeInventoryItem(final RevokeInventoryItemRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateRevokeInventoryItemAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Revokes access to an item in a user's inventory + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateRevokeInventoryItemAsync(final RevokeInventoryItemRequest request) throws Exception { + if (PlayFabSettings.DeveloperSecretKey == null) throw new Exception ("Must have PlayFabSettings.DeveloperSecretKey set to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Server/RevokeInventoryItem", request, "X-SecretKey", PlayFabSettings.DeveloperSecretKey); + 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()); + RevokeInventoryResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Decrements the character's balance of the specified virtual currency by the stated amount */ diff --git a/PlayFabSDK/src/com/playfab/PlayFabServerModels.java b/PlayFabSDK/src/com/playfab/PlayFabServerModels.java index 50ddd1613..feea9c9b2 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabServerModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabServerModels.java @@ -1757,6 +1757,26 @@ public static class ReportPlayerServerResult { } + public static class RevokeInventoryItemRequest { + /** + * Unique PlayFab assigned ID of the user on whom the operation will be performed. + */ + public String PlayFabId; + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + /** + * Unique PlayFab assigned instance identifier of the item + */ + public String ItemInstanceId; + + } + + public static class RevokeInventoryResult { + + } + public static class SendPushNotificationRequest { /** * PlayFabId of the recipient of the push notification. diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java b/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java index 5f4986f50..673f35455 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java @@ -1571,7 +1571,7 @@ public static enum ResultTableNodeType { public static class RevokeInventoryItemRequest { /** - * unique PlayFab identifier for the user account which is to have the specified item removed + * Unique PlayFab assigned ID of the user on whom the operation will be performed. */ public String PlayFabId; /** @@ -1579,7 +1579,7 @@ public static class RevokeInventoryItemRequest { */ public String CharacterId; /** - * unique PlayFab identifier for the item instance to be removed + * Unique PlayFab assigned instance identifier of the item */ public String ItemInstanceId; diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabServerAPI.java b/PlayFabServerSDK/src/com/playfab/PlayFabServerAPI.java index f395ff4b9..171d76681 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabServerAPI.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabServerAPI.java @@ -2336,6 +2336,64 @@ private static PlayFabResult privateReportPlayerAsync( return pfResult; } + /** + * Revokes access to an item in a user's inventory + */ + @SuppressWarnings("unchecked") + public static FutureTask> RevokeInventoryItemAsync(final RevokeInventoryItemRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateRevokeInventoryItemAsync(request); + } + }); + } + + /** + * Revokes access to an item in a user's inventory + */ + @SuppressWarnings("unchecked") + public static PlayFabResult RevokeInventoryItem(final RevokeInventoryItemRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateRevokeInventoryItemAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Revokes access to an item in a user's inventory + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateRevokeInventoryItemAsync(final RevokeInventoryItemRequest request) throws Exception { + if (PlayFabSettings.DeveloperSecretKey == null) throw new Exception ("Must have PlayFabSettings.DeveloperSecretKey set to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Server/RevokeInventoryItem", request, "X-SecretKey", PlayFabSettings.DeveloperSecretKey); + 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()); + RevokeInventoryResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Decrements the character's balance of the specified virtual currency by the stated amount */ diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java b/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java index 50ddd1613..feea9c9b2 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java @@ -1757,6 +1757,26 @@ public static class ReportPlayerServerResult { } + public static class RevokeInventoryItemRequest { + /** + * Unique PlayFab assigned ID of the user on whom the operation will be performed. + */ + public String PlayFabId; + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + /** + * Unique PlayFab assigned instance identifier of the item + */ + public String ItemInstanceId; + + } + + public static class RevokeInventoryResult { + + } + public static class SendPushNotificationRequest { /** * PlayFabId of the recipient of the push notification. From e1f1998173a996a30f5b336a2d475a813b97dd44 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Tue, 19 Jan 2016 19:25:01 +0000 Subject: [PATCH 2/9] Automated build from Jenkins --- .../app/src/main/java/com/playfab/PlayFabClientModels.java | 4 ++++ PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java | 4 ++++ PlayFabSDK/src/com/playfab/PlayFabClientModels.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 3ad29b154..2199b0941 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -1992,6 +1992,10 @@ public static class LoginResult { * Settings specific to this user. */ public UserSettings SettingsForUser; + /** + * The time of this user's previous login. If there was no previous login, then it's DateTime.MinValue + */ + public Date LastLoginTime; } diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java index 3ad29b154..2199b0941 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java @@ -1992,6 +1992,10 @@ public static class LoginResult { * Settings specific to this user. */ public UserSettings SettingsForUser; + /** + * The time of this user's previous login. If there was no previous login, then it's DateTime.MinValue + */ + public Date LastLoginTime; } diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java index 3ad29b154..2199b0941 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java @@ -1992,6 +1992,10 @@ public static class LoginResult { * Settings specific to this user. */ public UserSettings SettingsForUser; + /** + * The time of this user's previous login. If there was no previous login, then it's DateTime.MinValue + */ + public Date LastLoginTime; } From 14da3cc39271ae94f47b4b70dc36d91193594b66 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Tue, 19 Jan 2016 23:32:26 +0000 Subject: [PATCH 3/9] Automated build from Jenkins --- .../main/java/com/playfab/PlayFabErrors.java | 4 +++- .../src/com/playfab/PlayFabErrors.java | 4 +++- .../src/com/playfab/PlayFabAdminModels.java | 20 +++++++++++++++++++ PlayFabSDK/src/com/playfab/PlayFabErrors.java | 4 +++- .../src/com/playfab/PlayFabAdminModels.java | 20 +++++++++++++++++++ .../src/com/playfab/PlayFabErrors.java | 4 +++- 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java index 195d03ab5..3c7d777e2 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java @@ -200,7 +200,9 @@ public static enum PlayFabErrorCode { StatisticNameConflict(1196), StatisticVersionClosedForWrites(1197), StatisticVersionInvalid(1198), - APIClientRequestRateLimitExceeded(1199); + APIClientRequestRateLimitExceeded(1199), + InvalidJSONContent(1200), + InvalidDropTable(1201); public int id; diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java b/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java index 195d03ab5..3c7d777e2 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabErrors.java @@ -200,7 +200,9 @@ public static enum PlayFabErrorCode { StatisticNameConflict(1196), StatisticVersionClosedForWrites(1197), StatisticVersionInvalid(1198), - APIClientRequestRateLimitExceeded(1199); + APIClientRequestRateLimitExceeded(1199), + InvalidJSONContent(1200), + InvalidDropTable(1201); public int id; diff --git a/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java b/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java index 673f35455..e53a4f38c 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java @@ -54,6 +54,10 @@ public static class AddServerBuildRequest { * maximum number of game server instances that can run on a single host machine */ public Integer MaxGamesPerHost; + /** + * minimum capacity of additional game server instances that can be started before the autoscaling service starts new host machines (given the number of current running host machines and game server instances) + */ + public Integer MinFreeGameSlots; } @@ -70,6 +74,10 @@ public static class AddServerBuildResult { * maximum number of game server instances that can run on a single host machine */ public Integer MaxGamesPerHost; + /** + * minimum capacity of additional game server instances that can be started before the autoscaling service starts new host machines (given the number of current running host machines and game server instances) + */ + public Integer MinFreeGameSlots; /** * appended to the end of the command line when starting game servers */ @@ -827,6 +835,10 @@ public static class GetServerBuildInfoResult implements Comparable Date: Wed, 20 Jan 2016 19:37:21 +0000 Subject: [PATCH 4/9] Automated build from Jenkins --- .../java/com/playfab/PlayFabClientModels.java | 120 +++++++++++++++-- .../src/com/playfab/PlayFabClientModels.java | 120 +++++++++++++++-- .../src/com/playfab/PlayFabAdminModels.java | 120 +++++++++++++++-- .../src/com/playfab/PlayFabClientModels.java | 120 +++++++++++++++-- .../src/com/playfab/PlayFabServerModels.java | 122 ++++++++++++++++-- .../src/com/playfab/PlayFabAdminModels.java | 120 +++++++++++++++-- .../src/com/playfab/PlayFabServerModels.java | 122 ++++++++++++++++-- 7 files changed, 786 insertions(+), 58 deletions(-) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 2199b0941..bd8d3075d 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -3330,37 +3330,81 @@ public static class UpdateUserTitleDisplayNameResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; + + } + + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; } @@ -3405,6 +3449,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -3431,6 +3515,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSettings { /** * Boolean for whether this player is eligible for ad tracking. @@ -3487,6 +3583,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class ValidateAmazonReceiptRequest { /** * ReceiptId returned by the Amazon App Store in-app purchase API diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java index 2199b0941..bd8d3075d 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java @@ -3330,37 +3330,81 @@ public static class UpdateUserTitleDisplayNameResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; + + } + + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; } @@ -3405,6 +3449,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -3431,6 +3515,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSettings { /** * Boolean for whether this player is eligible for ad tracking. @@ -3487,6 +3583,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class ValidateAmazonReceiptRequest { /** * ReceiptId returned by the Amazon App Store in-app purchase API diff --git a/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java b/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java index e53a4f38c..629a9509c 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabAdminModels.java @@ -1919,37 +1919,73 @@ public static class UpdateUserTitleDisplayNameResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; } @@ -1965,6 +2001,14 @@ public static class UserCredentials { } + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; + + } + public static enum UserDataPermission { Private, Public @@ -2006,6 +2050,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -2032,6 +2116,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSteamInfo { /** * Steam identifier @@ -2080,6 +2176,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class VirtualCurrencyData { /** * unique two-character identifier for this currency type (e.g.: "CC", "GC") diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java index 2199b0941..bd8d3075d 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java @@ -3330,37 +3330,81 @@ public static class UpdateUserTitleDisplayNameResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; + + } + + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; } @@ -3405,6 +3449,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -3431,6 +3515,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSettings { /** * Boolean for whether this player is eligible for ad tracking. @@ -3487,6 +3583,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class ValidateAmazonReceiptRequest { /** * ReceiptId returned by the Amazon App Store in-app purchase API diff --git a/PlayFabSDK/src/com/playfab/PlayFabServerModels.java b/PlayFabSDK/src/com/playfab/PlayFabServerModels.java index feea9c9b2..6779edbb9 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabServerModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabServerModels.java @@ -1053,7 +1053,7 @@ public static class GetUserAccountInfoRequest { public static class GetUserAccountInfoResult { /** - * Account info for the user whose information was requested. + * Account details for the user whose information was requested. */ public UserAccountInfo UserInfo; @@ -2127,37 +2127,81 @@ public static class UpdateUserStatisticsResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; + + } + + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; } @@ -2202,6 +2246,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -2228,6 +2312,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSteamInfo { /** * Steam identifier @@ -2276,6 +2372,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class VirtualCurrencyRechargeTime { /** * Time remaining (in seconds) before the next recharge increment of the virtual currency. diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java b/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java index e53a4f38c..629a9509c 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabAdminModels.java @@ -1919,37 +1919,73 @@ public static class UpdateUserTitleDisplayNameResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; } @@ -1965,6 +2001,14 @@ public static class UserCredentials { } + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; + + } + public static enum UserDataPermission { Private, Public @@ -2006,6 +2050,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -2032,6 +2116,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSteamInfo { /** * Steam identifier @@ -2080,6 +2176,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class VirtualCurrencyData { /** * unique two-character identifier for this currency type (e.g.: "CC", "GC") diff --git a/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java b/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java index feea9c9b2..6779edbb9 100644 --- a/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java +++ b/PlayFabServerSDK/src/com/playfab/PlayFabServerModels.java @@ -1053,7 +1053,7 @@ public static class GetUserAccountInfoRequest { public static class GetUserAccountInfoResult { /** - * Account info for the user whose information was requested. + * Account details for the user whose information was requested. */ public UserAccountInfo UserInfo; @@ -2127,37 +2127,81 @@ public static class UpdateUserStatisticsResult { public static class UserAccountInfo { /** - * unique identifier for the user account + * Unique identifier for the user account */ public String PlayFabId; /** - * timestamp indicating when the user account was created + * Timestamp indicating when the user account was created */ public Date Created; /** - * user account name in the PlayFab service + * User account name in the PlayFab service */ public String Username; /** - * title-specific information for the user account + * Title-specific information for the user account */ public UserTitleInfo TitleInfo; /** - * personal information for the user which is considered more sensitive + * Personal information for the user which is considered more sensitive */ public UserPrivateAccountInfo PrivateInfo; /** - * user Facebook information, if a Facebook account has been linked + * User Facebook information, if a Facebook account has been linked */ public UserFacebookInfo FacebookInfo; /** - * user Steam information, if a Steam account has been linked + * User Steam information, if a Steam account has been linked */ public UserSteamInfo SteamInfo; /** - * user Gamecenter information, if a Gamecenter account has been linked + * User Gamecenter information, if a Gamecenter account has been linked */ public UserGameCenterInfo GameCenterInfo; + /** + * User iOS device information, if an iOS device has been linked + */ + public UserIosDeviceInfo IosDeviceInfo; + /** + * User Android device information, if an Android device has been linked + */ + public UserAndroidDeviceInfo AndroidDeviceInfo; + /** + * User Kongregate account information, if a Kongregate account has been linked + */ + public UserKongregateInfo KongregateInfo; + /** + * User PSN account information, if a PSN account has been linked + */ + public UserPsnInfo PsnInfo; + /** + * User Google account information, if a Google account has been linked + */ + public UserGoogleInfo GoogleInfo; + /** + * User XBox account information, if a XBox account has been linked + */ + public UserXboxInfo XboxInfo; + /** + * Custom ID information, if a custom ID has been assigned + */ + public UserCustomIdInfo CustomIdInfo; + + } + + public static class UserAndroidDeviceInfo { + /** + * Android device ID + */ + public String AndroidDeviceId; + + } + + public static class UserCustomIdInfo { + /** + * Custom ID + */ + public String CustomId; } @@ -2202,6 +2246,46 @@ public static class UserGameCenterInfo { } + public static class UserGoogleInfo { + /** + * Google ID + */ + public String GoogleId; + /** + * Email address of the Google account + */ + public String GoogleEmail; + /** + * Locale of the Google account + */ + public String GoogleLocale; + /** + * Gender information of the Google account + */ + public String GoogleGender; + + } + + public static class UserIosDeviceInfo { + /** + * iOS device ID + */ + public String IosDeviceId; + + } + + public static class UserKongregateInfo { + /** + * Kongregate ID + */ + public String KongregateId; + /** + * Kongregate Username + */ + public String KongregateName; + + } + public static enum UserOrigination { Organic, Steam, @@ -2228,6 +2312,18 @@ public static class UserPrivateAccountInfo { } + public static class UserPsnInfo { + /** + * PSN account ID + */ + public String PsnAccountId; + /** + * PSN online ID + */ + public String PsnOnlineId; + + } + public static class UserSteamInfo { /** * Steam identifier @@ -2276,6 +2372,14 @@ public static class UserTitleInfo { } + public static class UserXboxInfo { + /** + * XBox user ID + */ + public String XboxUserId; + + } + public static class VirtualCurrencyRechargeTime { /** * Time remaining (in seconds) before the next recharge increment of the virtual currency. From 7a6c39ebd8e8b67f23345dd758f185521aa5ecc5 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Wed, 20 Jan 2016 19:54:11 +0000 Subject: [PATCH 5/9] Automated build from Jenkins --- .../java/com/playfab/PlayFabClientAPI.java | 115 ++++++++++++++++++ .../java/com/playfab/PlayFabClientModels.java | 32 +++++ .../src/com/playfab/PlayFabClientAPI.java | 115 ++++++++++++++++++ .../src/com/playfab/PlayFabClientModels.java | 32 +++++ .../src/com/playfab/PlayFabClientAPI.java | 115 ++++++++++++++++++ .../src/com/playfab/PlayFabClientModels.java | 32 +++++ 6 files changed, 441 insertions(+) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java index 04844275d..b48d873bc 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java @@ -5972,6 +5972,64 @@ private static PlayFabResult privateGetCharacterL return pfResult; } + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetCharacterStatisticsAsync(final GetCharacterStatisticsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetCharacterStatisticsAsync(request); + } + }); + } + + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetCharacterStatistics(final GetCharacterStatisticsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetCharacterStatisticsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetCharacterStatisticsAsync(final GetCharacterStatisticsRequest request) throws Exception { + if (_authKey == null) throw new Exception ("Must be logged in to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetCharacterStatistics", 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()); + GetCharacterStatisticsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves a list of ranked characters for the given statistic, centered on the requested Character ID */ @@ -6146,6 +6204,63 @@ private static PlayFabResult privateGrantCharacterTo return pfResult; } + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + public static FutureTask> UpdateCharacterStatisticsAsync(final UpdateCharacterStatisticsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateUpdateCharacterStatisticsAsync(request); + } + }); + } + + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + public static PlayFabResult UpdateCharacterStatistics(final UpdateCharacterStatisticsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateUpdateCharacterStatisticsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateUpdateCharacterStatisticsAsync(final UpdateCharacterStatisticsRequest request) throws Exception { + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/UpdateCharacterStatistics", request, null, null); + 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()); + UpdateCharacterStatisticsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves the title-specific custom data for the character which is readable and writable by the client */ diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index bd8d3075d..3ee108758 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -944,6 +944,22 @@ public static class GetCharacterLeaderboardResult { } + public static class GetCharacterStatisticsRequest { + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + + } + + public static class GetCharacterStatisticsResult { + /** + * The requested character statistics. + */ + public Map CharacterStatistics; + + } + public static class GetCloudScriptUrlRequest { /** * Cloud Script Version to use. Defaults to 1. @@ -3240,6 +3256,22 @@ public static class UpdateCharacterDataResult { } + public static class UpdateCharacterStatisticsRequest { + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + /** + * Statistics to be updated with the provided values. + */ + public Map CharacterStatistics; + + } + + public static class UpdateCharacterStatisticsResult { + + } + public static class UpdatePlayerStatisticsRequest { /** * Statistics to be updated with the provided values diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java index 12959920c..b2b305083 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java @@ -5971,6 +5971,64 @@ private static PlayFabResult privateGetCharacterL return pfResult; } + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetCharacterStatisticsAsync(final GetCharacterStatisticsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetCharacterStatisticsAsync(request); + } + }); + } + + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetCharacterStatistics(final GetCharacterStatisticsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetCharacterStatisticsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetCharacterStatisticsAsync(final GetCharacterStatisticsRequest request) throws Exception { + if (_authKey == null) throw new Exception ("Must be logged in to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetCharacterStatistics", 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()); + GetCharacterStatisticsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves a list of ranked characters for the given statistic, centered on the requested Character ID */ @@ -6145,6 +6203,63 @@ private static PlayFabResult privateGrantCharacterTo return pfResult; } + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + public static FutureTask> UpdateCharacterStatisticsAsync(final UpdateCharacterStatisticsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateUpdateCharacterStatisticsAsync(request); + } + }); + } + + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + public static PlayFabResult UpdateCharacterStatistics(final UpdateCharacterStatisticsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateUpdateCharacterStatisticsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateUpdateCharacterStatisticsAsync(final UpdateCharacterStatisticsRequest request) throws Exception { + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/UpdateCharacterStatistics", request, null, null); + 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()); + UpdateCharacterStatisticsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves the title-specific custom data for the character which is readable and writable by the client */ diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java index bd8d3075d..3ee108758 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java @@ -944,6 +944,22 @@ public static class GetCharacterLeaderboardResult { } + public static class GetCharacterStatisticsRequest { + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + + } + + public static class GetCharacterStatisticsResult { + /** + * The requested character statistics. + */ + public Map CharacterStatistics; + + } + public static class GetCloudScriptUrlRequest { /** * Cloud Script Version to use. Defaults to 1. @@ -3240,6 +3256,22 @@ public static class UpdateCharacterDataResult { } + public static class UpdateCharacterStatisticsRequest { + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + /** + * Statistics to be updated with the provided values. + */ + public Map CharacterStatistics; + + } + + public static class UpdateCharacterStatisticsResult { + + } + public static class UpdatePlayerStatisticsRequest { /** * Statistics to be updated with the provided values diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java b/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java index 12959920c..b2b305083 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java @@ -5971,6 +5971,64 @@ private static PlayFabResult privateGetCharacterL return pfResult; } + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetCharacterStatisticsAsync(final GetCharacterStatisticsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetCharacterStatisticsAsync(request); + } + }); + } + + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetCharacterStatistics(final GetCharacterStatisticsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetCharacterStatisticsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Retrieves the details of all title-specific statistics for the user + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetCharacterStatisticsAsync(final GetCharacterStatisticsRequest request) throws Exception { + if (_authKey == null) throw new Exception ("Must be logged in to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetCharacterStatistics", 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()); + GetCharacterStatisticsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves a list of ranked characters for the given statistic, centered on the requested Character ID */ @@ -6145,6 +6203,63 @@ private static PlayFabResult privateGrantCharacterTo return pfResult; } + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + public static FutureTask> UpdateCharacterStatisticsAsync(final UpdateCharacterStatisticsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateUpdateCharacterStatisticsAsync(request); + } + }); + } + + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + public static PlayFabResult UpdateCharacterStatistics(final UpdateCharacterStatisticsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateUpdateCharacterStatisticsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Updates the values of the specified title-specific statistics for the specific character + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateUpdateCharacterStatisticsAsync(final UpdateCharacterStatisticsRequest request) throws Exception { + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/UpdateCharacterStatistics", request, null, null); + 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()); + UpdateCharacterStatisticsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves the title-specific custom data for the character which is readable and writable by the client */ diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java index bd8d3075d..3ee108758 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java @@ -944,6 +944,22 @@ public static class GetCharacterLeaderboardResult { } + public static class GetCharacterStatisticsRequest { + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + + } + + public static class GetCharacterStatisticsResult { + /** + * The requested character statistics. + */ + public Map CharacterStatistics; + + } + public static class GetCloudScriptUrlRequest { /** * Cloud Script Version to use. Defaults to 1. @@ -3240,6 +3256,22 @@ public static class UpdateCharacterDataResult { } + public static class UpdateCharacterStatisticsRequest { + /** + * Unique PlayFab assigned ID for a specific character owned by a user + */ + public String CharacterId; + /** + * Statistics to be updated with the provided values. + */ + public Map CharacterStatistics; + + } + + public static class UpdateCharacterStatisticsResult { + + } + public static class UpdatePlayerStatisticsRequest { /** * Statistics to be updated with the provided values From c84909e25597c6829ed0c6d111b849af8468dccb Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Sat, 23 Jan 2016 00:18:04 +0000 Subject: [PATCH 6/9] Automated build from Jenkins --- .../app/src/main/java/com/playfab/PlayFabClientModels.java | 4 ++-- PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java | 4 ++-- PlayFabSDK/src/com/playfab/PlayFabClientModels.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 3ee108758..9f105852e 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -1779,7 +1779,7 @@ public int compareTo(ItemInstance other) { } - public static class ItemPuchaseRequest { + public static class ItemPurchaseRequest { /** * Unique ItemId of the item to purchase. */ @@ -2875,7 +2875,7 @@ public static class StartPurchaseRequest { /** * Array of items to purchase. */ - public ArrayList Items; + public ArrayList Items; } diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java index 3ee108758..9f105852e 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java @@ -1779,7 +1779,7 @@ public int compareTo(ItemInstance other) { } - public static class ItemPuchaseRequest { + public static class ItemPurchaseRequest { /** * Unique ItemId of the item to purchase. */ @@ -2875,7 +2875,7 @@ public static class StartPurchaseRequest { /** * Array of items to purchase. */ - public ArrayList Items; + public ArrayList Items; } diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java index 3ee108758..9f105852e 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java @@ -1779,7 +1779,7 @@ public int compareTo(ItemInstance other) { } - public static class ItemPuchaseRequest { + public static class ItemPurchaseRequest { /** * Unique ItemId of the item to purchase. */ @@ -2875,7 +2875,7 @@ public static class StartPurchaseRequest { /** * Array of items to purchase. */ - public ArrayList Items; + public ArrayList Items; } From 2b27baf4d8f83b1b665819b4bd6c903b79db9ddf Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Sat, 23 Jan 2016 03:04:26 +0000 Subject: [PATCH 7/9] Automated build from Jenkins --- .../java/com/playfab/PlayFabClientAPI.java | 58 +++++++++++++++++++ .../java/com/playfab/PlayFabClientModels.java | 28 +++++++++ .../src/com/playfab/PlayFabClientAPI.java | 58 +++++++++++++++++++ .../src/com/playfab/PlayFabClientModels.java | 28 +++++++++ .../src/com/playfab/PlayFabClientAPI.java | 58 +++++++++++++++++++ .../src/com/playfab/PlayFabClientModels.java | 28 +++++++++ 6 files changed, 258 insertions(+) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java index b48d873bc..b16d9b41a 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java @@ -1158,6 +1158,64 @@ private static PlayFabResult privateGetPlayFab return pfResult; } + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetPlayFabIDsFromKongregateIDsAsync(final GetPlayFabIDsFromKongregateIDsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetPlayFabIDsFromKongregateIDsAsync(request); + } + }); + } + + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetPlayFabIDsFromKongregateIDs(final GetPlayFabIDsFromKongregateIDsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetPlayFabIDsFromKongregateIDsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetPlayFabIDsFromKongregateIDsAsync(final GetPlayFabIDsFromKongregateIDsRequest request) throws Exception { + if (_authKey == null) throw new Exception ("Must be logged in to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetPlayFabIDsFromKongregateIDs", 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()); + GetPlayFabIDsFromKongregateIDsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves the unique PlayFab identifiers for the given set of PlayStation Network identifiers. */ diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 9f105852e..0d353dbc5 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -1324,6 +1324,22 @@ public static class GetPlayFabIDsFromGoogleIDsResult { } + public static class GetPlayFabIDsFromKongregateIDsRequest { + /** + * Array of unique Kongregate identifiers (Kongregate's user_id) for which the title needs to get PlayFab identifiers. + */ + public ArrayList KongregateIDs; + + } + + public static class GetPlayFabIDsFromKongregateIDsResult { + /** + * Mapping of Kongregate identifiers to PlayFab identifiers. + */ + public ArrayList Data; + + } + public static class GetPlayFabIDsFromPSNAccountIDsRequest { /** * Array of unique PlayStation Network identifiers for which the title needs to get PlayFab identifiers. @@ -1799,6 +1815,18 @@ public static class ItemPurchaseRequest { } + public static class KongregatePlayFabIdPair { + /** + * Unique Kongregate identifier for a user. + */ + public String KongregateId; + /** + * Unique PlayFab identifier for a user, or null if no PlayFab account is linked to the Kongregate identifier. + */ + public String PlayFabId; + + } + public static class LinkAndroidDeviceIDRequest { /** * Android device identifier for the user's device. diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java index b2b305083..1991b4aa7 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java @@ -1157,6 +1157,64 @@ private static PlayFabResult privateGetPlayFab return pfResult; } + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetPlayFabIDsFromKongregateIDsAsync(final GetPlayFabIDsFromKongregateIDsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetPlayFabIDsFromKongregateIDsAsync(request); + } + }); + } + + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetPlayFabIDsFromKongregateIDs(final GetPlayFabIDsFromKongregateIDsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetPlayFabIDsFromKongregateIDsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetPlayFabIDsFromKongregateIDsAsync(final GetPlayFabIDsFromKongregateIDsRequest request) throws Exception { + if (_authKey == null) throw new Exception ("Must be logged in to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetPlayFabIDsFromKongregateIDs", 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()); + GetPlayFabIDsFromKongregateIDsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves the unique PlayFab identifiers for the given set of PlayStation Network identifiers. */ diff --git a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java index 9f105852e..0d353dbc5 100644 --- a/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java @@ -1324,6 +1324,22 @@ public static class GetPlayFabIDsFromGoogleIDsResult { } + public static class GetPlayFabIDsFromKongregateIDsRequest { + /** + * Array of unique Kongregate identifiers (Kongregate's user_id) for which the title needs to get PlayFab identifiers. + */ + public ArrayList KongregateIDs; + + } + + public static class GetPlayFabIDsFromKongregateIDsResult { + /** + * Mapping of Kongregate identifiers to PlayFab identifiers. + */ + public ArrayList Data; + + } + public static class GetPlayFabIDsFromPSNAccountIDsRequest { /** * Array of unique PlayStation Network identifiers for which the title needs to get PlayFab identifiers. @@ -1799,6 +1815,18 @@ public static class ItemPurchaseRequest { } + public static class KongregatePlayFabIdPair { + /** + * Unique Kongregate identifier for a user. + */ + public String KongregateId; + /** + * Unique PlayFab identifier for a user, or null if no PlayFab account is linked to the Kongregate identifier. + */ + public String PlayFabId; + + } + public static class LinkAndroidDeviceIDRequest { /** * Android device identifier for the user's device. diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java b/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java index b2b305083..1991b4aa7 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientAPI.java @@ -1157,6 +1157,64 @@ private static PlayFabResult privateGetPlayFab return pfResult; } + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetPlayFabIDsFromKongregateIDsAsync(final GetPlayFabIDsFromKongregateIDsRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetPlayFabIDsFromKongregateIDsAsync(request); + } + }); + } + + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetPlayFabIDsFromKongregateIDs(final GetPlayFabIDsFromKongregateIDsRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetPlayFabIDsFromKongregateIDsAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** + * Retrieves the unique PlayFab identifiers for the given set of Kongregate identifiers. The Kongregate identifiers are the IDs for the user accounts, available as "user_id" from the Kongregate API methods(ex: http://developers.kongregate.com/docs/client/getUserId). + */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetPlayFabIDsFromKongregateIDsAsync(final GetPlayFabIDsFromKongregateIDsRequest request) throws Exception { + if (_authKey == null) throw new Exception ("Must be logged in to call this method"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetPlayFabIDsFromKongregateIDs", 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()); + GetPlayFabIDsFromKongregateIDsResult result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Retrieves the unique PlayFab identifiers for the given set of PlayStation Network identifiers. */ diff --git a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java index 9f105852e..0d353dbc5 100644 --- a/PlayFabSDK/src/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/com/playfab/PlayFabClientModels.java @@ -1324,6 +1324,22 @@ public static class GetPlayFabIDsFromGoogleIDsResult { } + public static class GetPlayFabIDsFromKongregateIDsRequest { + /** + * Array of unique Kongregate identifiers (Kongregate's user_id) for which the title needs to get PlayFab identifiers. + */ + public ArrayList KongregateIDs; + + } + + public static class GetPlayFabIDsFromKongregateIDsResult { + /** + * Mapping of Kongregate identifiers to PlayFab identifiers. + */ + public ArrayList Data; + + } + public static class GetPlayFabIDsFromPSNAccountIDsRequest { /** * Array of unique PlayStation Network identifiers for which the title needs to get PlayFab identifiers. @@ -1799,6 +1815,18 @@ public static class ItemPurchaseRequest { } + public static class KongregatePlayFabIdPair { + /** + * Unique Kongregate identifier for a user. + */ + public String KongregateId; + /** + * Unique PlayFab identifier for a user, or null if no PlayFab account is linked to the Kongregate identifier. + */ + public String PlayFabId; + + } + public static class LinkAndroidDeviceIDRequest { /** * Android device identifier for the user's device. From ee3c8452aab96506eb83a464a2f9b061206b0f79 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Mon, 25 Jan 2016 17:53:59 +0000 Subject: [PATCH 8/9] Automated build from Jenkins --- .../app/src/main/java/com/playfab/internal/PlayFabVersion.java | 2 +- PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java | 2 +- PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java | 2 +- PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java b/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java index 652799c45..0310221e9 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.13.160118"; + public static String SdkRevision = "0.15.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } diff --git a/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java b/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java index 652799c45..0310221e9 100644 --- a/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java +++ b/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.13.160118"; + public static String SdkRevision = "0.15.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } diff --git a/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java b/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java index 652799c45..0310221e9 100644 --- a/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java +++ b/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.13.160118"; + public static String SdkRevision = "0.15.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } diff --git a/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java b/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java index 652799c45..0310221e9 100644 --- a/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java +++ b/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.13.160118"; + public static String SdkRevision = "0.15.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } From b97c5f209e4b6c4958e72f7b0569d84a8f3d90e4 Mon Sep 17 00:00:00 2001 From: Playfab Jenkins Bot Date: Mon, 25 Jan 2016 18:01:28 +0000 Subject: [PATCH 9/9] Automated build from Jenkins --- .../app/src/main/java/com/playfab/internal/PlayFabVersion.java | 2 +- PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java | 2 +- PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java | 2 +- PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java b/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java index 0310221e9..dd705c084 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.15.160125"; + public static String SdkRevision = "0.14.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } diff --git a/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java b/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java index 0310221e9..dd705c084 100644 --- a/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java +++ b/PlayFabClientSDK/src/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.15.160125"; + public static String SdkRevision = "0.14.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } diff --git a/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java b/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java index 0310221e9..dd705c084 100644 --- a/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java +++ b/PlayFabSDK/src/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.15.160125"; + public static String SdkRevision = "0.14.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; } diff --git a/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java b/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java index 0310221e9..dd705c084 100644 --- a/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java +++ b/PlayFabServerSDK/src/com/playfab/internal/PlayFabVersion.java @@ -1,7 +1,7 @@ package com.playfab.internal; public class PlayFabVersion { - public static String SdkRevision = "0.15.160125"; + public static String SdkRevision = "0.14.160125"; public static String getVersionString() { return "JavaSDK-" + SdkRevision; }