Merge pull request #36 from PlayFab/master

Weekly SDK Publish

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

@@ -126,6 +126,22 @@ public static class AndroidDevicePushNotificationRegistrationResult {
 
     }
 
+    public static class AttributeInstallRequest {
+        /**
+         * The IdentifierForAdvertisers for iOS Devices.
+         */
+        public String Idfa;
+        /**
+         * The Android Id for this Android device.
+         */
+        public String Android_Id;
+
+    }
+
+    public static class AttributeInstallResult {
+
+    }
+
     public static class CancelTradeRequest {
         /**
          * Trade identifier.
@@ -210,7 +226,7 @@ public static class CatalogItem implements Comparable<CatalogItem> {
          * list of item tags
          */
         @Unordered
-		public ArrayList<String> Tags;
+        public ArrayList<String> Tags;
         /**
          * game specific custom data
          */
@@ -257,12 +273,12 @@ public static class CatalogItemBundleInfo {
          * unique ItemId values for all items which will be added to the player inventory when the bundle is added
          */
         @Unordered
-		public ArrayList<String> BundledItems;
+        public ArrayList<String> BundledItems;
         /**
          * unique TableId values for all RandomResultTable objects which are part of the bundle (random tables will be resolved and add the relevant items to the player inventory when the bundle is added)
          */
         @Unordered
-		public ArrayList<String> BundledResultTables;
+        public ArrayList<String> BundledResultTables;
         /**
          * virtual currency types and balances which will be added to the player inventory when the bundle is added
          */
@@ -297,12 +313,12 @@ public static class CatalogItemContainerInfo {
          * unique ItemId values for all items which will be added to the player inventory, once the container has been unlocked
          */
         @Unordered
-		public ArrayList<String> ItemContents;
+        public ArrayList<String> ItemContents;
         /**
          * unique TableId values for all RandomResultTable objects which are part of the container (once unlocked, random tables will be resolved and add the relevant items to the player inventory)
          */
         @Unordered
-		public ArrayList<String> ResultTableContents;
+        public ArrayList<String> ResultTableContents;
         /**
          * virtual currency types and balances which will be added to the player inventory when the container is unlocked
          */
@@ -418,7 +434,7 @@ public static class ConsumePSNEntitlementsResult {
          * Array of items granted to the player as a result of consuming entitlements.
          */
         @Unordered("ItemInstanceId")
-		public ArrayList<ItemInstance> ItemsGranted;
+        public ArrayList<ItemInstance> ItemsGranted;
 
     }
 
@@ -804,7 +820,7 @@ public static class GetCatalogItemsResult {
          * Array of inventory objects.
          */
         @Unordered("ItemId")
-		public ArrayList<CatalogItem> Catalog;
+        public ArrayList<CatalogItem> Catalog;
 
     }
 
@@ -873,7 +889,7 @@ public static class GetCharacterInventoryResult {
          * Array of inventory items belonging to the character.
          */
         @Unordered("ItemInstanceId")
-		public ArrayList<ItemInstance> Inventory;
+        public ArrayList<ItemInstance> Inventory;
         /**
          * Array of virtual currency balance(s) belonging to the character.
          */
@@ -1131,6 +1147,22 @@ public static class GetPhotonAuthenticationTokenResult {
 
     }
 
+    public static class GetPlayerStatisticsRequest {
+        /**
+         * statistics to return
+         */
+        public ArrayList<String> StatisticNames;
+
+    }
+
+    public static class GetPlayerStatisticsResult {
+        /**
+         * User statistics for the requested user.
+         */
+        public ArrayList<StatisticValue> Statistics;
+
+    }
+
     public static class GetPlayerTradesRequest {
         /**
          * Returns only trades with the given status. If null, returns all trades.
@@ -1326,7 +1358,7 @@ public static class GetStoreItemsResult {
          * Array of store items.
          */
         @Unordered("ItemId")
-		public ArrayList<StoreItem> Store;
+        public ArrayList<StoreItem> Store;
 
     }
 
@@ -1440,7 +1472,7 @@ public static class GetUserCombinedInfoResult {
          * Array of inventory items in the user's current inventory.
          */
         @Unordered("ItemInstanceId")
-		public ArrayList<ItemInstance> Inventory;
+        public ArrayList<ItemInstance> Inventory;
         /**
          * Array of virtual currency balance(s) belonging to the user.
          */
@@ -1505,7 +1537,7 @@ public static class GetUserInventoryResult {
          * Array of inventory items in the user's current inventory.
          */
         @Unordered("ItemInstanceId")
-		public ArrayList<ItemInstance> Inventory;
+        public ArrayList<ItemInstance> Inventory;
         /**
          * Array of virtual currency balance(s) belonging to the user.
          */
@@ -1799,6 +1831,18 @@ public static class LinkSteamAccountResult {
 
     }
 
+    public static class LinkXboxAccountRequest {
+        /**
+         * Token provided by the Xbox Live SDK/XDK method GetTokenAndSignatureAsync("POST", "https://playfabapi.com", "").
+         */
+        public String XboxToken;
+
+    }
+
+    public static class LinkXboxAccountResult {
+
+    }
+
     public static class ListUsersCharactersRequest {
         /**
          * Unique PlayFab assigned ID of the user on whom the operation will be performed.
@@ -2061,6 +2105,22 @@ public static class LoginWithSteamRequest {
 
     }
 
+    public static class LoginWithXboxRequest {
+        /**
+         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a title has been selected
+         */
+        public String TitleId;
+        /**
+         * Token provided by the Xbox Live SDK/XDK method GetTokenAndSignatureAsync("POST", "https://playfabapi.com", "").
+         */
+        public String XboxToken;
+        /**
+         * Automatically create a PlayFab account if one is not currently linked to this Xbox Live account.
+         */
+        public Boolean CreateAccount;
+
+    }
+
     public static class MatchmakeRequest {
         /**
          * build version to match against
@@ -2709,6 +2769,38 @@ public static class StartPurchaseResult {
 
     }
 
+    public static class StatisticUpdate {
+        /**
+         * unique name of the statistic
+         */
+        public String StatisticName;
+        /**
+         * for updates to an existing statistic value for a player, the version of the statistic when it was loaded. Null when setting the statistic value for the first time.
+         */
+        public String Version;
+        /**
+         * statistic value for the player
+         */
+        public Integer Value;
+
+    }
+
+    public static class StatisticValue {
+        /**
+         * unique name of the statistic
+         */
+        public String StatisticName;
+        /**
+         * statistic value for the player
+         */
+        public Integer Value;
+        /**
+         * for updates to an existing statistic value for a player, the version of the statistic when it was loaded
+         */
+        public String Version;
+
+    }
+
     public static class SteamPlayFabIdPair {
         /**
          * Unique Steam identifier for a user.
@@ -2919,6 +3011,18 @@ public static class UnlinkSteamAccountResult {
 
     }
 
+    public static class UnlinkXboxAccountRequest {
+        /**
+         * Token provided by the Xbox Live SDK/XDK method GetTokenAndSignatureAsync("POST", "https://playfabapi.com", "").
+         */
+        public String XboxToken;
+
+    }
+
+    public static class UnlinkXboxAccountResult {
+
+    }
+
     public static class UnlockContainerItemRequest {
         /**
          * Category ItemId of the container type to unlock.
@@ -2983,6 +3087,18 @@ public static class UpdateCharacterDataResult {
 
     }
 
+    public static class UpdatePlayerStatisticsRequest {
+        /**
+         * Statistics to be updated with the provided values
+         */
+        public ArrayList<StatisticUpdate> Statistics;
+
+    }
+
+    public static class UpdatePlayerStatisticsResult {
+
+    }
+
     public static class UpdateSharedGroupDataRequest {
         /**
          * Unique identifier for the shared group.
@@ -3163,6 +3279,9 @@ public static class UserPrivateAccountInfo {
     }
 
     public static class UserSettings {
+        /**
+         * Boolean for whether this player is eligible for ad tracking.
+         */
         public Boolean NeedsAttribution;
 
     }

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

@@ -193,7 +193,11 @@ public static enum PlayFabErrorCode {
         ExpiredXboxLiveToken(1189),
         ResettableStatisticVersionRequired(1190),
         NotAuthorizedByTitle(1191),
-        NoPartnerEnabled(1192);
+        NoPartnerEnabled(1192),
+        InvalidPartnerResponse(1193),
+        APINotEnabledForGameServerAccess(1194),
+        StatisticNotFound(1195),
+        StatisticNameConflict(1196);
 
         public int id;
 

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

@@ -3,11 +3,17 @@
 import com.playfab.PlayFabErrors.ErrorCallback;
 
 public class PlayFabSettings {
-
-    public static String TitleId = null;
+    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;
-    public static String LogicServerURL = null;
+    public static String LogicServerURL = null; // Assigned by GetCloudScriptUrl, used by RunCloudScript
+    public static String AdvertisingIdType = null; // Set this to the appropriate AD_TYPE_X constant below
+    public static String AdvertisingIdValue = null; // Set this to corresponding device value
 
+    // DisableAdvertising is provided for completeness, but changing it is not suggested
+    // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
+    public static Boolean DisableAdvertising = false;
+    public static final String AD_TYPE_IDFA = "Idfa";
+    public static final String AD_TYPE_ANDROID_ID = "Android_Id";
 
     public static String GetLogicURL() {
         return LogicServerURL;

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.10.151130";
+    public static String SdkRevision = "0.11.151210";
     public static String getVersionString() {
         return "JavaSDK-" + SdkRevision;
     }