Merge pull request #161 from adjust/v511

uerceg · web-flow · commit 57feeb45049e · 2025-03-05T17:38:12.000+01:00
Version 5.1.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### Version 5.1.1 (March 5th 2025)
+#### Fixed
+- Fixed crashes happening in cases where native iOS `jsonResponse` is `nil` (https://github.com/adjust/flutter_sdk/pull/160).
+
+#### Native SDKs
+- [iOS@v5.1.1][ios_sdk_v5.1.1]
+- [Android@v5.1.0][android_sdk_v5.1.0]
+
+---
+
 ### Version 5.1.0 (25th February 2025)
 #### Added
 - Added `jsonResponse` field (JSON string) to `AdjustAttribution` where every key-value pair sent by the backend as part of the attribution response can be found.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.1.0
+5.1.1
diff --git a/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java b/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java
@@ -423,7 +423,9 @@ public void onAttributionChanged(AdjustAttribution adjustAttribution) {
                                 adjustAttribution.costAmount.toString() : "");
                         adjustAttributionMap.put("costCurrency", adjustAttribution.costCurrency);
                         adjustAttributionMap.put("fbInstallReferrer", adjustAttribution.fbInstallReferrer);
-                        adjustAttributionMap.put("jsonResponse", adjustAttribution.jsonResponse);
+                        if (adjustAttribution.jsonResponse != null) {
+                            adjustAttributionMap.put("jsonResponse", adjustAttribution.jsonResponse);
+                        }
                         if (channel != null) {
                             channel.invokeMethod(dartMethodName, adjustAttributionMap);
                         }
@@ -721,7 +723,7 @@ private void gdprForgetMe(final Result result) {
     private void getAttribution(final Result result) {
         Adjust.getAttribution(new OnAttributionReadListener() {
             @Override
-            public void onAttributionRead(AdjustAttribution attribution){
+            public void onAttributionRead(AdjustAttribution attribution) {
                 HashMap<String, String> adjustAttributionMap = new HashMap<String, String>();
                 adjustAttributionMap.put("trackerToken", attribution.trackerToken);
                 adjustAttributionMap.put("trackerName", attribution.trackerName);
@@ -735,7 +737,9 @@ public void onAttributionRead(AdjustAttribution attribution){
                         attribution.costAmount.toString() : "");
                 adjustAttributionMap.put("costCurrency", attribution.costCurrency);
                 adjustAttributionMap.put("fbInstallReferrer", attribution.fbInstallReferrer);
-                adjustAttributionMap.put("jsonResponse", attribution.jsonResponse);
+                if (attribution.jsonResponse != null) {
+                    adjustAttributionMap.put("jsonResponse", attribution.jsonResponse);
+                }
                 result.success(adjustAttributionMap);
             }
         });
diff --git a/ios/Classes/AdjustSdk.m b/ios/Classes/AdjustSdk.m
@@ -267,7 +267,7 @@ - (void)initSdk:(FlutterMethodCall *)call withResult:(FlutterResult)result {
             [adjustConfig disableIdfvReading];
         }
     }
-    
+
     // SKAdNetwork attribution
     if ([self isFieldValid:isSkanAttributionEnabled]) {
         if ([isSkanAttributionEnabled boolValue] == NO) {
@@ -419,7 +419,7 @@ - (void)processDeeplink:(FlutterMethodCall *)call withResult:(FlutterResult)resu
     if (urlString == nil) {
         return;
     }
-    
+
     NSURL *url = [NSURL URLWithString:urlString];
     ADJDeeplink *deeplink = [[ADJDeeplink alloc] initWithDeeplink:url];
     [Adjust processDeeplink:deeplink];
@@ -456,12 +456,12 @@ - (void)trackAdRevenue:(FlutterMethodCall *)call withResult:(FlutterResult)resul
     if ([self isFieldValid:adRevenueNetwork]) {
         [adjustAdRevenue setAdRevenueNetwork:adRevenueNetwork];
     }
-    
+
     // ad revenue unit
     if ([self isFieldValid:adRevenueUnit]) {
         [adjustAdRevenue setAdRevenueUnit:adRevenueUnit];
     }
-    
+
     // ad revenue placement
     if ([self isFieldValid:adRevenuePlacement]) {
         [adjustAdRevenue setAdRevenuePlacement:adRevenuePlacement];
@@ -576,13 +576,19 @@ - (void)getAttribution:(FlutterMethodCall *)call withResult:(FlutterResult)resul
         [self addValueOrEmpty:attribution.costType withKey:@"costType" toDictionary:dictionary];
         [self addNumberOrEmpty:attribution.costAmount withKey:@"costAmount" toDictionary:dictionary];
         [self addValueOrEmpty:attribution.costCurrency withKey:@"costCurrency" toDictionary:dictionary];
-        NSData *dataJsonResponse = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse
+
+        // Add nil check before serializing jsonResponse
+        if (attribution.jsonResponse != nil) {
+            NSData *dataJsonResponse = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse
                                                                    options:0
                                                                      error:nil];
-        NSString *stringJsonResponse = [[NSString alloc] initWithBytes:[dataJsonResponse bytes]
+            NSString *stringJsonResponse = [[NSString alloc] initWithBytes:[dataJsonResponse bytes]
                                                                 length:[dataJsonResponse length]
                                                               encoding:NSUTF8StringEncoding];
-        [self addValueOrEmpty:stringJsonResponse withKey:@"jsonResponse" toDictionary:dictionary];
+            [self addValueOrEmpty:stringJsonResponse withKey:@"jsonResponse" toDictionary:dictionary];
+        } else {
+            [self addValueOrEmpty:@"" withKey:@"jsonResponse" toDictionary:dictionary];
+        }
         result(dictionary);
     }];
 }
@@ -687,7 +693,7 @@ - (void)verifyAppStorePurchase:(FlutterMethodCall *)call withResult:(FlutterResu
         if (verificationResult == nil) {
             result(dictionary);
         }
-        
+
         [self addValueOrEmpty:verificationResult.verificationStatus
                       withKey:@"verificationStatus"
                  toDictionary:dictionary];
@@ -788,7 +794,7 @@ - (void)verifyAndTrackAppStorePurchase:(FlutterMethodCall *)call withResult:(Flu
         if (verificationResult == nil) {
             result(dictionary);
         }
-        
+
         [self addValueOrEmpty:verificationResult.verificationStatus
                       withKey:@"verificationStatus"
                  toDictionary:dictionary];
diff --git a/ios/Classes/AdjustSdkDelegate.m b/ios/Classes/AdjustSdkDelegate.m
@@ -44,7 +44,7 @@ + (id)getInstanceWithSwizzleOfAttributionCallback:(NSString *)swizzleAttribution
                                     methodChannel:(FlutterMethodChannel *)channel {
     dispatch_once(&onceToken, ^{
         defaultInstance = [[AdjustSdkDelegate alloc] init];
-        
+
         // do the swizzling where and if needed
         if (swizzleAttributionCallback != nil) {
             [defaultInstance swizzleCallbackMethod:@selector(adjustAttributionChanged:)
@@ -107,7 +107,7 @@ - (void)adjustAttributionChangedWannabe:(ADJAttribution *)attribution {
     if (nil == attribution || nil == dartAttributionCallback) {
         return;
     }
-    
+
     id keys[] = {
         @"trackerToken",
         @"trackerName",
@@ -121,12 +121,18 @@ - (void)adjustAttributionChangedWannabe:(ADJAttribution *)attribution {
         @"costCurrency",
         @"jsonResponse"
     };
-    NSData *dataJsonResponse = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse
-                                                               options:0
-                                                                 error:nil];
-    NSString *stringJsonResponse = [[NSString alloc] initWithBytes:[dataJsonResponse bytes]
-                                                            length:[dataJsonResponse length]
-                                                          encoding:NSUTF8StringEncoding];
+
+    // Add nil check before serializing jsonResponse
+    NSString *strJsonResponse = nil;
+    if (attribution.jsonResponse != nil) {
+        NSData *dataJsonResponse = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse
+                                                                   options:0
+                                                                     error:nil];
+        strJsonResponse = [[NSString alloc] initWithBytes:[dataJsonResponse bytes]
+                                                   length:[dataJsonResponse length]
+                                                 encoding:NSUTF8StringEncoding];
+    }
+
     id values[] = {
         [self getValueOrEmpty:[attribution trackerToken]],
         [self getValueOrEmpty:[attribution trackerName]],
@@ -138,7 +144,7 @@ - (void)adjustAttributionChangedWannabe:(ADJAttribution *)attribution {
         [self getValueOrEmpty:[attribution costType]],
         [self getNumberValueOrEmpty:[attribution costAmount]],
         [self getValueOrEmpty:[attribution costCurrency]],
-        [self getValueOrEmpty:stringJsonResponse]
+        [self getValueOrEmpty:strJsonResponse]
     };
     NSUInteger count = sizeof(values) / sizeof(id);
     NSDictionary *attributionMap = [NSDictionary dictionaryWithObjects:values
@@ -202,7 +208,7 @@ - (void)adjustEventTrackingSucceededWannabe:(ADJEventSuccess *)eventSuccessRespo
     if (nil == eventSuccessResponseData || nil == dartEventSuccessCallback) {
         return;
     }
-    
+
     id keys[] = {
         @"message",
         @"timestamp",
diff --git a/ios/adjust_sdk.podspec b/ios/adjust_sdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'adjust_sdk'
-  s.version               = '5.1.0'
+  s.version               = '5.1.1'
   s.summary               = 'Adjust Flutter SDK for iOS platform'
   s.description           = <<-DESC
                             Adjust Flutter SDK for iOS platform.
diff --git a/lib/adjust.dart b/lib/adjust.dart
@@ -24,7 +24,7 @@ import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
 class Adjust {
-  static const String _sdkPrefix = 'flutter5.1.0';
+  static const String _sdkPrefix = 'flutter5.1.1';
   static const MethodChannel _channel =
       const MethodChannel('com.adjust.sdk/api');
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: adjust_sdk
 description: This is the Flutter SDK of Adjust™. You can read more about Adjust™ at adjust.com.
 homepage: https://github.com/adjust/flutter_sdk
-version: 5.1.0
+version: 5.1.1
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/test/app/lib/main.dart b/test/app/lib/main.dart
@@ -26,13 +26,13 @@ class _MyAppState extends State<MyApp> {
     super.initState();
 
     if (Platform.isAndroid) {
-      String _address = '192.168.2.46';
+      String _address = '192.168.86.187';
       String _protocol = 'https';
       String _port = '8443';
       _overwriteUrl = _protocol + '://' + _address + ':' + _port;
       _controlUrl = 'ws://' + _address + ':1987';
     } else {
-      String _address = '192.168.2.46';
+      String _address = '192.168.86.187';
       String _protocol = 'http';
       String _port = '8080';
       _overwriteUrl = _protocol + '://' + _address + ':' + _port;
diff --git a/test/ios/test_lib.podspec b/test/ios/test_lib.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'test_lib'
-  s.version               = '5.1.0'
+  s.version               = '5.1.1'
   s.summary               = 'Adjust test library for iOS platform'
   s.description           = <<-DESC
                             Adjust test library for iOS platform.
diff --git a/test/pubspec.yaml b/test/pubspec.yaml
@@ -1,6 +1,6 @@
 name: test_lib
 description: Flutter plugin for Adjust Testing Library. Intended exclusively for internal use.
-version: 5.1.0
+version: 5.1.1
 author: Adjust (sdk@adjust.com)
 
 environment:
