Skip to content

Commit

Permalink
https://api.playfab.com/releaseNotes/#170102
Browse files Browse the repository at this point in the history
  • Loading branch information
Playfab Jenkins Bot committed Jan 2, 2017
2 parents e174619 + 57870f2 commit 884f0d4
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 497 deletions.
2 changes: 1 addition & 1 deletion AndroidStudioExample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1445,67 +1445,6 @@ private static PlayFabResult<GetPlayFabIDsFromTwitchIDsResult> privateGetPlayFab
return pfResult;
}

/**
* @deprecated Please use GetPlayerCombinedInfo instead.
*/
@Deprecated
@SuppressWarnings("unchecked")
public static FutureTask<PlayFabResult<GetUserCombinedInfoResult>> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) {
return new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
public PlayFabResult<GetUserCombinedInfoResult> call() throws Exception {
return privateGetUserCombinedInfoAsync(request);
}
});
}

/**
* @deprecated Please use GetPlayerCombinedInfo instead.
*/
@Deprecated
@SuppressWarnings("unchecked")
public static PlayFabResult<GetUserCombinedInfoResult> GetUserCombinedInfo(final GetUserCombinedInfoRequest request) {
FutureTask<PlayFabResult<GetUserCombinedInfoResult>> task = new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
public PlayFabResult<GetUserCombinedInfoResult> 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<GetUserCombinedInfoResult> privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception {
if (_authKey == null) throw new Exception ("Must be logged in to call this method");

FutureTask<Object> 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<GetUserCombinedInfoResult>();
result.Error = error;
return result;
}
String resultRawJson = (String) httpResult;

PlayFabJsonSuccess<GetUserCombinedInfoResult> resultData = gson.fromJson(resultRawJson, new TypeToken<PlayFabJsonSuccess<GetUserCombinedInfoResult>>(){}.getType());
GetUserCombinedInfoResult result = resultData.data;

PlayFabResult<GetUserCombinedInfoResult> pfResult = new PlayFabResult<GetUserCombinedInfoResult>();
pfResult.Result = result;
return pfResult;
}

/**
* Links the Android device identifier to the user's PlayFab account
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> UserDataKeys;
/**
Expand Down Expand Up @@ -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<String> 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<String> 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<ItemInstance> Inventory;
/**
* Array of virtual currency balance(s) belonging to the user.
*/
public Map<String,Integer> VirtualCurrency;
/**
* Array of remaining times and timestamps for virtual currencies.
*/
public Map<String,VirtualCurrencyRechargeTime> VirtualCurrencyRechargeTimes;
/**
* User specific custom data.
*/
public Map<String,UserDataRecord> Data;
/**
* The version of the UserData that was returned.
*/
public Long DataVersion;
/**
* User specific read-only data.
*/
public Map<String,UserDataRecord> 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
61 changes: 0 additions & 61 deletions PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -1444,67 +1444,6 @@ private static PlayFabResult<GetPlayFabIDsFromTwitchIDsResult> privateGetPlayFab
return pfResult;
}

/**
* @deprecated Please use GetPlayerCombinedInfo instead.
*/
@Deprecated
@SuppressWarnings("unchecked")
public static FutureTask<PlayFabResult<GetUserCombinedInfoResult>> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) {
return new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
public PlayFabResult<GetUserCombinedInfoResult> call() throws Exception {
return privateGetUserCombinedInfoAsync(request);
}
});
}

/**
* @deprecated Please use GetPlayerCombinedInfo instead.
*/
@Deprecated
@SuppressWarnings("unchecked")
public static PlayFabResult<GetUserCombinedInfoResult> GetUserCombinedInfo(final GetUserCombinedInfoRequest request) {
FutureTask<PlayFabResult<GetUserCombinedInfoResult>> task = new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
public PlayFabResult<GetUserCombinedInfoResult> 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<GetUserCombinedInfoResult> privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception {
if (_authKey == null) throw new Exception ("Must be logged in to call this method");

FutureTask<Object> 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<GetUserCombinedInfoResult>();
result.Error = error;
return result;
}
String resultRawJson = (String) httpResult;

PlayFabJsonSuccess<GetUserCombinedInfoResult> resultData = gson.fromJson(resultRawJson, new TypeToken<PlayFabJsonSuccess<GetUserCombinedInfoResult>>(){}.getType());
GetUserCombinedInfoResult result = resultData.data;

PlayFabResult<GetUserCombinedInfoResult> pfResult = new PlayFabResult<GetUserCombinedInfoResult>();
pfResult.Result = result;
return pfResult;
}

/**
* Links the Android device identifier to the user's PlayFab account
*/
Expand Down
99 changes: 1 addition & 98 deletions PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> UserDataKeys;
/**
Expand Down Expand Up @@ -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<String> 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<String> 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<ItemInstance> Inventory;
/**
* Array of virtual currency balance(s) belonging to the user.
*/
public Map<String,Integer> VirtualCurrency;
/**
* Array of remaining times and timestamps for virtual currencies.
*/
public Map<String,VirtualCurrencyRechargeTime> VirtualCurrencyRechargeTimes;
/**
* User specific custom data.
*/
public Map<String,UserDataRecord> Data;
/**
* The version of the UserData that was returned.
*/
public Long DataVersion;
/**
* User specific read-only data.
*/
public Map<String,UserDataRecord> 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.
Expand Down
Loading

0 comments on commit 884f0d4

Please sign in to comment.