Feature/ignore already initialized

android/build.gradle

@@ -45,5 +45,5 @@ artifacts.add("default", file('approov-sdk.aar'))
 
 dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    implementation 'io.approov:approov-android-sdk:3.3.0'
+    implementation 'io.approov:approov-android-sdk:3.4.0'
 }

android/src/main/java/com/criticalblue/approov_service_flutter_httpclient/ApproovHttpClientPlugin.java

@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.os.Looper;
 import android.os.Handler;
+import android.util.Log;
 
 import com.criticalblue.approovsdk.Approov;
 
@@ -181,19 +182,32 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
     if (call.method.equals("initialize")) {
       String initialConfig = call.argument("initialConfig");
       String commentString = call.argument("comment");
-      if ((initializedConfig == null) || !initializedConfig.equals(initialConfig) || (commentString != null)) {
-        // only actually initialize if we haven't before, if there is a change in the
-        // configuration provided or we have a comment to add to the initialization
+      if (commentString == null) {
+        commentString = "";
+      }
+      // check if initialization is permitted: no previous config or a
+      // comment starting with "reinit"
+      if (initializedConfig != null && !commentString.startsWith("reinit")) {
+        result.error("Approov.initialize", "ApproovService layer is already initialized.", null);
+        return;
+      }
+      if ((initializedConfig == null) || !initializedConfig.equals(initialConfig)) {
+        // this is a new config or a reinitialization
         try {
-          Approov.initialize(appContext, initialConfig, call.argument("updateConfig"), call.argument("comment"));
-          initializedConfig = initialConfig;
-          result.success(null);
+          initializedConfig = null;
+          Approov.initialize(appContext, initialConfig, call.argument("updateConfig"), commentString);
+        } catch (IllegalStateException e) {
+          // Log and ignore the error if the SDK is already initialized
+          Log.w("ApproovService", "Ignoring initialization error in Approov SDK: " + e.getLocalizedMessage());
         } catch(Exception e) {
-          result.error("Approov.initialize", e.getLocalizedMessage(), null);
+            result.error("Approov.initialize", e.getLocalizedMessage(), null);
+            return;
         }
-      } else {
-        // the previous initialization is compatible
+        initializedConfig = initialConfig;
         result.success(null);
+      } else {
+          // the previous initialization is compatible
+          result.success(null);
       }
     } else if (call.method.equals("fetchConfig")) {
       try {

ios/Classes/ApproovHttpClientPlugin.m

@@ -250,23 +250,38 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     if ([@"initialize" isEqualToString:call.method]) {
         NSError* error = nil;
         NSString *initialConfig = call.arguments[@"initialConfig"];
-        if ((_initializedConfig == nil) || ![_initializedConfig isEqualToString:initialConfig] || (call.arguments[@"comment"] != [NSNull null])) {
-            // only actually initialize if we haven't before, if there is a change in the
-            // configuration provided or thi is a new renitialization
+        NSString *comment = nil;
+        if (call.arguments[@"comment"] != [NSNull null])
+            comment = call.arguments[@"comment"];
+        else
+            comment = @"";
+        // check if initialization is permitted: no previous config or a
+        // comment starting with "reinit"
+        if ((_initializedConfig != nil) && ![comment hasPrefix:@"reinit"]) {
+            result([FlutterError errorWithCode:[NSString stringWithFormat:@"%d", -1]
+                message:@"ApproovService layer already initialized"
+                details:@"The ApproovService may only be reinitialized in specific circumstances"]);
+            return;
+        }
+        if ((_initializedConfig == nil) || ![_initializedConfig isEqualToString:initialConfig]) {
+            // this is a new config or a reinitialization
             NSString *updateConfig = nil;
             if (call.arguments[@"updateConfig"] != [NSNull null])
                 updateConfig = call.arguments[@"updateConfig"];
-            NSString *comment = nil;
-            if (call.arguments[@"comment"] != [NSNull null])
-                comment = call.arguments[@"comment"];
             [Approov initialize:initialConfig updateConfig:updateConfig comment:comment error:&error];
-            if (error == nil) {
-                _initializedConfig = initialConfig;
-                result(nil);
-            } else {
-                result([FlutterError errorWithCode:[NSString stringWithFormat:@"%ld", (long)error.code]
-                    message:error.domain details:error.localizedDescription]);
+            if (error != nil) {
+                // Check if the error message contains "Approov SDK already initialised"
+                if ([error.localizedDescription rangeOfString:@"Approov SDK already initialised" options:NSCaseInsensitiveSearch].location != NSNotFound) {
+                    NSLog(@"ApproovService: Ignoring initialization error in Approov SDK: %@", error.localizedDescription);
+                } else {
+                    result([FlutterError errorWithCode:[NSString stringWithFormat:@"%ld", (long)error.code]
+                                            message:error.domain
+                                            details:error.localizedDescription]);
+                    return;
+                }
             }
+            _initializedConfig = initialConfig;
+            result(nil);
         } else {
             // the previous initialization is compatible
             result(nil);

ios/approov_service_flutter_httpclient.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.source_files = 'Classes/**/*'
     s.public_header_files = 'Classes/**/*.h'
     s.dependency 'Flutter'
-    s.dependency 'approov-ios-sdk', '~> 3.3.1'
+    s.dependency 'approov-ios-sdk', '~> 3.4.0'
     s.platform = :ios, '12.0'
     # Flutter.framework does not contain an i386 slice.
     s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }