Merge pull request #29 from adjust/v4232

Version 4.23.2

Author: uerceg

CHANGELOG.md

@@ -1,3 +1,13 @@
+### Version 4.23.2 (11th November 2020)
+#### Added
+- Added [Flutter 1.2 or later](https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects) support for Android projects.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.23.2]
+- [[email protected]][android_sdk_v4.24.1]
+
+---
+
 ### Version 4.23.1 (31st August 2020)
 #### Fixed
 - Removed `iosPrefix` from `pubspec.yaml`.
@@ -18,8 +28,6 @@
 - Added sending of value of user's consent to be tracked with each package.
 - Added `setUrlStrategy` method to `AdjustConfig` class to allow selection of URL strategy for specific market.
 
-⚠️ **Note**: iOS 14 beta versions prior to 5 appear to have an issue when trying to use iAd framework API like described in [here](https://github.com/adjust/ios_sdk/issues/452). For testing of v4.23.0 version of SDK in iOS, please make sure you're using **iOS 14 beta 5 or later**.
-
 #### Native SDKs
 - [[email protected]][ios_sdk_v4.23.0]
 - [[email protected]][android_sdk_v4.24.0]
@@ -152,9 +160,11 @@
 [ios_sdk_v4.21.0]: https://github.com/adjust/ios_sdk/tree/v4.21.0
 [ios_sdk_v4.22.1]: https://github.com/adjust/ios_sdk/tree/v4.22.1
 [ios_sdk_v4.23.0]: https://github.com/adjust/ios_sdk/tree/v4.23.0
+[ios_sdk_v4.23.2]: https://github.com/adjust/ios_sdk/tree/v4.23.2
 
 [android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
 [android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0
 [android_sdk_v4.21.0]: https://github.com/adjust/android_sdk/tree/v4.21.0
 [android_sdk_v4.22.0]: https://github.com/adjust/android_sdk/tree/v4.22.0
-[android_sdk_v4.24.0]: https://github.com/adjust/android_sdk/tree/v4.24.0
+[android_sdk_v4.24.0]: https://github.com/adjust/android_sdk/tree/v4.24.0
+[android_sdk_v4.24.1]: https://github.com/adjust/android_sdk/tree/v4.24.1

README.md

@@ -93,7 +93,7 @@ You can add Adjust SDK to your Flutter app by adding following to your `pubspec.
 
 ```yaml
 dependencies:
-  adjust_sdk: ^4.23.1
+  adjust_sdk: ^4.23.2
 ```
 
 Then navigate to your project in the terminal and run:
@@ -387,13 +387,15 @@ Once everything set up, inside of your native Android activity make a call to `a
 
 ```java
 import com.adjust.sdk.flutter.AdjustSdk;
+import io.flutter.embedding.android.FlutterActivity; // Used for post flutter 1.12 Android projects
+//import io.flutter.app.FlutterActivity; // Used for pre flutter 1.12 Android projects
 
 public class MainActivity extends FlutterActivity {
     // Either call make the call in onCreate.
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        GeneratedPluginRegistrant.registerWith(this);
+        // GeneratedPluginRegistrant.registerWith(this); Used only for pre flutter 1.12 Android projects
 
         Intent intent = getIntent();
         Uri data = intent.getData();

VERSION

@@ -1 +1 @@
-4.23.1
+4.23.2

android/build.gradle

@@ -36,5 +36,5 @@ android {
 }
 
 dependencies {
-    api 'com.adjust.sdk:adjust-android:4.24.0'
+    api 'com.adjust.sdk:adjust-android:4.24.1'
 }

android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java

@@ -38,6 +38,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
@@ -46,15 +49,70 @@
 
 import static com.adjust.sdk.flutter.AdjustUtils.*;
 
-public class AdjustSdk implements MethodCallHandler {
+public class AdjustSdk implements FlutterPlugin, ActivityAware, MethodCallHandler {
     private static String TAG = "AdjustBridge";
     private static boolean launchDeferredDeeplink = true;
     private MethodChannel channel;
     private Context applicationContext;
+    private boolean v2Plugin;
+    private boolean v2Attached = false;
 
     AdjustSdk(MethodChannel channel, Context applicationContext) {
         this.channel = channel;
         this.applicationContext = applicationContext;
+
+        v2Plugin = false;
+    }
+
+    public AdjustSdk() {
+        v2Plugin = true;
+    }
+
+    // FlutterPlugin
+    @Override
+    public void onAttachedToEngine(FlutterPluginBinding binding) {
+        if (!v2Plugin) {
+            return;
+        }
+        if (v2Attached) {
+            return;
+        }
+
+        v2Attached = true;
+        applicationContext = binding.getApplicationContext();
+        channel = new MethodChannel(binding.getBinaryMessenger(), "com.adjust.sdk/api");
+        channel.setMethodCallHandler(this);
+    }
+
+    @Override
+    public void onDetachedFromEngine(FlutterPluginBinding binding) {
+        v2Attached = false;
+        applicationContext = null;
+        if (channel != null) {
+            channel.setMethodCallHandler(null);
+        }
+        channel = null;
+    }
+
+    // ActivityAware
+    @Override
+    public void onAttachedToActivity(ActivityPluginBinding binding) {
+        Adjust.onResume();
+    }
+
+    @Override
+    public void onDetachedFromActivityForConfigChanges() {
+    }
+
+    @Override
+    public void onReattachedToActivityForConfigChanges(
+        ActivityPluginBinding binding)
+    {
+    }
+
+    @Override
+    public void onDetachedFromActivity() {
+        Adjust.onPause();
     }
 
     // Plugin registration.

example/android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="example"
         android:icon="@mipmap/ic_launcher">
         <activity

ios/adjust_sdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'adjust_sdk'
-  s.version               = '4.23.1'
+  s.version               = '4.23.2'
   s.summary               = 'Adjust Flutter SDK for iOS platform'
   s.description           = <<-DESC
                             Adjust Flutter SDK for iOS platform.
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
 
   s.dependency 'Flutter'
-  s.dependency 'Adjust', '4.23.0'
+  s.dependency 'Adjust', '4.23.2'
 end

lib/adjust.dart

@@ -17,7 +17,7 @@ import 'package:adjust_sdk/adjust_app_store_subscription.dart';
 import 'package:adjust_sdk/adjust_play_store_subscription.dart';
 
 class Adjust {
-  static const String _sdkPrefix = 'flutter4.23.1';
+  static const String _sdkPrefix = 'flutter4.23.2';
   static const MethodChannel _channel = const MethodChannel('com.adjust.sdk/api');
 
   static void start(AdjustConfig config) {

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: 4.23.1
+version: 4.23.2
 
 environment:
     sdk: ">=2.0.0 <3.0.0"

test/android/src/main/java/com/adjust/test/lib/TestLibPlugin.java

@@ -12,6 +12,7 @@
 import android.os.Looper;
 import android.util.Log;
 
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -24,15 +25,49 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class TestLibPlugin implements MethodCallHandler {
+public class TestLibPlugin implements FlutterPlugin, MethodCallHandler {
     private static String TAG = "TestLibPlugin";
     private TestLibrary testLibrary = null;
     private MethodChannel channel;
+    private boolean v2Plugin;
+    private boolean v2Attached = false;
 
     private TestLibPlugin(MethodChannel channel) {
         this.channel = channel;
+
+        v2Plugin = false;
+    }
+
+    public TestLibPlugin() {
+        v2Plugin = true;
+    }
+
+    // FlutterPlugin
+    @Override
+    public void onAttachedToEngine(FlutterPluginBinding binding) {
+        if (!v2Plugin) {
+            return;
+        }
+        if (v2Attached) {
+            return;
+        }
+
+        v2Attached = true;
+
+        channel = new MethodChannel(binding.getBinaryMessenger(), "com.adjust.test.lib/api");
+        channel.setMethodCallHandler(this);
+    }
+
+    @Override
+    public void onDetachedFromEngine(FlutterPluginBinding binding) {
+        v2Attached = false;
+        if (channel != null) {
+            channel.setMethodCallHandler(null);
+        }
+        channel = null;
     }
 
+    // Plugin registration.
     public static void registerWith(Registrar registrar) {
         final MethodChannel channel = new MethodChannel(registrar.messenger(), "com.adjust.test.lib/api");
         channel.setMethodCallHandler(new TestLibPlugin(channel));