Swap parameters of RequestPermissions API.

PiperOrigin-RevId: 289901802 Change-Id: Id050a14831d04ce167b3e3599649c0d16c2f5e97
playgameservices · Jan 15, 2020 · 1c2d294 · 1c2d294
1 parent b1357da
commit 1c2d294
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 18 deletions.
diff --git a/samples/SmokeTest/Source/Assets/SmokeTest/MainGui.cs b/samples/SmokeTest/Source/Assets/SmokeTest/MainGui.cs
@@ -968,9 +968,7 @@ private void ShowPermissionsUi()
             else if (GUI.Button(CalcGrid(1, 1), "Request Permission- Email"))
             {
                 Status = "Asking permission for email";
-                PlayGamesPlatform.Instance.RequestPermission(
-                    code => { Status = "Result code " + code; },
-                    "email");
+                PlayGamesPlatform.Instance.RequestPermission("email", code => { Status = "Result code " + code; });
             }
             else if (GUI.Button(CalcGrid(1, 6), "Back"))
             {

diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/DummyClient.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/DummyClient.cs
@@ -374,9 +374,9 @@ public void SubmitScore(
         }
 
         /// <summary>Asks user to give permissions for the given scopes.</summary>
-        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
         /// <param name="scopes">Scope to ask permission for</param>
-        public void RequestPermissions(Action<SignInStatus> callback, string[] scopes)
+        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
+        public void RequestPermissions(string[] scopes, Action<SignInStatus> callback)
         {
             LogUsage();
             if (callback != null)

diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/IPlayGamesClient.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/IPlayGamesClient.cs
@@ -307,9 +307,9 @@ void SubmitScore(string leaderboardId, long score, string metadata,
         /// <summary>
         /// Asks user to give permissions for the given scopes.
         /// </summary>
-        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
         /// <param name="scopes">list of scopes to ask permission for</param>
-        void RequestPermissions(Action<SignInStatus> callback, string[] scopes);
+        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
+        void RequestPermissions(string[] scopes, Action<SignInStatus> callback);
 
         /// <summary>
         /// Returns whether or not user has given permissions for given scopes

diff --git a/source/PluginDev/Assets/GooglePlayGames/ISocialPlatform/PlayGamesPlatform.cs b/source/PluginDev/Assets/GooglePlayGames/ISocialPlatform/PlayGamesPlatform.cs
@@ -1398,17 +1398,17 @@ public void LoadScores(ILeaderboard board, Action<bool> callback)
         }
 
         /// <summary>Asks user to give permissions for the given scopes.</summary>
-        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
         /// <param name="scopes">Scope to ask permission for</param>
-        public void RequestPermission(Action<SignInStatus> callback, string scope)
+        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
+        public void RequestPermission(string scope, Action<SignInStatus> callback)
         {
-            RequestPermissions(callback, new string[] {scope});
+            RequestPermissions(new string[] {scope}, callback);
         }
 
         /// <summary>Asks user to give permissions for the given scopes.</summary>
-        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
         /// <param name="scopes">List of scopes to ask permission for</param>
-        public void RequestPermissions(Action<SignInStatus> callback, string[] scopes)
+        /// <param name="callback">Callback used to indicate the outcome of the operation.</param>
+        public void RequestPermissions(string[] scopes, Action<SignInStatus> callback)
         {
             if (!IsAuthenticated())
             {
@@ -1418,7 +1418,7 @@ public void RequestPermissions(Action<SignInStatus> callback, string[] scopes)
                 return;
             }
 
-            mClient.RequestPermissions(callback, scopes);
+            mClient.RequestPermissions(scopes, callback);
         }
 
         /// <summary>Returns whether or not user has given permissions for given scopes.</summary>

diff --git a/source/PluginDev/Assets/GooglePlayGames/Platforms/Android/AndroidClient.cs b/source/PluginDev/Assets/GooglePlayGames/Platforms/Android/AndroidClient.cs
@@ -1020,14 +1020,14 @@ public void SubmitScore(string leaderboardId, long score, string metadata,
             }
         }
 
-        public void RequestPermissions(Action<SignInStatus> callback, string[] scopes)
+        public void RequestPermissions(string[] scopes, Action<SignInStatus> callback)
         {
             callback = AsOnGameThreadCallback(callback);
-            mTokenClient.RequestPermissions((code =>
+            mTokenClient.RequestPermissions(scopes, code =>
             {
                 UpdateClients();
                 callback(code);
-            }), scopes);
+            });
         }
 
         private void UpdateClients()

diff --git a/source/PluginDev/Assets/GooglePlayGames/Platforms/Android/AndroidTokenClient.cs b/source/PluginDev/Assets/GooglePlayGames/Platforms/Android/AndroidTokenClient.cs
@@ -133,7 +133,7 @@ public void FetchTokens(bool silent, Action<int> callback)
             PlayGamesHelperObject.RunOnGameThread(() => DoFetchToken(silent, callback));
         }
 
-        public void RequestPermissions(Action<SignInStatus> callback, string[] scopes)
+        public void RequestPermissions(string[] scopes, Action<SignInStatus> callback)
         {
             using (var bridgeClass = new AndroidJavaClass(HelperFragmentClass))
             using (var currentActivity = AndroidHelperFragment.GetActivity())

diff --git a/source/PluginDev/Assets/GooglePlayGames/Platforms/TokenClient.cs b/source/PluginDev/Assets/GooglePlayGames/Platforms/TokenClient.cs
@@ -69,7 +69,7 @@ void GetAnotherServerAuthCode(bool reAuthenticateIfNeeded,
 
         void FetchTokens(bool silent, Action<int> callback);
 
-        void RequestPermissions(Action<SignInStatus> callback, string[] scopes);
+        void RequestPermissions(string[] scopes, Action<SignInStatus> callback);
 
         bool HasPermissions(string[] scopes);
     }