fix apple code

src/Environment/Apple/AppleDetail.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Kernel/StaticString.h"
 #include "Kernel/Params.h"
 #include "Kernel/Data.h"
 #include "Kernel/VectorString.h"
@@ -18,11 +17,8 @@
 
 @interface AppleDetail : NSObject
 
-typedef Mengine::StaticString<MENGINE_APPLE_MESSAGE_NSID> NSIDMessage;
-+ (NSIDMessage)NSIdToString:(id _Nonnull) _value;
-
-typedef Mengine::StaticString<MENGINE_APPLE_MESSAGE_NSERROR> NSErrorMessage;
-+ (NSErrorMessage)getMessageFromNSError:(NSError * _Nonnull) _error;
++ (NSString * _Nonnull)NSIdToString:(id _Nonnull) _value;
++ (NSString * _Nonnull)getMessageFromNSError:(NSError * _Nonnull) _error;
 
 + (NSInteger)getCurrentTimeMillis;
 + (NSInteger)getSecureRandomInteger;

src/Environment/Apple/AppleDetail.mm

@@ -3,23 +3,21 @@
 
 @implementation AppleDetail
 
-+ (NSIDMessage)NSIdToString:(id _Nonnull) _value {
-    const Mengine::Char * message_str = [[NSString stringWithFormat:@"%@", _value] UTF8String];
++ (NSString * _Nonnull)NSIdToString:(id _Nonnull) _value {
+    NSString * value_string = [NSString stringWithFormat:@"%@", _value];
 
-    return NSIDMessage( message_str );
+    return value_string;
 }
 
-+ (NSErrorMessage)getMessageFromNSError:(NSError *) _error {
++ (NSString * _Nonnull)getMessageFromNSError:(NSError *) _error {
     NSString * message = [NSString stringWithFormat:@"[Error %ld Description: %@ Failure reason: %@ Recovery suggestion: %@"
         , [_error code]
         , [_error description]
         , [_error localizedFailureReason]
         , [_error localizedRecoverySuggestion]
         ];
 
-    const Mengine::Char * message_str = [message UTF8String];
-
-    return NSErrorMessage( message_str );
+    return message;
 }
 
 + (NSInteger)getCurrentTimeMillis {
@@ -41,7 +39,7 @@ + (NSInteger)getSecureRandomInteger {
     return randomNumber;
 }
 
-+ (NSString *)getRandomHexString:(NSInteger) _length {
++ (NSString * _Nonnull)getRandomHexString:(NSInteger) _length {
     NSInteger lengthBytes = (_length + 1) / 2;
     uint8_t randomBytes[lengthBytes];
     if (SecRandomCopyBytes(kSecRandomDefault, lengthBytes, randomBytes) != 0) {

src/Platforms/iOSPlatform/iOSPlatformService.mm

@@ -15,6 +15,7 @@
 #include "Interface/iOSKernelServiceInterface.h"
 #include "Interface/AccountServiceInterface.h"
 
+#import "Environment/Apple/AppleDetail.h"
 #import "Environment/iOS/iOSApplication.h"
 #import "Environment/iOS/iOSDetail.h"
 
@@ -144,7 +145,7 @@
         if( error != nil )
         {
             LOGGER_ERROR( "Error creating directory: %s"
-                , [error.description UTF8String]
+                 , [[AppleDetail getMessageFromNSError:error] UTF8String]
             );
 
             StdString::strncpy( _userPath, "", MENGINE_MAX_PATH );
@@ -943,7 +944,7 @@ static void SDL_LogOutputFunction( void * userdata, int category, SDL_LogPriorit
                                                   yes:^() {
             LOGGER_MESSAGE("delete account [YES]");
 
-            [[iOSApplication sharedInstance] removeSessionData];
+            [iOSApplication.sharedInstance removeSessionData];
 
             ACCOUNT_SERVICE()
                 ->deleteCurrentAccount();

src/Plugins/AppleAppLovinPlugin/AppleAppLovinBannerDelegate.mm

@@ -45,8 +45,8 @@ - (instancetype _Nullable) initWithAdUnitIdentifier:(NSString * _Nonnull) adUnit
     adView.frame = rect;
     adView.backgroundColor = UIColor.clearColor;
 
-    UIViewController * rootViewController = [iOSDetail getRootViewController];
-    [rootViewController.view addSubview:adView];
+    UIViewController * viewController = [iOSDetail getRootViewController];
+    [viewController.view addSubview:adView];
     adView.hidden = YES;
 
     self.m_adView = adView;

src/Plugins/AppleFacebookPlugin/AppleFacebookInterface.h

@@ -6,8 +6,6 @@
 #include "Kernel/VectorConstString.h"
 #include "Kernel/Params.h"
 
-#include "Config/Lambda.h"
-
 namespace Mengine
 {
     //////////////////////////////////////////////////////////////////////////
@@ -24,7 +22,7 @@ namespace Mengine
         virtual void onFacebookShareCancel() = 0;
         virtual void onFacebookShareError( int32_t _code, const Char * _errorMessage ) = 0;
 
-        virtual void onFacebookProfilePictureLinkGetSuccess( const Char * _userId, bool _success, const Char * _pictureURL ) = 0;
+        virtual void onFacebookProfilePictureLinkGetSuccess( const Char * _userId, const Char * _pictureURL ) = 0;
         virtual void onFacebookProfilePictureLinkGetError( int32_t _code, const Char * _errorMessage ) = 0;
     };
     //////////////////////////////////////////////////////////////////////////

src/Plugins/AppleFacebookPlugin/AppleFacebookPlugin.mm

@@ -10,11 +10,12 @@
 #include "Kernel/OptionHelper.h"
 #include "Kernel/FactorableUnique.h"
 #include "Kernel/NotificationHelper.h"
+#include "Kernel/PluginHelper.h"
 
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleFacebookService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleFacebook, Mengine::AppleFacebookPlugin )
+PLUGIN_FACTORY( AppleFacebook, Mengine::AppleFacebookPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

src/Plugins/AppleFacebookPlugin/AppleFacebookScriptEmbedding.mm

@@ -58,9 +58,9 @@ void onFacebookShareError( int32_t _code, const Char * _errorMessage ) override
                 this->call_cbs( "onAppleFacebookShareError", _code, _errorMessage );
             }
 
-            void onFacebookProfilePictureLinkGetSuccess( const Char * _userId, bool _success, const Char * _pictureURL ) override
+            void onFacebookProfilePictureLinkGetSuccess( const Char * _userId, const Char * _pictureURL ) override
             {
-                this->call_cbs( "onAppleFacebookProfilePictureLinkGetSuccess", _userId, _success, _pictureURL );
+                this->call_cbs( "onAppleFacebookProfilePictureLinkGetSuccess", _userId, _pictureURL );
             }
 
             void onFacebookProfilePictureLinkGetError( int32_t _code, const Char * _errorMessage ) override

src/Plugins/AppleFacebookPlugin/AppleFacebookService.h

@@ -41,8 +41,8 @@ namespace Mengine
 
     protected:
         AppleFacebookProviderInterfacePtr m_provider;
+
         FBSDKLoginManager * m_loginManager;
-
         AppleFacebookShareDelegate * m_shareDelegate;
     };
 }

src/Plugins/AppleFacebookPlugin/AppleFacebookService.mm

@@ -1,6 +1,5 @@
 #include "AppleFacebookService.h"
 
-#import "Environment/Apple/AppleErrorHelper.h"
 #import "Environment/Apple/AppleDetail.h"
 #import "Environment/iOS/iOSApplication.h"
 #import "Environment/iOS/iOSDetail.h"
@@ -29,7 +28,7 @@
     bool AppleFacebookService::_initializeService()
     {
         m_loginManager = [[FBSDKLoginManager alloc] init];
-        m_shareDelegate = [[AppleFacebookShareDelegate alloc]initWithService: this];
+        m_shareDelegate = [[AppleFacebookShareDelegate alloc] initWithService: this];
 
         return true;
     }
@@ -54,29 +53,29 @@
     //////////////////////////////////////////////////////////////////////////
     bool AppleFacebookService::login( const VectorConstString & _permissions )
     {        
-        UIViewController * rootViewController = Helper::iOSGetRootViewController();
+        UIViewController * viewController = [iOSDetail getRootViewController];
 
-        NSArray<NSString *> * permissions_ns = Helper::AppleGetNSArrayFromVectorConstString( _permissions );
+        NSArray<NSString *> * permissions_ns = [AppleDetail getNSArrayFromVectorConstString:_permissions];
 
         NSString * sessionId = [iOSApplication.sharedInstance getSessionId];
 
         FBSDKLoginConfiguration * configuration = [[FBSDKLoginConfiguration alloc] initWithPermissions:permissions_ns
                                                                                               tracking:FBSDKLoginTrackingLimited
                                                                                                  nonce:sessionId];
 
-        [m_loginManager logInFromViewController:rootViewController configuration:configuration completion:^(FBSDKLoginManagerLoginResult * _Nullable result, NSError * _Nullable error) {
+        [m_loginManager logInFromViewController:viewController configuration:configuration completion:^(FBSDKLoginManagerLoginResult * _Nullable result, NSError * _Nullable error) {
             AppleFacebookProviderInterfacePtr copy_provider = m_provider;
 
             if( error != nullptr )
             {
                 LOGGER_ERROR( "login error: '%s'"
-                   , Helper::AppleGetMessageFromNSError(error).c_str()
+                     , [[AppleDetail getMessageFromNSError:error] UTF8String]
                 );
 
                 if( copy_provider != nullptr )
                 {
                     Helper::dispatchMainThreadEvent( [copy_provider, error]() {
-                        copy_provider->onFacebookError( -2, [NSString stringWithFormat:@"%@", error].UTF8String);
+                        copy_provider->onFacebookError( -2, [[AppleDetail getMessageFromNSError:error] UTF8String]);
                     });
                 }
 
@@ -89,7 +88,7 @@
 
                 if( copy_provider != nullptr )
                 {
-                    Helper::dispatchMainThreadEvent( [copy_provider, error]() {
+                    Helper::dispatchMainThreadEvent( [copy_provider]() {
                         copy_provider->onFacebookLoginCancel();
                     });
                 }
@@ -111,7 +110,7 @@
                         NSString * userID = profile.userID;
                         const Char * userID_str = [userID UTF8String];
 
-                        params.emplace( STRINGIZE_STRING_LOCAL("profile.userID"), userID_str );
+                        params.emplace( STRINGIZE_STRING_LOCAL("profile.userID"), ParamString(userID_str) );
 
                         if( profile.imageURL != nil )
                         {
@@ -121,7 +120,7 @@
                             {
                                 const Char * imageURL_str = [imageURL.absoluteString UTF8String];
 
-                                params.emplace( STRINGIZE_STRING_LOCAL("profile.imageURL"), imageURL_str );
+                                params.emplace( STRINGIZE_STRING_LOCAL("profile.imageURL"), ParamString(imageURL_str) );
                             }
                         }
                     }
@@ -133,7 +132,7 @@
                         NSString * authenticationTokenString = authenticationToken.tokenString;
                         const Char * authenticationTokenString_str = [authenticationTokenString UTF8String];
 
-                        params.emplace( STRINGIZE_STRING_LOCAL("authentication.token"), authenticationTokenString_str );
+                        params.emplace( STRINGIZE_STRING_LOCAL("authentication.token"), ParamString(authenticationTokenString_str) );
                     }
 
                     copy_provider->onFacebookLoginSuccess( params );
@@ -175,7 +174,7 @@
 
         const Char * token_str = authenticationToken.tokenString.UTF8String;
 
-        MENGINE_STRNCPY( _token, token_str, _capacity );
+        StdString::strncpy( _token, token_str, _capacity );
 
         return true;
     }
@@ -193,7 +192,7 @@
 
         const Char * userId_str = userId.UTF8String;
 
-        MENGINE_STRNCPY( _userId, userId_str, _capacity );
+        StdString::strncpy( _userId, userId_str, _capacity );
 
         return true;
     }
@@ -239,9 +238,11 @@
                 FBSDKShareLinkContent* content = [FBSDKShareLinkContent alloc];
                 content.contentURL = [NSURL URLWithString:strlink];
 
-                UIViewController * rootViewController = Helper::iOSGetRootViewController();
+                UIViewController * viewController = [iOSDetail getRootViewController];
 
-                FBSDKShareDialog * dialog = [FBSDKShareDialog dialogWithViewController:rootViewController withContent:content delegate:m_shareDelegate];
+                FBSDKShareDialog * dialog = [FBSDKShareDialog dialogWithViewController:viewController
+                                                                           withContent:content
+                                                                              delegate:m_shareDelegate];
 
                 [dialog show];
             });
@@ -304,9 +305,11 @@
             content.contentURL = [NSURL URLWithString:strlink];
             content.media =  @[sharePhoto];
 
-            UIViewController * rootViewController = Helper::iOSGetRootViewController();
+            UIViewController * viewController = [iOSDetail getRootViewController];
 
-            FBSDKShareDialog * const dialog = [FBSDKShareDialog dialogWithViewController:rootViewController withContent:content delegate:m_shareDelegate];
+            FBSDKShareDialog * const dialog = [FBSDKShareDialog dialogWithViewController:viewController
+                                                                             withContent:content
+                                                                                delegate:m_shareDelegate];
 
             [dialog show];
         });
@@ -338,7 +341,7 @@
                         }
                     }
 
-                    copy_provider->onFacebookProfilePictureLinkGetSuccess( userID_str, true, imageURL_str );
+                    copy_provider->onFacebookProfilePictureLinkGetSuccess( userID_str, imageURL_str );
                 });
             }
 
@@ -349,14 +352,14 @@
             if( _error != nil )
             {
                 LOGGER_ERROR( "get picture error: %s"
-                   , Helper::AppleGetMessageFromNSError(_error).c_str()
+                     , [[AppleDetail getMessageFromNSError:_error] UTF8String]
                 );
 
                 if( copy_provider != nullptr )
                 {
                     Helper::dispatchMainThreadEvent( [copy_provider, _error]() {
                         NSInteger error_code = _error.code;
-                        const Char * error_message = _error.localizedDescription.UTF8String;
+                        const Char * error_message = [_error.description UTF8String];
 
                         copy_provider->onFacebookProfilePictureLinkGetError( (int32_t)error_code, error_message );
                     });
@@ -415,7 +418,7 @@
                     NSString * imageURL = _profile.imageURL.absoluteURL.absoluteString;
                     const Char * imageURL_str = imageURL.UTF8String;
 
-                    copy_provider->onFacebookProfilePictureLinkGetSuccess( userID_str, true, imageURL_str );
+                    copy_provider->onFacebookProfilePictureLinkGetSuccess( userID_str, imageURL_str );
                 });
             }
         }];

