Fixed iOS build regression

shai-almog · shai-almog · commit 1866a0a43f3e · 2023-11-17T11:04:21.000+02:00
diff --git a/Ports/iOSPort/nativeSources/IOSNative.m b/Ports/iOSPort/nativeSources/IOSNative.m
@@ -8286,7 +8286,7 @@ JAVA_BOOLEAN com_codename1_impl_ios_IOSNative_nativeIsAlphaMaskSupportedGlobal__
 JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetLeft___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {
     if (@available(iOS 11.0, *)) {
         UIWindow *window = UIApplication.sharedApplication.keyWindow;
-        if(window != nil && window.safeAreaInsets != nil) {
+        if(window != nil) {
             return (JAVA_INT)(window.safeAreaInsets.left * scaleValue);
         }
     }
@@ -8296,7 +8296,7 @@ JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetLeft___R_int(CN1_TH
 JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetTop___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {
     if (@available(iOS 11.0, *)) {
         UIWindow *window = UIApplication.sharedApplication.keyWindow;
-        if(window != nil && window.safeAreaInsets != nil) {
+        if(window != nil) {
             return (JAVA_INT)(window.safeAreaInsets.top * scaleValue);
         }
     }
@@ -8306,7 +8306,7 @@ JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetTop___R_int(CN1_THR
 JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetRight___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {
     if (@available(iOS 11.0, *)) {
         UIWindow *window = UIApplication.sharedApplication.keyWindow;
-        if(window != nil && window.safeAreaInsets != nil) {
+        if(window != nil) {
             return (JAVA_INT)(window.safeAreaInsets.right * scaleValue);
         }
     }
@@ -8316,7 +8316,7 @@ JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetRight___R_int(CN1_T
 JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetBottom___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {
     if (@available(iOS 11.0, *)) {
         UIWindow *window = UIApplication.sharedApplication.keyWindow;
-        if(window != nil && window.safeAreaInsets != nil) {
+        if(window != nil) {
             return (JAVA_INT)(window.safeAreaInsets.bottom * scaleValue);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -8286,7 +8286,7 @@ JAVA_BOOLEAN com_codename1_impl_ios_IOSNative_nativeIsAlphaMaskSupportedGlobal__`
`8286`	`8286`	`JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetLeft___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {`
`8287`	`8287`	`if (@available(iOS 11.0, *)) {`
`8288`	`8288`	`UIWindow *window = UIApplication.sharedApplication.keyWindow;`
`8289`		`- if(window != nil && window.safeAreaInsets != nil) {`
	`8289`	`+ if(window != nil) {`
`8290`	`8290`	`return (JAVA_INT)(window.safeAreaInsets.left * scaleValue);`
`8291`	`8291`	`}`
`8292`	`8292`	`}`
`@@ -8296,7 +8296,7 @@ JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetLeft___R_int(CN1_TH`
`8296`	`8296`	`JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetTop___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {`
`8297`	`8297`	`if (@available(iOS 11.0, *)) {`
`8298`	`8298`	`UIWindow *window = UIApplication.sharedApplication.keyWindow;`
`8299`		`- if(window != nil && window.safeAreaInsets != nil) {`
	`8299`	`+ if(window != nil) {`
`8300`	`8300`	`return (JAVA_INT)(window.safeAreaInsets.top * scaleValue);`
`8301`	`8301`	`}`
`8302`	`8302`	`}`
`@@ -8306,7 +8306,7 @@ JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetTop___R_int(CN1_THR`
`8306`	`8306`	`JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetRight___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {`
`8307`	`8307`	`if (@available(iOS 11.0, *)) {`
`8308`	`8308`	`UIWindow *window = UIApplication.sharedApplication.keyWindow;`
`8309`		`- if(window != nil && window.safeAreaInsets != nil) {`
	`8309`	`+ if(window != nil) {`
`8310`	`8310`	`return (JAVA_INT)(window.safeAreaInsets.right * scaleValue);`
`8311`	`8311`	`}`
`8312`	`8312`	`}`
`@@ -8316,7 +8316,7 @@ JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetRight___R_int(CN1_T`
`8316`	`8316`	`JAVA_INT com_codename1_impl_ios_IOSNative_getDisplaySafeInsetBottom___R_int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {`
`8317`	`8317`	`if (@available(iOS 11.0, *)) {`
`8318`	`8318`	`UIWindow *window = UIApplication.sharedApplication.keyWindow;`
`8319`		`- if(window != nil && window.safeAreaInsets != nil) {`
	`8319`	`+ if(window != nil) {`
`8320`	`8320`	`return (JAVA_INT)(window.safeAreaInsets.bottom * scaleValue);`
`8321`	`8321`	`}`
`8322`	`8322`	`}`