Skip to content

Commit 186cb9f

Browse files
ivo.liondovivolz
authored andcommitted
Check comment is present during initialization at native level
1 parent f830712 commit 186cb9f

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
7474
public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
7575
if (call.method.equals("initialize")) {
7676
String initialConfig = call.argument("initialConfig");
77-
if ((initializedConfig == null) || !initializedConfig.equals(initialConfig)) {
78-
// only actually initialize if we haven't before or if there is a change in the
79-
// configuration provided
77+
String commentString = call.argument("comment");
78+
if ((initializedConfig == null) || !initializedConfig.equals(initialConfig) || (commentString != null)) {
79+
// only actually initialize if we haven't before, if there is a change in the
80+
// configuration provided or we have a comment to add to the initialization
8081
try {
8182
Approov.initialize(appContext, initialConfig, call.argument("updateConfig"), call.argument("comment"));
8283
initializedConfig = initialConfig;

ios/Classes/ApproovHttpClientPlugin.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
102102
if ([@"initialize" isEqualToString:call.method]) {
103103
NSError* error = nil;
104104
NSString *initialConfig = call.arguments[@"initialConfig"];
105-
if ((_initializedConfig == nil) || ![_initializedConfig isEqualToString:initialConfig]) {
106-
// only actually initialize if we haven't before or if there is a change in the
107-
// configuration provided
105+
if ((_initializedConfig == nil) || ![_initializedConfig isEqualToString:initialConfig] || (call.arguments[@"comment"] != [NSNull null])) {
106+
// only actually initialize if we haven't before, if there is a change in the
107+
// configuration provided or thi is a new renitialization
108108
NSString *updateConfig = nil;
109109
if (call.arguments[@"updateConfig"] != [NSNull null])
110110
updateConfig = call.arguments[@"updateConfig"];

0 commit comments

Comments
 (0)