Merge pull request gree#11 from SlateScience/APPL-8689-fix-java-null-bug

Fix Java Null Bug
jonobarel-slatescience · Sep 22, 2024 · ae5da58 · ae5da58
2 parents 815ef27 + 840bb7d
commit ae5da58
Show file tree

Hide file tree

Showing 22 changed files with 283 additions and 116 deletions.
diff --git a/README.md b/README.md
diff --git a/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/Info.plist b/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>23G93</string>
+	<string>23H124</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>

diff --git a/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package-nofragment/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
diff --git a/dist/package-nofragment/Assets/Plugins/WebViewObject.cs b/dist/package-nofragment/Assets/Plugins/WebViewObject.cs
@@ -437,6 +437,9 @@ public bool IsKeyboardVisible
     private static extern IntPtr _CWebViewPlugin_InitStatic(
         bool inEditor, bool useMetal);
     [DllImport("WebView")]
+    private static extern bool _CWebViewPlugin_IsInitialized(
+        IntPtr instance);
+    [DllImport("WebView")]
     private static extern IntPtr _CWebViewPlugin_Init(
         string gameObject, bool transparent, bool zoom, int width, int height, string ua, bool separated);
     [DllImport("WebView")]
@@ -507,6 +510,9 @@ private static extern void _CWebViewPlugin_Reload(
     private static extern string _CWebViewPlugin_GetMessage(IntPtr instance);
 #elif UNITY_IPHONE
     [DllImport("__Internal")]
+    private static extern bool _CWebViewPlugin_IsInitialized(
+        IntPtr instance);
+    [DllImport("__Internal")]
     private static extern IntPtr _CWebViewPlugin_Init(string gameObject, bool transparent, bool zoom, string ua, bool enableWKWebView, int wkContentMode, bool wkAllowsLinkPreview, bool wkAllowsBackForwardNavigationGestures, int radius);
     [DllImport("__Internal")]
     private static extern int _CWebViewPlugin_Destroy(IntPtr instance);
@@ -611,6 +617,25 @@ public static bool IsWebViewAvailable()
 #endif
     }
 
+    public bool IsInitialized()
+    {
+#if UNITY_WEBPLAYER || UNITY_WEBGL
+        //TODO: UNSUPPORTED
+        return true;
+#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
+        //TODO: UNSUPPORTED
+        return true;
+#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
+        if (webView == IntPtr.Zero)
+            return false;
+        return _CWebViewPlugin_IsInitialized(webView);
+#elif UNITY_ANDROID
+        if (webView == null)
+            return false;
+        return webView.Call<bool>("IsInitialized");
+#endif
+    }
+
     public void Init(
         Callback cb = null,
         Callback err = null,

diff --git a/dist/package-nofragment/Assets/Plugins/iOS/WebView.mm b/dist/package-nofragment/Assets/Plugins/iOS/WebView.mm
@@ -143,6 +143,11 @@ @implementation CWebViewPlugin
 static WKProcessPool *_sharedProcessPool;
 static NSMutableArray *_instances = [[NSMutableArray alloc] init];
 
+- (BOOL)isInitialized
+{
+    return webView != nil;
+}
+
 - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)transparent zoom:(BOOL)zoom ua:(const char *)ua enableWKWebView:(BOOL)enableWKWebView contentMode:(WKContentMode)contentMode allowsLinkPreview:(BOOL)allowsLinkPreview allowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures radius:(int)radius
 {
     self = [super init];
@@ -939,6 +944,7 @@ - (void)setAllMediaPlaybackSuspended:(BOOL)suspended
 @end
 
 extern "C" {
+    BOOL _CWebViewPlugin_IsInitialized(void *instance);
     void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius);
     void _CWebViewPlugin_Destroy(void *instance);
     void _CWebViewPlugin_SetMargins(
@@ -970,6 +976,14 @@ void _CWebViewPlugin_SetMargins(
     void _CWebViewPlugin_SetSuspended(void *instance, BOOL suspended);
 }
 
+BOOL _CWebViewPlugin_IsInitialized(void *instance)
+{
+    if (instance == NULL)
+        return NO;
+    CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
+    return [webViewPlugin isInitialized];
+}
+
 void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius)
 {
     if (! (enableWKWebView && [WKWebView class]))

diff --git a/dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm b/dist/package-nofragment/Assets/Plugins/iOS/WebViewWithUIWebView.mm
@@ -196,6 +196,11 @@ @implementation CWebViewPlugin
 static WKProcessPool *_sharedProcessPool;
 static NSMutableArray *_instances = [[NSMutableArray alloc] init];
 
+- (BOOL)isInitialized
+{
+    return webView != nil;
+}
+
 - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)transparent zoom:(BOOL)zoom ua:(const char *)ua enableWKWebView:(BOOL)enableWKWebView contentMode:(WKContentMode)contentMode allowsLinkPreview:(BOOL)allowsLinkPreview allowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures radius:(int)radius
 {
     self = [super init];
@@ -1032,6 +1037,7 @@ - (void)setBasicAuthInfo:(const char *)userName password:(const char *)password
 @end
 
 extern "C" {
+    BOOL _CWebViewPlugin_IsInitialized(void *instance);
     void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius);
     void _CWebViewPlugin_Destroy(void *instance);
     void _CWebViewPlugin_SetMargins(
@@ -1063,6 +1069,14 @@ void _CWebViewPlugin_SetMargins(
     void _CWebViewPlugin_SetSuspended(void *instance, BOOL suspended);
 }
 
+BOOL _CWebViewPlugin_IsInitialized(void *instance)
+{
+    if (instance == NULL)
+        return NO;
+    CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
+    return [webViewPlugin isInitialized];
+}
+
 void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius)
 {
     WKContentMode wkContentMode = WKContentModeRecommended;

diff --git a/dist/package/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl b/dist/package/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl
diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist b/dist/package/Assets/Plugins/WebView.bundle/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>23G93</string>
+	<string>23H124</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>

diff --git a/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView b/dist/package/Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
diff --git a/dist/package/Assets/Plugins/WebViewObject.cs b/dist/package/Assets/Plugins/WebViewObject.cs
@@ -446,6 +446,9 @@ public bool IsKeyboardVisible
     private static extern IntPtr _CWebViewPlugin_InitStatic(
         bool inEditor, bool useMetal);
     [DllImport("WebView")]
+    private static extern bool _CWebViewPlugin_IsInitialized(
+        IntPtr instance);
+    [DllImport("WebView")]
     private static extern IntPtr _CWebViewPlugin_Init(
         string gameObject, bool transparent, bool zoom, int width, int height, string ua, bool separated);
     [DllImport("WebView")]
@@ -516,6 +519,9 @@ private static extern void _CWebViewPlugin_Reload(
     private static extern string _CWebViewPlugin_GetMessage(IntPtr instance);
 #elif UNITY_IPHONE
     [DllImport("__Internal")]
+    private static extern bool _CWebViewPlugin_IsInitialized(
+        IntPtr instance);
+    [DllImport("__Internal")]
     private static extern IntPtr _CWebViewPlugin_Init(string gameObject, bool transparent, bool zoom, string ua, bool enableWKWebView, int wkContentMode, bool wkAllowsLinkPreview, bool wkAllowsBackForwardNavigationGestures, int radius);
     [DllImport("__Internal")]
     private static extern int _CWebViewPlugin_Destroy(IntPtr instance);
@@ -614,6 +620,25 @@ public static bool IsWebViewAvailable()
 #endif
     }
 
+    public bool IsInitialized()
+    {
+#if UNITY_WEBPLAYER || UNITY_WEBGL
+        //TODO: UNSUPPORTED
+        return true;
+#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
+        //TODO: UNSUPPORTED
+        return true;
+#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
+        if (webView == IntPtr.Zero)
+            return false;
+        return _CWebViewPlugin_IsInitialized(webView);
+#elif UNITY_ANDROID
+        if (webView == null)
+            return false;
+        return webView.Call<bool>("IsInitialized");
+#endif
+    }
+
     public void Init(
         Callback cb = null,
         Callback err = null,

diff --git a/dist/package/Assets/Plugins/iOS/WebView.mm b/dist/package/Assets/Plugins/iOS/WebView.mm
@@ -143,6 +143,11 @@ @implementation CWebViewPlugin
 static WKProcessPool *_sharedProcessPool;
 static NSMutableArray *_instances = [[NSMutableArray alloc] init];
 
+- (BOOL)isInitialized
+{
+    return webView != nil;
+}
+
 - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)transparent zoom:(BOOL)zoom ua:(const char *)ua enableWKWebView:(BOOL)enableWKWebView contentMode:(WKContentMode)contentMode allowsLinkPreview:(BOOL)allowsLinkPreview allowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures radius:(int)radius
 {
     self = [super init];
@@ -939,6 +944,7 @@ - (void)setAllMediaPlaybackSuspended:(BOOL)suspended
 @end
 
 extern "C" {
+    BOOL _CWebViewPlugin_IsInitialized(void *instance);
     void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius);
     void _CWebViewPlugin_Destroy(void *instance);
     void _CWebViewPlugin_SetMargins(
@@ -970,6 +976,14 @@ void _CWebViewPlugin_SetMargins(
     void _CWebViewPlugin_SetSuspended(void *instance, BOOL suspended);
 }
 
+BOOL _CWebViewPlugin_IsInitialized(void *instance)
+{
+    if (instance == NULL)
+        return NO;
+    CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
+    return [webViewPlugin isInitialized];
+}
+
 void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius)
 {
     if (! (enableWKWebView && [WKWebView class]))

diff --git a/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm b/dist/package/Assets/Plugins/iOS/WebViewWithUIWebView.mm
@@ -196,6 +196,11 @@ @implementation CWebViewPlugin
 static WKProcessPool *_sharedProcessPool;
 static NSMutableArray *_instances = [[NSMutableArray alloc] init];
 
+- (BOOL)isInitialized
+{
+    return webView != nil;
+}
+
 - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)transparent zoom:(BOOL)zoom ua:(const char *)ua enableWKWebView:(BOOL)enableWKWebView contentMode:(WKContentMode)contentMode allowsLinkPreview:(BOOL)allowsLinkPreview allowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures radius:(int)radius
 {
     self = [super init];
@@ -1032,6 +1037,7 @@ - (void)setBasicAuthInfo:(const char *)userName password:(const char *)password
 @end
 
 extern "C" {
+    BOOL _CWebViewPlugin_IsInitialized(void *instance);
     void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius);
     void _CWebViewPlugin_Destroy(void *instance);
     void _CWebViewPlugin_SetMargins(
@@ -1063,6 +1069,14 @@ void _CWebViewPlugin_SetMargins(
     void _CWebViewPlugin_SetSuspended(void *instance, BOOL suspended);
 }
 
+BOOL _CWebViewPlugin_IsInitialized(void *instance)
+{
+    if (instance == NULL)
+        return NO;
+    CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
+    return [webViewPlugin isInitialized];
+}
+
 void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius)
 {
     WKContentMode wkContentMode = WKContentModeRecommended;

diff --git a/dist/unity-webview-nofragment.unitypackage b/dist/unity-webview-nofragment.unitypackage
diff --git a/dist/unity-webview-nofragment.zip b/dist/unity-webview-nofragment.zip
diff --git a/dist/unity-webview.unitypackage b/dist/unity-webview.unitypackage
diff --git a/dist/unity-webview.zip b/dist/unity-webview.zip
diff --git a/plugins/Android/webview/src/main/java/net/gree/unitywebview/CWebViewPlugin.java b/plugins/Android/webview/src/main/java/net/gree/unitywebview/CWebViewPlugin.java
@@ -1420,6 +1420,8 @@ public void SaveCookies()
     public void GetCookies(String url)
     {
         CookieManager cookieManager = CookieManager.getInstance();
+        Log.i("CWebViewPlugin", "APPL-8689 cookieManager is null? " + ((cookieManager == null)? "true" : "false"));
+        Log.i("CWebViewPlugin", cookieManager.toString());
         mWebViewPlugin.call("CallOnCookies", cookieManager.getCookie(url));
     }
 

diff --git a/plugins/Mac/Sources/WebView.mm b/plugins/Mac/Sources/WebView.mm
@@ -172,6 +172,11 @@ @implementation CWebViewPlugin
     { NSModeSwitchFunctionKey,         0 },
 };
 
+- (BOOL)isInitialized
+{
+    return webView != nil;
+}
+
 - (id)initWithGameObject:(const char *)gameObject_ transparent:(BOOL)transparent zoom:(BOOL)zoom width:(int)width height:(int)height ua:(const char *)ua separated:(BOOL)separated
 {
     self = [super init];
@@ -974,6 +979,7 @@ - (const char *)getCustomRequestHeaderValue:(const char *)headerKey
 #endif
     const char *_CWebViewPlugin_GetAppPath(void);
     void _CWebViewPlugin_InitStatic(BOOL inEditor, BOOL useMetal);
+    BOOL _CWebViewPlugin_IsInitialized(void *instance);
     void *_CWebViewPlugin_Init(
         const char *gameObject, BOOL transparent, BOOL zoom, int width, int height, const char *ua, BOOL separated);
     void _CWebViewPlugin_Destroy(void *instance);
@@ -1021,6 +1027,14 @@ void _CWebViewPlugin_InitStatic(BOOL inEditor, BOOL useMetal)
     s_useMetal = useMetal;
 }
 
+BOOL _CWebViewPlugin_IsInitialized(void *instance)
+{
+    if (instance == NULL)
+        return NO;
+    CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
+    return [webViewPlugin isInitialized];
+}
+
 void *_CWebViewPlugin_Init(
     const char *gameObject, BOOL transparent, BOOL zoom, int width, int height, const char *ua, BOOL separated)
 {

diff --git a/plugins/WebViewObject.cs b/plugins/WebViewObject.cs
@@ -447,6 +447,9 @@ public bool IsKeyboardVisible
     private static extern IntPtr _CWebViewPlugin_InitStatic(
         bool inEditor, bool useMetal);
     [DllImport("WebView")]
+    private static extern bool _CWebViewPlugin_IsInitialized(
+        IntPtr instance);
+    [DllImport("WebView")]
     private static extern IntPtr _CWebViewPlugin_Init(
         string gameObject, bool transparent, bool zoom, int width, int height, string ua, bool separated);
     [DllImport("WebView")]
@@ -517,6 +520,9 @@ private static extern void _CWebViewPlugin_Reload(
     private static extern string _CWebViewPlugin_GetMessage(IntPtr instance);
 #elif UNITY_IPHONE
     [DllImport("__Internal")]
+    private static extern bool _CWebViewPlugin_IsInitialized(
+        IntPtr instance);
+    [DllImport("__Internal")]
     private static extern IntPtr _CWebViewPlugin_Init(string gameObject, bool transparent, bool zoom, string ua, bool enableWKWebView, int wkContentMode, bool wkAllowsLinkPreview, bool wkAllowsBackForwardNavigationGestures, int radius);
     [DllImport("__Internal")]
     private static extern int _CWebViewPlugin_Destroy(IntPtr instance);
@@ -615,6 +621,25 @@ public static bool IsWebViewAvailable()
 #endif
     }
 
+    public bool IsInitialized()
+    {
+#if UNITY_WEBPLAYER || UNITY_WEBGL
+        //TODO: UNSUPPORTED
+        return true;
+#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX
+        //TODO: UNSUPPORTED
+        return true;
+#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX || UNITY_IPHONE
+        if (webView == IntPtr.Zero)
+            return false;
+        return _CWebViewPlugin_IsInitialized(webView);
+#elif UNITY_ANDROID
+        if (webView == null)
+            return false;
+        return webView.Call<bool>("IsInitialized");
+#endif
+    }
+
     public void Init(
         Callback cb = null,
         Callback err = null,

diff --git a/plugins/iOS/WebView.mm b/plugins/iOS/WebView.mm
@@ -143,6 +143,11 @@ @implementation CWebViewPlugin
 static WKProcessPool *_sharedProcessPool;
 static NSMutableArray *_instances = [[NSMutableArray alloc] init];
 
+- (BOOL)isInitialized
+{
+    return webView != nil;
+}
+
 - (id)initWithGameObjectName:(const char *)gameObjectName_ transparent:(BOOL)transparent zoom:(BOOL)zoom ua:(const char *)ua enableWKWebView:(BOOL)enableWKWebView contentMode:(WKContentMode)contentMode allowsLinkPreview:(BOOL)allowsLinkPreview allowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures radius:(int)radius
 {
     self = [super init];
@@ -939,6 +944,7 @@ - (void)setAllMediaPlaybackSuspended:(BOOL)suspended
 @end
 
 extern "C" {
+    BOOL _CWebViewPlugin_IsInitialized(void *instance);
     void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius);
     void _CWebViewPlugin_Destroy(void *instance);
     void _CWebViewPlugin_SetMargins(
@@ -970,6 +976,14 @@ void _CWebViewPlugin_SetMargins(
     void _CWebViewPlugin_SetSuspended(void *instance, BOOL suspended);
 }
 
+BOOL _CWebViewPlugin_IsInitialized(void *instance)
+{
+    if (instance == NULL)
+        return NO;
+    CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
+    return [webViewPlugin isInitialized];
+}
+
 void *_CWebViewPlugin_Init(const char *gameObjectName, BOOL transparent, BOOL zoom, const char *ua, BOOL enableWKWebView, int contentMode, BOOL allowsLinkPreview, BOOL allowsBackForwardNavigationGestures, int radius)
 {
     if (! (enableWKWebView && [WKWebView class]))