src/Plugins/AppleFacebookPlugin/AppleFacebookShareDelegate.mm

@@ -31,7 +31,7 @@ - (void) sharer:(id <FBSDKSharing> _Nonnull) sharer didFailWithError:(NSError *
 
     Mengine::Helper::dispatchMainThreadEvent([copy_provider, error](){
         NSInteger code = error.code;
-        const char * message = error.localizedDescription.UTF8String;
+        const char * message = [error.description UTF8String];
 
         copy_provider->onFacebookShareError( (int32_t)code, message );
     });

src/Plugins/AppleFirebaseCrashlyticsPlugin/AppleFirebaseCrashlyticsService.mm

@@ -91,7 +91,7 @@
     void AppleFirebaseCrashlyticsService::recordError( NSError * _error )
     {
         LOGGER_MESSAGE( "record error: %s"
-           , [AppleDetail getMessageFromNSError:_error].c_str()
+            , [[AppleDetail getMessageFromNSError:_error] UTF8String]
         );
 
         [[FIRCrashlytics crashlytics] recordError:_error];

src/Plugins/AppleGameCenterPlugin/AppleGameCenterService.mm

@@ -61,7 +61,7 @@
                 m_achievementsComplete.clear();
 
                 LOGGER_ERROR( "login error: '%s'"
-                   , [AppleDetail getMessageFromNSError:_error].c_str()
+                    , [[AppleDetail getMessageFromNSError:_error] UTF8String]
                 );
 
                 if( copy_provider != nullptr )
@@ -106,7 +106,7 @@
                     m_achievementsSynchronization = false;
 
                     LOGGER_ERROR("load completed achievements error: '%s'"
-                       , [AppleDetail getMessageFromNSError:_error].c_str()
+                        , [[AppleDetail getMessageFromNSError:_error] UTF8String]
                     );
 
                     if( provider != nullptr )
@@ -175,7 +175,7 @@
                 LOGGER_ERROR( "response achievement '%s' [%lf] error: %s"
                    , copy_achievementName.c_str()
                    , _percentComplete
-                   , [AppleDetail getMessageFromNSError:_error].c_str()
+                   , [[AppleDetail getMessageFromNSError:_error] UTF8String]
                 );
 
                 Mengine::Helper::dispatchMainThreadEvent([copy_response]() {
@@ -231,7 +231,7 @@
             if( _error != nil )
             {
                 LOGGER_ERROR( "reset achievemnts error: '%s'"
-                   , [AppleDetail getMessageFromNSError:_error].c_str()
+                    , [[AppleDetail getMessageFromNSError:_error] UTF8String]
                 );
 
                 return;
@@ -268,7 +268,7 @@
                 LOGGER_ERROR( "response score '%s' [%lld] error: %s"
                    , copy_key.c_str()
                    , _score
-                   , [AppleDetail getMessageFromNSError:_error].c_str()
+                   , [[AppleDetail getMessageFromNSError:_error] UTF8String]
                 );
 
                 Mengine::Helper::dispatchMainThreadEvent([copy_response]() {

src/Plugins/AppleStoreInAppPurchasePlugin/AppleStoreInAppPurchasePaymentTransactionObserver.mm

@@ -148,7 +148,7 @@ - (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedW
     }
 
     LOGGER_MESSAGE( "SKPaymentTransactionObserver paymentQueue restoreCompletedTransactionsFailedWithError: %s"
-        , [AppleDetail getMessageFromNSError:error].c_str()
+        , [[AppleDetail getMessageFromNSError:error] UTF8String]
     );
 
     //ToDo
@@ -195,7 +195,7 @@ - (void)paymentQueue:(SKPaymentQueue *)queue didRevokeEntitlementsForProductIden
     }
 
     LOGGER_MESSAGE( "SKPaymentTransactionObserver didRevokeEntitlementsForProductIdentifiers: %s"
-        , [AppleDetail NSIdToString:productIdentifiers].c_str()
+        , [[AppleDetail NSIdToString:productIdentifiers] UTF8String]
     );
 
     //ToDo