Skip to content

Commit 57870f2

Browse files
author
Playfab Jenkins Bot
committed
https://api.playfab.com/releaseNotes/#170102
1 parent 111e730 commit 57870f2

File tree

17 files changed

+29
-495
lines changed

17 files changed

+29
-495
lines changed

‎AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,67 +1445,6 @@ private static PlayFabResult<GetPlayFabIDsFromTwitchIDsResult> privateGetPlayFab
14451445
return pfResult;
14461446
}
14471447

1448-
/**
1449-
* @deprecated Please use GetPlayerCombinedInfo instead.
1450-
*/
1451-
@Deprecated
1452-
@SuppressWarnings("unchecked")
1453-
public static FutureTask<PlayFabResult<GetUserCombinedInfoResult>> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) {
1454-
return new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
1455-
public PlayFabResult<GetUserCombinedInfoResult> call() throws Exception {
1456-
return privateGetUserCombinedInfoAsync(request);
1457-
}
1458-
});
1459-
}
1460-
1461-
/**
1462-
* @deprecated Please use GetPlayerCombinedInfo instead.
1463-
*/
1464-
@Deprecated
1465-
@SuppressWarnings("unchecked")
1466-
public static PlayFabResult<GetUserCombinedInfoResult> GetUserCombinedInfo(final GetUserCombinedInfoRequest request) {
1467-
FutureTask<PlayFabResult<GetUserCombinedInfoResult>> task = new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
1468-
public PlayFabResult<GetUserCombinedInfoResult> call() throws Exception {
1469-
return privateGetUserCombinedInfoAsync(request);
1470-
}
1471-
});
1472-
try {
1473-
task.run();
1474-
return task.get();
1475-
} catch(Exception e) {
1476-
return null;
1477-
}
1478-
}
1479-
1480-
/**
1481-
* @deprecated Please use GetPlayerCombinedInfo instead.
1482-
*/
1483-
@Deprecated
1484-
@SuppressWarnings("unchecked")
1485-
private static PlayFabResult<GetUserCombinedInfoResult> privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception {
1486-
if (_authKey == null) throw new Exception ("Must be logged in to call this method");
1487-
1488-
FutureTask<Object> task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetUserCombinedInfo", request, "X-Authorization", _authKey);
1489-
task.run();
1490-
Object httpResult = task.get();
1491-
if(httpResult instanceof PlayFabError) {
1492-
PlayFabError error = (PlayFabError)httpResult;
1493-
if (PlayFabSettings.GlobalErrorHandler != null)
1494-
PlayFabSettings.GlobalErrorHandler.callback(error);
1495-
PlayFabResult result = new PlayFabResult<GetUserCombinedInfoResult>();
1496-
result.Error = error;
1497-
return result;
1498-
}
1499-
String resultRawJson = (String) httpResult;
1500-
1501-
PlayFabJsonSuccess<GetUserCombinedInfoResult> resultData = gson.fromJson(resultRawJson, new TypeToken<PlayFabJsonSuccess<GetUserCombinedInfoResult>>(){}.getType());
1502-
GetUserCombinedInfoResult result = resultData.data;
1503-
1504-
PlayFabResult<GetUserCombinedInfoResult> pfResult = new PlayFabResult<GetUserCombinedInfoResult>();
1505-
pfResult.Result = result;
1506-
return pfResult;
1507-
}
1508-
15091448
/**
15101449
* Links the Android device identifier to the user's PlayFab account
15111450
*/

