Migrate to Android 13.2

Summary: Migrate Android SDK dependency to version 13.2.0 Reviewed By: Alaeldin513 Differential Revision: D36482392 fbshipit-source-id: 071a6a3b9b2119bc49e0ec4dcd95ad186d7600ff
facebook · Jun 6, 2022 · f05ad8b · f05ad8b
1 parent a23fe45
commit f05ad8b
Show file tree

Hide file tree

Showing 14 changed files with 145 additions and 375 deletions.
diff --git a/Facebook.Unity.Editor/android/ManifestMod.cs b/Facebook.Unity.Editor/android/ManifestMod.cs
@@ -38,8 +38,6 @@ public class ManifestMod
         public const string UnityDialogsActivityName = "com.facebook.unity.FBUnityDialogsActivity";
         public const string UnityGameRequestActivityName = "com.facebook.unity.FBUnityGameRequestActivity";
         public const string UnityGamingServicesFriendFinderActivityName = "com.facebook.unity.FBUnityGamingServicesFriendFinderActivity";
-        public const string UnityGameGroupCreateActivityName = "com.facebook.unity.FBUnityCreateGameGroupActivity";
-        public const string UnityGameGroupJoinActivityName = "com.facebook.unity.FBUnityJoinGameGroupActivity";
         public const string ApplicationIdMetaDataName = "com.facebook.sdk.ApplicationId";
         public const string AutoLogAppEventsEnabled = "com.facebook.sdk.AutoLogAppEventsEnabled";
         public const string AdvertiserIDCollectionEnabled = "com.facebook.sdk.AdvertiserIDCollectionEnabled";
@@ -156,8 +154,6 @@ public static void UpdateManifest(string fullPath)
 
             ManifestMod.AddSimpleActivity(doc, dict, ns, DeepLinkingActivityName, true);
             ManifestMod.AddSimpleActivity(doc, dict, ns, UnityGameRequestActivityName);
-            ManifestMod.AddSimpleActivity(doc, dict, ns, UnityGameGroupCreateActivityName);
-            ManifestMod.AddSimpleActivity(doc, dict, ns, UnityGameGroupJoinActivityName);
 
             // add the app id
             // <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="\ fb<APPID>" />

diff --git a/Facebook.Unity.Tests/Editor/MockEditor.cs b/Facebook.Unity.Tests/Editor/MockEditor.cs
@@ -58,22 +58,6 @@ public void ShowAppRequestMockDialog(
             callback(new ResultContainer(result));
         }
 
-        public void ShowGameGroupCreateMockDialog(
-            Utilities.Callback<ResultContainer> callback,
-            string callbackId)
-        {
-            var result = MockResults.GetGroupCreateResult(int.Parse(callbackId), this.ResultExtras);
-            callback(new ResultContainer(result));
-        }
-
-        public void ShowGameGroupJoinMockDialog(
-            Utilities.Callback<ResultContainer> callback,
-            string callbackId)
-        {
-            var result = MockResults.GetGenericResult(int.Parse(callbackId), this.ResultExtras);
-            callback(new ResultContainer(result));
-        }
-
         public void ShowPayMockDialog(
             Utilities.Callback<ResultContainer> callback,
             string callbackId)

diff --git a/Facebook.Unity.Tests/Mobile/Android/Init.cs b/Facebook.Unity.Tests/Mobile/Android/Init.cs
@@ -29,7 +29,7 @@ public class Init : Facebook.Unity.Tests.Init
     {
         protected override void CallInit(InitDelegate callback)
         {
-            ((AndroidFacebook)this.Mock.Facebook).Init("123456789", null, callback);
+            ((AndroidFacebook)this.Mock.Facebook).Init("123456789", "token", null, callback);
         }
     }
 }
diff --git a/Facebook.Unity/FB.cs b/Facebook.Unity/FB.cs
@@ -314,6 +314,7 @@ public static void Init(
                             {
                                 ((AndroidFacebook)FB.facebook).Init(
                                     appId,
+                                    clientToken,
                                     onHideUnity,
                                     onInitComplete);
                             };

diff --git a/Facebook.Unity/Mobile/Android/AndroidFacebook.cs b/Facebook.Unity/Mobile/Android/AndroidFacebook.cs
@@ -125,6 +125,7 @@ public override string SDKVersion
 
         public void Init(
             string appId,
+            string clientToken,
             HideUnityDelegate hideUnityDelegate,
             InitDelegate onInitComplete)
         {
@@ -139,6 +140,7 @@ public void Init(
 
             var args = new MethodArguments();
             args.AddString("appId", appId);
+            args.AddString("clientToken", clientToken);
             var initCall = new JavaMethodCall<IResult>(this, "Init");
             initCall.Call(args);
             this.userID = this.androidWrapper.CallStatic<string>("GetUserID");

diff --git a/Facebook.Unity/PlatformEditor/EditorWrapper.cs b/Facebook.Unity/PlatformEditor/EditorWrapper.cs
@@ -53,20 +53,6 @@ public void ShowAppRequestMockDialog(
             this.ShowEmptyMockDialog(callback, callbackId, "Mock App Request");
         }
 
-        public void ShowGameGroupCreateMockDialog(
-            Utilities.Callback<ResultContainer> callback,
-            string callbackId)
-        {
-            this.ShowEmptyMockDialog(callback, callbackId, "Mock Game Group Create");
-        }
-
-        public void ShowGameGroupJoinMockDialog(
-            Utilities.Callback<ResultContainer> callback,
-            string callbackId)
-        {
-            this.ShowEmptyMockDialog(callback, callbackId, "Mock Game Group Join");
-        }
-
         public void ShowPayMockDialog(
             Utilities.Callback<ResultContainer> callback,
             string callbackId)

diff --git a/Facebook.Unity/PlatformEditor/IEditorWrapper.cs b/Facebook.Unity/PlatformEditor/IEditorWrapper.cs
@@ -33,14 +33,6 @@ void ShowAppRequestMockDialog(
             Utilities.Callback<ResultContainer> callback,
             string callbackId);
 
-        void ShowGameGroupCreateMockDialog(
-            Utilities.Callback<ResultContainer> callback,
-            string callbackId);
-
-        void ShowGameGroupJoinMockDialog(
-            Utilities.Callback<ResultContainer> callback,
-            string callbackId);
-
         void ShowPayMockDialog(
             Utilities.Callback<ResultContainer> callback,
             string callbackId);