Merge remote-tracking branch 'matiosfree/playgameservices#2674-LoadSc…

…ores' # Conflicts: # Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidClient.cs
DmiShib · Jun 6, 2024 · e884911 · e884911
2 parents 97139db + d2ec4d6
commit e884911
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/BasicApi/DummyClient.cs b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/BasicApi/DummyClient.cs
@@ -218,7 +218,8 @@ public void LoadScores(
             int rowCount,
             LeaderboardCollection collection,
             LeaderboardTimeSpan timeSpan,
-            Action<LeaderboardScoreData> callback)
+            Action<LeaderboardScoreData> callback,
+            bool forceReload = false)
         {
             LogUsage();
             if (callback != null)

diff --git a/...Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/BasicApi/IPlayGamesClient.cs b/...Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/BasicApi/IPlayGamesClient.cs
@@ -298,9 +298,14 @@ void ShowLeaderboardUI(string leaderboardId, LeaderboardTimeSpan span,
       /// <param name="timeSpan">leaderboard timespan</param>
       /// <param name="callback">callback with the scores, and a page token.
       ///   The token can be used to load next/prev pages.</param>
+      /// <param name="forceReload">
+      /// If true, this call will clear any locally cached data and attempt to
+      /// fetch the latest data from the server. This would commonly be used for something like a
+      /// user-initiated refresh. Normally, this should be set to {@code false} to gain advantages
+      /// of data caching.</param>
       void LoadScores(string leaderboardId, LeaderboardStart start, int rowCount,
                       LeaderboardCollection collection, LeaderboardTimeSpan timeSpan,
-                      Action<LeaderboardScoreData> callback);
+                      Action<LeaderboardScoreData> callback, bool forceReload = false);
 
       /// <summary>
       /// Loads the more scores for the leaderboard.

diff --git a/...ooglePlayGames/com.google.play.games/Runtime/Scripts/ISocialPlatform/PlayGamesPlatform.cs b/...ooglePlayGames/com.google.play.games/Runtime/Scripts/ISocialPlatform/PlayGamesPlatform.cs
@@ -858,13 +858,17 @@ public void LoadScores(string leaderboardId, Action<IScore[]> callback)
         /// <param name="collection">Collection. social or public</param>
         /// <param name="timeSpan">Time span. daily, weekly, all-time</param>
         /// <param name="callback">Callback to invoke when completed.</param>
+        /// <param name="forceReload">If true, this call will clear any locally cached data and
+        /// attempt to fetch the latest data from the server. Normally, this should be set to {@code
+        /// false} to gain advantages of data caching.</param>
         public void LoadScores(
             string leaderboardId,
             LeaderboardStart start,
             int rowCount,
             LeaderboardCollection collection,
             LeaderboardTimeSpan timeSpan,
-            Action<LeaderboardScoreData> callback)
+            Action<LeaderboardScoreData> callback,
+            bool forceReload = false)
         {
             if (!IsAuthenticated())
             {
@@ -881,7 +885,8 @@ public void LoadScores(
                 rowCount,
                 collection,
                 timeSpan,
-                callback);
+                callback,
+                forceReload);
         }
 
         /// <summary>

diff --git a/.../GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidClient.cs b/.../GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidClient.cs
@@ -759,7 +759,9 @@ public void ShowLeaderboardUI(string leaderboardId, LeaderboardTimeSpan span, Ac
 
         public void LoadScores(string leaderboardId, LeaderboardStart start,
             int rowCount, LeaderboardCollection collection,
-            LeaderboardTimeSpan timeSpan, Action<LeaderboardScoreData> callback)
+            LeaderboardTimeSpan timeSpan,
+            Action<LeaderboardScoreData> callback,
+            bool forceReload = false)
         {
             using (var client = getLeaderboardsClient())
             {
@@ -770,7 +772,8 @@ public void LoadScores(string leaderboardId, LeaderboardStart start,
                     leaderboardId,
                     AndroidJavaConverter.ToLeaderboardVariantTimeSpan(timeSpan),
                     AndroidJavaConverter.ToLeaderboardVariantCollection(collection),
-                    rowCount))
+                    rowCount,
+                    forceReload))
                 {
                     AndroidTaskUtils.AddOnSuccessListener<AndroidJavaObject>(
                         task,