diff --git a/Facebook.Unity.Editor/android/ManifestMod.cs b/Facebook.Unity.Editor/android/ManifestMod.cs index ce6a4c86a..71310bd62 100644 --- 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 // diff --git a/Facebook.Unity.Tests/Editor/MockEditor.cs b/Facebook.Unity.Tests/Editor/MockEditor.cs index 3959649e1..dae916adc 100644 --- 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 callback, - string callbackId) - { - var result = MockResults.GetGroupCreateResult(int.Parse(callbackId), this.ResultExtras); - callback(new ResultContainer(result)); - } - - public void ShowGameGroupJoinMockDialog( - Utilities.Callback callback, - string callbackId) - { - var result = MockResults.GetGenericResult(int.Parse(callbackId), this.ResultExtras); - callback(new ResultContainer(result)); - } - public void ShowPayMockDialog( Utilities.Callback callback, string callbackId) diff --git a/Facebook.Unity.Tests/Mobile/Android/Init.cs b/Facebook.Unity.Tests/Mobile/Android/Init.cs index ef1f86ea5..d1b593d49 100644 --- 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 index 75462803a..9cd43c6be 100644 --- 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 index fa301ae6e..1b61a9fbd 100644 --- 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(this, "Init"); initCall.Call(args); this.userID = this.androidWrapper.CallStatic("GetUserID"); diff --git a/Facebook.Unity/PlatformEditor/EditorWrapper.cs b/Facebook.Unity/PlatformEditor/EditorWrapper.cs index 5b0d2cadd..5b10b9c60 100644 --- 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 callback, - string callbackId) - { - this.ShowEmptyMockDialog(callback, callbackId, "Mock Game Group Create"); - } - - public void ShowGameGroupJoinMockDialog( - Utilities.Callback callback, - string callbackId) - { - this.ShowEmptyMockDialog(callback, callbackId, "Mock Game Group Join"); - } - public void ShowPayMockDialog( Utilities.Callback callback, string callbackId) diff --git a/Facebook.Unity/PlatformEditor/IEditorWrapper.cs b/Facebook.Unity/PlatformEditor/IEditorWrapper.cs index fb63d190b..a2e5378b1 100644 --- a/Facebook.Unity/PlatformEditor/IEditorWrapper.cs +++ b/Facebook.Unity/PlatformEditor/IEditorWrapper.cs @@ -33,14 +33,6 @@ void ShowAppRequestMockDialog( Utilities.Callback callback, string callbackId); - void ShowGameGroupCreateMockDialog( - Utilities.Callback callback, - string callbackId); - - void ShowGameGroupJoinMockDialog( - Utilities.Callback callback, - string callbackId); - void ShowPayMockDialog( Utilities.Callback callback, string callbackId); diff --git a/UnitySDK/ProjectSettings/ProjectSettings.asset b/UnitySDK/ProjectSettings/ProjectSettings.asset index d2523e3d6..a7027c02c 100644 --- a/UnitySDK/ProjectSettings/ProjectSettings.asset +++ b/UnitySDK/ProjectSettings/ProjectSettings.asset @@ -150,9 +150,9 @@ PlayerSettings: iOS: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 16 - AndroidTargetSdkVersion: 0 + AndroidTargetSdkVersion: 29 AndroidPreferredInstallLocation: 1 - aotOptions: + aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 @@ -205,7 +205,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -213,7 +213,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreeniPadCustomXibPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -221,15 +221,15 @@ PlayerSettings: metalEditorSupport: 0 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: appleEnableAutomaticSigning: 0 AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: + AndroidKeyaliasName: AndroidTVCompatibility: 0 AndroidIsGame: 1 androidEnableBanner: 1 @@ -240,7 +240,7 @@ PlayerSettings: androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - - m_BuildTarget: + - m_BuildTarget: m_Icons: - serializedVersion: 2 m_Icon: {fileID: 0} @@ -325,53 +325,53 @@ PlayerSettings: wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} wiiUDrcBufferDisabled: 0 - wiiUProfilerLibPath: + wiiUProfilerLibPath: playModeTestRunnerEnabled: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - switchNetLibKey: + cameraUsageDescription: + locationUsageDescription: + microphoneUsageDescription: + switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchApplicationID: 0x0005000C10000001 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: + switchNSODependencies: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -402,9 +402,9 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: switchMainThreadStackSize: 1048576 switchPresenceGroupId: 0x0005000C10000001 switchLogoHandling: 0 @@ -414,7 +414,7 @@ PlayerSettings: switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 - switchApplicationErrorCodeCategory: + switchApplicationErrorCodeCategory: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 switchApplicationAttribute: 0 @@ -434,13 +434,13 @@ PlayerSettings: switchRatingsInt_10: 0 switchRatingsInt_11: 0 switchLocalCommunicationIds_0: 0x0005000C10000001 - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 switchAllowsVideoCapturing: 1 @@ -458,32 +458,32 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 1 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 120 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 @@ -508,9 +508,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -522,37 +522,37 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] - monoEnv: + monoEnv: psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: + psp2NPTrophyPackPath: psp2NPSupportGBMorGJP: 0 psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: + psp2NPTitleDatPath: + psp2NPCommsID: + psp2NPCommunicationsID: + psp2NPCommsPassphrase: + psp2NPCommsSig: + psp2ParamSfxPath: + psp2ManualPath: + psp2LiveAreaGatePath: + psp2LiveAreaBackroundPath: + psp2LiveAreaPath: + psp2LiveAreaTrialPath: + psp2PatchChangeInfoPath: + psp2PatchOriginalPackage: psp2PackagePassword: WRK5RhRXdCdG5nG5azdNMK66MuCV6GXi - psp2KeystoneFile: + psp2KeystoneFile: psp2MemoryExpansionMode: 0 psp2DRMType: 0 psp2StorageType: 0 psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: + psp2DLCConfigPath: + psp2ThumbnailPath: + psp2BackgroundPath: + psp2SoundPath: + psp2TrophyCommId: + psp2TrophyPackagePath: + psp2PackagedResourcesPath: psp2SaveDataQuota: 10240 psp2ParentalLevel: 1 psp2ShortTitle: Not Set @@ -573,14 +573,14 @@ PlayerSettings: psmSplashimage: {fileID: 0} splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} - spritePackerPolicy: + spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 0 webGLNameFilesAsHashes: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -599,21 +599,21 @@ PlayerSettings: incrementalIl2cppBuild: iOS: 0 tvOS: 0 - additionalIl2CppArgs: + additionalIl2CppArgs: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: SDKPackage - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: SDKPackage wsaImages: {} - metroTileShortName: - metroCommandLineArgsFile: + metroTileShortName: + metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -624,16 +624,16 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: + metroProtocolName: metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: + tizenProductDescription: + tizenProductURL: + tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 - tizenDeploymentTarget: + tizenDeploymentTarget: tizenDeploymentTargetType: -131587 tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 @@ -645,26 +645,26 @@ PlayerSettings: n3dsMediaSize: 0 n3dsLogoStyle: 3 n3dsTitle: GameName - n3dsProductCode: + n3dsProductCode: n3dsApplicationId: 0xFF3FF - stvDeviceAddress: - stvProductDescription: - stvProductAuthor: - stvProductAuthorEmail: - stvProductLink: + stvDeviceAddress: + stvProductDescription: + stvProductAuthor: + stvProductAuthorEmail: + stvProductLink: stvProductCategory: 0 - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: [] @@ -692,8 +692,8 @@ PlayerSettings: Unity_Ads: 0 facebookSdkVersion: pluginIncompatible apiCompatibilityLevel: 2 - cloudProjectId: - projectName: - organizationId: + cloudProjectId: + projectName: + organizationId: cloudEnabled: 0 enableNewInputSystem: 0 diff --git a/facebook-android-wrapper/build.gradle b/facebook-android-wrapper/build.gradle index c1170268b..5f08197da 100644 --- a/facebook-android-wrapper/build.gradle +++ b/facebook-android-wrapper/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' allprojects { gradle.projectsEvaluated { @@ -19,10 +20,11 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10" } } -def fbSdkVersion = project.hasProperty("sdkVersion") ? sdkVersion : '12.1.0' +def fbSdkVersion = project.hasProperty("sdkVersion") ? sdkVersion : '13.2.0' repositories { mavenCentral() @@ -34,7 +36,7 @@ repositories { } dependencies { - implementation 'com.facebook.android:facebook-android-sdk:[12.1.0, 13)' + implementation 'com.facebook.android:facebook-android-sdk:[13.2.0, 14)' // enable local testing if (project.hasProperty("localRepo")) { diff --git a/facebook-android-wrapper/src/com/facebook/unity/FB.java b/facebook-android-wrapper/src/com/facebook/unity/FB.java index 040dd9940..d53b97fc0 100644 --- a/facebook-android-wrapper/src/com/facebook/unity/FB.java +++ b/facebook-android-wrapper/src/com/facebook/unity/FB.java @@ -98,7 +98,7 @@ public static void Init(final String params_str) { } else { appID = Utility.getMetadataApplicationId(getUnityActivity()); } - + FacebookSdk.setClientToken(unity_params.getString("clientToken")); FacebookSdk.setApplicationId(appID); FacebookSdk.sdkInitialize(FB.getUnityActivity(), new FacebookSdk.InitializeCallback() { @Override @@ -221,26 +221,6 @@ public static void AppRequest(String params_str) { getUnityActivity().startActivity(intent); } - @UnityCallable - public static void GameGroupCreate(String params_str) { - Log.v(TAG, "GameGroupCreate(" + params_str + ")"); - final UnityParams unity_params = UnityParams.parse(params_str); - final Bundle params = unity_params.getStringParams(); - Intent intent = new Intent(getUnityActivity(), FBUnityCreateGameGroupActivity.class); - intent.putExtra(FBUnityCreateGameGroupActivity.CREATE_GAME_GROUP_PARAMS, params); - getUnityActivity().startActivity(intent); - } - - @UnityCallable - public static void GameGroupJoin(String params_str) { - Log.v(TAG, "GameGroupJoin(" + params_str + ")"); - final UnityParams unity_params = UnityParams.parse(params_str); - final Bundle params = unity_params.getStringParams(); - Intent intent = new Intent(getUnityActivity(), FBUnityJoinGameGroupActivity.class); - intent.putExtra(FBUnityJoinGameGroupActivity.JOIN_GAME_GROUP_PARAMS, params); - getUnityActivity().startActivity(intent); - } - @UnityCallable public static void ShareLink(String params_str) { Log.v(TAG, "ShareLink(" + params_str + ")"); diff --git a/facebook-android-wrapper/src/com/facebook/unity/FBDialogUtils.java b/facebook-android-wrapper/src/com/facebook/unity/FBDialogUtils.java index 46c206f0f..06dafcddd 100644 --- a/facebook-android-wrapper/src/com/facebook/unity/FBDialogUtils.java +++ b/facebook-android-wrapper/src/com/facebook/unity/FBDialogUtils.java @@ -32,21 +32,13 @@ public static ShareLinkContent.Builder createShareContentBuilder(Bundle params) ShareLinkContent.Builder builder = new ShareLinkContent.Builder(); if (params.containsKey("content_title")) { - builder.setContentTitle(params.getString("content_title")); - } - - if (params.containsKey("content_description")) { - builder.setContentDescription(params.getString("content_description")); + builder.setQuote(params.getString("content_title")); } if (params.containsKey("content_url")) { builder.setContentUrl(Uri.parse(params.getString("content_url"))); } - if (params.containsKey("photo_url")) { - builder.setImageUrl(Uri.parse(params.getString("photo_url"))); - } - return builder; } diff --git a/facebook-android-wrapper/src/com/facebook/unity/FBUnityCreateGameGroupActivity.java b/facebook-android-wrapper/src/com/facebook/unity/FBUnityCreateGameGroupActivity.java deleted file mode 100644 index c3291b496..000000000 --- a/facebook-android-wrapper/src/com/facebook/unity/FBUnityCreateGameGroupActivity.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright (c) 2014-present, Facebook, Inc. All rights reserved. - * - * You are hereby granted a non-exclusive, worldwide, royalty-free license to use, - * copy, modify, and distribute this software in source code or binary form for use - * in connection with the web services and APIs provided by Facebook. - * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be - * included in all copies or substantial portions of the software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package com.facebook.unity; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; - -import com.facebook.CallbackManager; -import com.facebook.FacebookCallback; -import com.facebook.FacebookException; -import com.facebook.share.model.AppGroupCreationContent; -import com.facebook.share.model.AppGroupCreationContent.AppGroupPrivacy; -import com.facebook.share.widget.CreateAppGroupDialog; - -import java.util.Locale; - -public class FBUnityCreateGameGroupActivity extends BaseActivity { - public static String CREATE_GAME_GROUP_PARAMS = "create_game_group_params"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - AppGroupCreationContent.Builder contentBuilder = new AppGroupCreationContent.Builder(); - Bundle params = getIntent().getBundleExtra(CREATE_GAME_GROUP_PARAMS); - final UnityMessage response = new UnityMessage("OnGroupCreateComplete"); - if (params.containsKey(Constants.CALLBACK_ID_KEY)) { - response.put(Constants.CALLBACK_ID_KEY, params.getString(Constants.CALLBACK_ID_KEY)); - } - - if (params.containsKey("name")) { - contentBuilder.setName(params.getString("name")); - } - - if (params.containsKey("description")) { - contentBuilder.setDescription(params.getString("name")); - } - - if (params.containsKey("privacy")) { - String privacyStr = params.getString("privacy"); - AppGroupPrivacy privacy = AppGroupPrivacy.Closed; - if (privacyStr.equalsIgnoreCase("closed")) { - privacy = AppGroupPrivacy.Closed; - } else if (privacyStr.equalsIgnoreCase("open")) { - privacy = AppGroupPrivacy.Open; - } else { - response.sendError( - String.format( - Locale.ROOT, - "Unknown privacy setting for group creation: %s", - privacyStr)); - finish(); - } - contentBuilder.setAppGroupPrivacy(privacy); - } - - CreateAppGroupDialog dialog = new CreateAppGroupDialog(this); - dialog.registerCallback(mCallbackManager, new FacebookCallback() { - @Override - public void onSuccess(CreateAppGroupDialog.Result result) { - response.put("id", result.getId()); - response.send(); - } - - @Override - public void onCancel() { - response.putCancelled(); - response.send(); - } - - @Override - public void onError(FacebookException e) { - response.sendError(e.getLocalizedMessage()); - } - }); - dialog.show(contentBuilder.build()); - } -} diff --git a/facebook-android-wrapper/src/com/facebook/unity/FBUnityJoinGameGroupActivity.java b/facebook-android-wrapper/src/com/facebook/unity/FBUnityJoinGameGroupActivity.java deleted file mode 100644 index bdb3d5769..000000000 --- a/facebook-android-wrapper/src/com/facebook/unity/FBUnityJoinGameGroupActivity.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright (c) 2014-present, Facebook, Inc. All rights reserved. - * - * You are hereby granted a non-exclusive, worldwide, royalty-free license to use, - * copy, modify, and distribute this software in source code or binary form for use - * in connection with the web services and APIs provided by Facebook. - * - * As with any software that integrates with the Facebook platform, your use of - * this software is subject to the Facebook Developer Principles and Policies - * [http://developers.facebook.com/policy/]. This copyright notice shall be - * included in all copies or substantial portions of the software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package com.facebook.unity; - -import android.os.Bundle; - -import com.facebook.FacebookCallback; -import com.facebook.FacebookException; -import com.facebook.share.widget.JoinAppGroupDialog; - -public class FBUnityJoinGameGroupActivity extends BaseActivity { - public static String JOIN_GAME_GROUP_PARAMS = "join_game_group_params"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bundle params = getIntent().getBundleExtra(JOIN_GAME_GROUP_PARAMS); - final UnityMessage response = new UnityMessage("OnJoinGroupComplete"); - if (params.containsKey(Constants.CALLBACK_ID_KEY)) { - response.put(Constants.CALLBACK_ID_KEY, params.getString(Constants.CALLBACK_ID_KEY)); - } - - String groupId = ""; - if (params.containsKey("id")) { - groupId = params.getString("id"); - } - - JoinAppGroupDialog dialog = new JoinAppGroupDialog(this); - dialog.registerCallback(mCallbackManager, new FacebookCallback() { - @Override - public void onSuccess(JoinAppGroupDialog.Result result) { - response.put("didComplete", true); - response.send(); - } - - @Override - public void onCancel() { - response.putCancelled(); - response.send(); - } - - @Override - public void onError(FacebookException e) { - response.sendError(e.getLocalizedMessage()); - } - }); - dialog.show(groupId); - } -} diff --git a/scripts/build.properties b/scripts/build.properties index d76dd6f3f..ca4f591e5 100644 --- a/scripts/build.properties +++ b/scripts/build.properties @@ -17,7 +17,7 @@ UNITY_SDK_BUILD_VERSION='13.2.0' -FB_ANDROID_SDK_VERSION='5.0.1' +FB_ANDROID_SDK_VERSION='13.2.0' FB_ANDROID_SDK_PATH=~/fbsource/fbandroid/first-party/java/androidsdk FB_IOS_SDK_PATH=~/fbsource/fbobjc/ios-sdk/build