‎AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java‎

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ public static class GetPlayerCombinedInfoRequestParams {
13581358
*/
13591359
public Boolean GetUserData;
13601360
/**
1361-
* Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false
1361+
* Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false
13621362
*/
13631363
public ArrayList<String> UserDataKeys;
13641364
/**
@@ -1862,103 +1862,6 @@ public static class GetTradeStatusResponse {
18621862

18631863
}
18641864

1865-
/**
1866-
* @deprecated Do not use
1867-
*/
1868-
@Deprecated
1869-
public static class GetUserCombinedInfoRequest {
1870-
/**
1871-
* Unique PlayFab identifier of the user whose info is being requested. Optional, defaults to the authenticated user if no other lookup identifier set.
1872-
*/
1873-
public String PlayFabId;
1874-
/**
1875-
* PlayFab Username for the account to find (if no PlayFabId is specified).
1876-
*/
1877-
public String Username;
1878-
/**
1879-
* User email address for the account to find (if no Username is specified).
1880-
*/
1881-
public String Email;
1882-
/**
1883-
* Title-specific username for the account to find (if no Email is set).
1884-
*/
1885-
public String TitleDisplayName;
1886-
/**
1887-
* If set to false, account info will not be returned. Defaults to true.
1888-
*/
1889-
public Boolean GetAccountInfo;
1890-
/**
1891-
* If set to false, inventory will not be returned. Defaults to true. Inventory will never be returned for users other than yourself.
1892-
*/
1893-
public Boolean GetInventory;
1894-
/**
1895-
* 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.
1896-
*/
1897-
public Boolean GetVirtualCurrency;
1898-
/**
1899-
* If set to false, custom user data will not be returned. Defaults to true.
1900-
*/
1901-
public Boolean GetUserData;
1902-
/**
1903-
* 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.
1904-
*/
1905-
public ArrayList<String> UserDataKeys;
1906-
/**
1907-
* If set to false, read-only user data will not be returned. Defaults to true.
1908-
*/
1909-
public Boolean GetReadOnlyData;
1910-
/**
1911-
* 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.
1912-
*/
1913-
public ArrayList<String> ReadOnlyDataKeys;
1914-
1915-
}
1916-
1917-
/**
1918-
* @deprecated Do not use
1919-
*/
1920-
@Deprecated
1921-
public static class GetUserCombinedInfoResult {
1922-
/**
1923-
* Unique PlayFab identifier of the owner of the combined info.
1924-
*/
1925-
public String PlayFabId;
1926-
/**
1927-
* Account information for the user.
1928-
*/
1929-
public UserAccountInfo AccountInfo;
1930-
/**
1931-
* Array of inventory items in the user's current inventory.
1932-
*/
1933-
@Unordered("ItemInstanceId")
1934-
public ArrayList<ItemInstance> Inventory;
1935-
/**
1936-
* Array of virtual currency balance(s) belonging to the user.
1937-
*/
1938-
public Map<String,Integer> VirtualCurrency;
1939-
/**
1940-
* Array of remaining times and timestamps for virtual currencies.
1941-
*/
1942-
public Map<String,VirtualCurrencyRechargeTime> VirtualCurrencyRechargeTimes;
1943-
/**
1944-
* User specific custom data.
1945-
*/
1946-
public Map<String,UserDataRecord> Data;
1947-
/**
1948-
* The version of the UserData that was returned.
1949-
*/
1950-
public Long DataVersion;
1951-
/**
1952-
* User specific read-only data.
1953-
*/
1954-
public Map<String,UserDataRecord> ReadOnlyData;
1955-
/**
1956-
* The version of the Read-Only UserData that was returned.
1957-
*/
1958-
public Long ReadOnlyDataVersion;
1959-
1960-
}
1961-
19621865
public static class GetUserDataRequest {
19631866
/**
19641867
* Specific keys to search for in the custom data. Leave null to get all keys.

‎AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ public static enum PlayFabErrorCode {
263263
LimitNotAnUpgradeOption(1259),
264264
NoSecretKeyEnabledForCloudScript(1260),
265265
TaskNotFound(1261),
266-
TaskInstanceNotFound(1262);
266+
TaskInstanceNotFound(1262),
267+
InvalidIdentityProviderId(1263),
268+
MisconfiguredIdentityProvider(1264),
269+
InvalidScheduledTaskType(1265);
267270

268271
public int id;
269272

‎AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.playfab.PlayFabErrors.ErrorCallback;
55

66
public class PlayFabSettings {
7-
public static String SdkVersion = "0.41.161121";
7+
public static String SdkVersion = "0.42.170102";
88
public static String BuildIdentifier = "jbuild_javasdk_1";
9-
public static String SdkVersionString = "JavaSDK-0.41.161121";
9+
public static String SdkVersionString = "JavaSDK-0.42.170102";
1010

1111
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)
1212
public static ErrorCallback GlobalErrorHandler;

‎PlayFabClientSDK/src/com/playfab/PlayFabClientAPI.java‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,67 +1444,6 @@ private static PlayFabResult<GetPlayFabIDsFromTwitchIDsResult> privateGetPlayFab
14441444
return pfResult;
14451445
}
14461446

1447-
/**
1448-
* @deprecated Please use GetPlayerCombinedInfo instead.
1449-
*/
1450-
@Deprecated
1451-
@SuppressWarnings("unchecked")
1452-
public static FutureTask<PlayFabResult<GetUserCombinedInfoResult>> GetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) {
1453-
return new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
1454-
public PlayFabResult<GetUserCombinedInfoResult> call() throws Exception {
1455-
return privateGetUserCombinedInfoAsync(request);
1456-
}
1457-
});
1458-
}
1459-
1460-
/**
1461-
* @deprecated Please use GetPlayerCombinedInfo instead.
1462-
*/
1463-
@Deprecated
1464-
@SuppressWarnings("unchecked")
1465-
public static PlayFabResult<GetUserCombinedInfoResult> GetUserCombinedInfo(final GetUserCombinedInfoRequest request) {
1466-
FutureTask<PlayFabResult<GetUserCombinedInfoResult>> task = new FutureTask(new Callable<PlayFabResult<GetUserCombinedInfoResult>>() {
1467-
public PlayFabResult<GetUserCombinedInfoResult> call() throws Exception {
1468-
return privateGetUserCombinedInfoAsync(request);
1469-
}
1470-
});
1471-
try {
1472-
task.run();
1473-
return task.get();
1474-
} catch(Exception e) {
1475-
return null;
1476-
}
1477-
}
1478-
1479-
/**
1480-
* @deprecated Please use GetPlayerCombinedInfo instead.
1481-
*/
1482-
@Deprecated
1483-
@SuppressWarnings("unchecked")
1484-
private static PlayFabResult<GetUserCombinedInfoResult> privateGetUserCombinedInfoAsync(final GetUserCombinedInfoRequest request) throws Exception {
1485-
if (_authKey == null) throw new Exception ("Must be logged in to call this method");
1486-
1487-
FutureTask<Object> task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Client/GetUserCombinedInfo", request, "X-Authorization", _authKey);
1488-
task.run();
1489-
Object httpResult = task.get();
1490-
if(httpResult instanceof PlayFabError) {
1491-
PlayFabError error = (PlayFabError)httpResult;
1492-
if (PlayFabSettings.GlobalErrorHandler != null)
1493-
PlayFabSettings.GlobalErrorHandler.callback(error);
1494-
PlayFabResult result = new PlayFabResult<GetUserCombinedInfoResult>();
1495-
result.Error = error;
1496-
return result;
1497-
}
1498-
String resultRawJson = (String) httpResult;
1499-
1500-
PlayFabJsonSuccess<GetUserCombinedInfoResult> resultData = gson.fromJson(resultRawJson, new TypeToken<PlayFabJsonSuccess<GetUserCombinedInfoResult>>(){}.getType());
1501-
GetUserCombinedInfoResult result = resultData.data;
1502-
1503-
PlayFabResult<GetUserCombinedInfoResult> pfResult = new PlayFabResult<GetUserCombinedInfoResult>();
1504-
pfResult.Result = result;
1505-
return pfResult;
1506-
}
1507-
15081447
/**
15091448
* Links the Android device identifier to the user's PlayFab account
15101449
*/

‎PlayFabClientSDK/src/com/playfab/PlayFabClientModels.java‎

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ public static class GetPlayerCombinedInfoRequestParams {
13581358
*/
13591359
public Boolean GetUserData;
13601360
/**
1361-
* Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if UserDataKeys is false
1361+
* Specific keys to search for in the custom data. Leave null to get all keys. Has no effect if GetUserData is false
13621362
*/
13631363
public ArrayList<String> UserDataKeys;
13641364
/**
@@ -1862,103 +1862,6 @@ public static class GetTradeStatusResponse {
18621862

18631863
}
18641864

1865-
/**
1866-
* @deprecated Do not use
1867-
*/
1868-
@Deprecated
1869-
public static class GetUserCombinedInfoRequest {
1870-
/**
1871-
* Unique PlayFab identifier of the user whose info is being requested. Optional, defaults to the authenticated user if no other lookup identifier set.
1872-
*/
1873-
public String PlayFabId;
1874-
/**
1875-
* PlayFab Username for the account to find (if no PlayFabId is specified).
1876-
*/
1877-
public String Username;
1878-
/**
1879-
* User email address for the account to find (if no Username is specified).
1880-
*/
1881-
public String Email;
1882-
/**
1883-
* Title-specific username for the account to find (if no Email is set).
1884-
*/
1885-
public String TitleDisplayName;
1886-
/**
1887-
* If set to false, account info will not be returned. Defaults to true.
1888-
*/
1889-
public Boolean GetAccountInfo;
1890-
/**
1891-
* If set to false, inventory will not be returned. Defaults to true. Inventory will never be returned for users other than yourself.
1892-
*/
1893-
public Boolean GetInventory;
1894-
/**
1895-
* 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.
1896-
*/
1897-
public Boolean GetVirtualCurrency;
1898-
/**
1899-
* If set to false, custom user data will not be returned. Defaults to true.
1900-
*/
1901-
public Boolean GetUserData;
1902-
/**
1903-
* 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.
1904-
*/
1905-
public ArrayList<String> UserDataKeys;
1906-
/**
1907-
* If set to false, read-only user data will not be returned. Defaults to true.
1908-
*/
1909-
public Boolean GetReadOnlyData;
1910-
/**
1911-
* 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.
1912-
*/
1913-
public ArrayList<String> ReadOnlyDataKeys;
1914-
1915-
}
1916-
1917-
/**
1918-
* @deprecated Do not use
1919-
*/
1920-
@Deprecated
1921-
public static class GetUserCombinedInfoResult {
1922-
/**
1923-
* Unique PlayFab identifier of the owner of the combined info.
1924-
*/
1925-
public String PlayFabId;
1926-
/**
1927-
* Account information for the user.
1928-
*/
1929-
public UserAccountInfo AccountInfo;
1930-
/**
1931-
* Array of inventory items in the user's current inventory.
1932-
*/
1933-
@Unordered("ItemInstanceId")
1934-
public ArrayList<ItemInstance> Inventory;
1935-
/**
1936-
* Array of virtual currency balance(s) belonging to the user.
1937-
*/
1938-
public Map<String,Integer> VirtualCurrency;
1939-
/**
1940-
* Array of remaining times and timestamps for virtual currencies.
1941-
*/
1942-
public Map<String,VirtualCurrencyRechargeTime> VirtualCurrencyRechargeTimes;
1943-
/**
1944-
* User specific custom data.
1945-
*/
1946-
public Map<String,UserDataRecord> Data;
1947-
/**
1948-
* The version of the UserData that was returned.
1949-
*/
1950-
public Long DataVersion;
1951-
/**
1952-
* User specific read-only data.
1953-
*/
1954-
public Map<String,UserDataRecord> ReadOnlyData;
1955-
/**
1956-
* The version of the Read-Only UserData that was returned.
1957-
*/
1958-
public Long ReadOnlyDataVersion;
1959-
1960-
}
1961-
19621865
public static class GetUserDataRequest {
19631866
/**
19641867
* Specific keys to search for in the custom data. Leave null to get all keys.

‎PlayFabClientSDK/src/com/playfab/PlayFabErrors.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ public static enum PlayFabErrorCode {
263263
LimitNotAnUpgradeOption(1259),
264264
NoSecretKeyEnabledForCloudScript(1260),
265265
TaskNotFound(1261),
266-
TaskInstanceNotFound(1262);
266+
TaskInstanceNotFound(1262),
267+
InvalidIdentityProviderId(1263),
268+
MisconfiguredIdentityProvider(1264),
269+
InvalidScheduledTaskType(1265);
267270

268271
public int id;
269272

0 commit comments

Comments
 (0)