Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

App-9524 upgrade plugin from upstream and fix support for Unity 6 #13

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

App-9524 upgrade plugin from upstream and fix support for Unity 6 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
49c0980
removed w.location.replace(href) for non unity: links (cf. #1105).
KojiNakamaru Oct 11, 2024
a0d5b6c
Merge pull request #1106 from gree/fix/webgl_location
KojiNakamaru Oct 11, 2024
f62703d
updated binaries.
KojiNakamaru Oct 11, 2024
0049ec1
feat: exclude from server build
insthync Oct 22, 2024
5e74e8e
Merge pull request #1112 from insthync/master
KojiNakamaru Oct 22, 2024
3aa60f0
updated binaries.
KojiNakamaru Oct 22, 2024
9c9d917
introduced support for intent:/android-app: url.
KojiNakamaru Jan 5, 2025
f6fde98
Merge pull request #1128 from gree/feature/intent-url
KojiNakamaru Jan 5, 2025
e517ff9
updated binaries.
KojiNakamaru Jan 5, 2025
2a059ce
introduced launchMarket on startActivity failure for 'intent://'.
KojiNakamaru Jan 17, 2025
30f3c37
Merge pull request #1131 from gree/feature/android-launch-market
KojiNakamaru Jan 17, 2025
b1ee99f
updated binaries.
KojiNakamaru Jan 17, 2025
77b72b5
add accessibility workaround for Unity 6
jonobarel-slatescience Feb 11, 2025
745cf73
Update logic with patch from @KojiNakamaru
jonobarel-slatescience Feb 12, 2025
6645e63
Merge pull request #1135 from jonobarel-slatescience/add-accessibilit…
KojiNakamaru Feb 13, 2025
b10c8df
updated binaries.
KojiNakamaru Feb 13, 2025
05fefc0
Merge remote-tracking branch 'refs/remotes/upstream/master' into APPL…
jonobarel-slatescience Feb 13, 2025
3e67efd
update sdk references for Unity 6 APPL-9524
jonobarel-slatescience Feb 13, 2025
6f28b6d
update binaries recompiled for Unity 6 APPL-9524
jonobarel-slatescience Feb 13, 2025
ad2d77a
Merge remote-tracking branch 'refs/remotes/upstream/master' into APPL…
jonobarel-slatescience Feb 13, 2025
60e032a
Update JAVA references to Unity 6 directory APPL-9524
jonobarel-slatescience Feb 13, 2025
474d1e6
remove CUnityPlayer.java since it is unused.
jonobarel-slatescience Feb 13, 2025
903a2f2
Update class reference from `UnityPlayer` to `UnityPlayerForActivityO…
jonobarel-slatescience Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified build/Packager/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl
View file
Open in desktop
Binary file not shown.
Binary file modified build/Packager/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl
View file
Open in desktop
Binary file not shown.
Binary file modified dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl
View file
Open in desktop
Binary file not shown.
Binary file modified dist/package-nofragment/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23H124</string>
<string>24D70</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Expand All @@ -29,19 +29,19 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string></string>
<string>24C94</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>14.5</string>
<string>15.2</string>
<key>DTSDKBuild</key>
<string>23F73</string>
<string>24C94</string>
<key>DTSDKName</key>
<string>macosx14.5</string>
<string>macosx15.2</string>
<key>DTXcode</key>
<string>1540</string>
<string>1620</string>
<key>DTXcodeBuild</key>
<string>15F31d</string>
<string>16C5032a</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
</dict>
Expand Down
Binary file modified dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
View file
Open in desktop
Binary file not shown.
62 changes: 31 additions & 31 deletions dist/package-nofragment/Assets/Plugins/WebViewObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ public bool IsInitialized()
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
return true;
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return true;
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
Expand Down Expand Up @@ -676,7 +676,7 @@ public void Init(
#endif
#elif UNITY_WEBPLAYER
Application.ExternalCall("unityWebView.init", name);
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
Debug.LogError("Webview is not supported on this platform.");
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
Expand Down Expand Up @@ -728,7 +728,7 @@ protected virtual void OnDestroy()
#endif
#elif UNITY_WEBPLAYER
Application.ExternalCall("unityWebView.destroy", name);
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
if (bg != null) {
Expand Down Expand Up @@ -757,7 +757,7 @@ public void Pause()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
//TODO: UNSUPPORTED
Expand All @@ -777,7 +777,7 @@ public void Resume()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
//TODO: UNSUPPORTED
Expand Down Expand Up @@ -831,7 +831,7 @@ public void SetCenterPositionWithScale(Vector2 center, Vector2 scale)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#else
float left = (Screen.width - scale.x) / 2.0f + center.x;
Expand All @@ -844,7 +844,7 @@ public void SetCenterPositionWithScale(Vector2 center, Vector2 scale)

public void SetMargins(int left, int top, int right, int bottom, bool relative = false)
{
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return;
#elif UNITY_WEBPLAYER || UNITY_WEBGL
Expand All @@ -865,7 +865,7 @@ public void SetMargins(int left, int top, int right, int bottom, bool relative =
mMarginBottom = bottom;
mMarginRelative = relative;
float ml, mt, mr, mb;
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_WEBPLAYER || UNITY_WEBGL
ml = left;
Expand Down Expand Up @@ -943,7 +943,7 @@ public void SetMargins(int left, int top, int right, int bottom, bool relative =
mMarginBottomComputed = mb;
mMarginRelativeComputed = r;

#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_WEBPLAYER
Application.ExternalCall("unityWebView.setMargins", name, (int)ml, (int)mt, (int)mr, (int)mb);
Expand Down Expand Up @@ -980,7 +980,7 @@ public void SetVisibility(bool v)
#endif
#elif UNITY_WEBPLAYER
Application.ExternalCall("unityWebView.setVisibility", name, v);
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
if (webView == IntPtr.Zero)
Expand Down Expand Up @@ -1117,7 +1117,7 @@ public bool SetURLPattern(string allowPattern, string denyPattern, string hookPa
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
return false;
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return false;
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
Expand All @@ -1141,7 +1141,7 @@ public void LoadURL(string url)
#endif
#elif UNITY_WEBPLAYER
Application.ExternalCall("unityWebView.loadURL", name, url);
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1162,7 +1162,7 @@ public void LoadHTML(string html, string baseUrl)
baseUrl = "";
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1183,7 +1183,7 @@ public void EvaluateJS(string js)
#endif
#elif UNITY_WEBPLAYER
Application.ExternalCall("unityWebView.evaluateJS", name, js);
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1201,7 +1201,7 @@ public int Progress()
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
return 0;
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return 0;
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
Expand All @@ -1220,7 +1220,7 @@ public bool CanGoBack()
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
return false;
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return false;
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
Expand All @@ -1239,7 +1239,7 @@ public bool CanGoForward()
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
return false;
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return false;
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
Expand All @@ -1257,7 +1257,7 @@ public void GoBack()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1274,7 +1274,7 @@ public void GoForward()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1291,7 +1291,7 @@ public void Reload()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand Down Expand Up @@ -1378,7 +1378,7 @@ public void AddCustomHeader(string headerKey, string headerValue)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1396,7 +1396,7 @@ public string GetCustomHeaderValue(string headerKey)
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
return null;
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
return null;
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
Expand All @@ -1413,7 +1413,7 @@ public string GetCustomHeaderValue(string headerKey)
public void RemoveCustomHeader(string headerKey)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
return;
Expand All @@ -1429,7 +1429,7 @@ public void ClearCustomHeader()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1446,7 +1446,7 @@ public void ClearCookies()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1464,7 +1464,7 @@ public void SaveCookies()
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1482,7 +1482,7 @@ public void GetCookies(string url)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
if (webView == IntPtr.Zero)
Expand All @@ -1501,7 +1501,7 @@ public void SetBasicAuthInfo(string userName, string password)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
//TODO: UNSUPPORTED
Expand All @@ -1520,7 +1520,7 @@ public void ClearCache(bool includeDiskFiles)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_IPHONE && !UNITY_EDITOR
if (webView == IntPtr.Zero)
Expand All @@ -1538,7 +1538,7 @@ public void SetTextZoom(int textZoom)
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_IPHONE && !UNITY_EDITOR
//TODO: UNSUPPORTED
Expand All @@ -1553,7 +1553,7 @@ public void SetMixedContentMode(int mode) // 0: MIXED_CONTENT_ALWAYS_ALLOW, 1:
{
#if UNITY_WEBPLAYER || UNITY_WEBGL
//TODO: UNSUPPORTED
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX || UNITY_SERVER
//TODO: UNSUPPORTED
#elif UNITY_IPHONE && !UNITY_EDITOR
//TODO: UNSUPPORTED
Expand Down
13 changes: 13 additions & 0 deletions dist/package-nofragment/Assets/Plugins/iOS/WebView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@ - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)tra

[view addSubview:webView];

//set webview for Unity 6 accessibility hierarchy
NSMutableArray<UIAccessibilityElement *> *accessibilityElements
= view.accessibilityElements ? [view.accessibilityElements mutableCopy] : [NSMutableArray array];
[accessibilityElements addObject:(UIAccessibilityElement *)webView];
view.accessibilityElements = accessibilityElements;

return self;
}

Expand All @@ -284,6 +290,13 @@ - (void)dispose
[webView0 stopLoading];
[webView0 removeFromSuperview];
[webView0 removeObserver:self forKeyPath:@"loading"];

//remove the WebViewObject from Unity hierarchy tree
UIView *view = UnityGetGLViewController().view;
NSMutableArray<UIAccessibilityElement *> *accessibilityElements
= view.accessibilityElements ? [view.accessibilityElements mutableCopy] : [NSMutableArray array];
[accessibilityElements removeObject: (UIAccessibilityElement *)webView0];
view.accessibilityElements = accessibilityElements;
}
basicAuthPassword = nil;
basicAuthUserName = nil;
Expand Down
2 changes: 0 additions & 2 deletions dist/package-nofragment/Assets/WebGLTemplates/unity-webview-2020/unity-webview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ var unityWebView =
if (href.substr(0, 6) === 'unity:') {
unityInstance.SendMessage(name, "CallFromJS", href.substring(6, href.length));
e.preventDefault();
} else {
w.location.replace(href);
}
});

Expand Down
2 changes: 0 additions & 2 deletions dist/package-nofragment/Assets/WebGLTemplates/unity-webview/unity-webview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ var unityWebView =
if (href.substr(0, 6) === 'unity:') {
unityInstance.SendMessage(name, "CallFromJS", href.substring(6, href.length));
e.preventDefault();
} else {
w.location.replace(href);
}
});

Expand Down
Binary file modified dist/package/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl
View file
Open in desktop
Binary file not shown.
Binary file modified dist/package/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23H124</string>
<string>24D70</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Expand All @@ -29,19 +29,19 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string></string>
<string>24C94</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>14.5</string>
<string>15.2</string>
<key>DTSDKBuild</key>
<string>23F73</string>
<string>24C94</string>
<key>DTSDKName</key>
<string>macosx14.5</string>
<string>macosx15.2</string>
<key>DTXcode</key>
<string>1540</string>
<string>1620</string>
<key>DTXcodeBuild</key>
<string>15F31d</string>
<string>16C5032a</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
</dict>
Expand Down
Binary file modified dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
View file
Open in desktop
Binary file not shown.
Loading