Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Changelog
Version | Changes |
-- | -- |
2.5.9 | Migrated to latest Flutter release 3.29.0<br/>Enhance Memory Usage |
2.5.8 | Updated iOS SDK to 3.6.21 and Android SDK to 3.6.37 |
2.5.7 | Updated iOS SDK to 3.6.20 and Android SDK to 3.6.36 |
2.5.6 | Updated iOS SDK to 3.6.19 and Android SDK to 3.6.34 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import io.flutter.plugin.common.PluginRegistry.Registrar;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
Expand All @@ -34,7 +33,7 @@
* FlutterUxcamPlugin
*/
public class FlutterUxcamPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware {
private static final String TYPE_VERSION = "2.5.8";
private static final String TYPE_VERSION = "2.5.9";
public static final String TAG = "FlutterUXCam";
public static final String USER_APP_KEY = "userAppKey";
public static final String ENABLE_INTEGRATION_LOGGING = "enableIntegrationLogging";
Expand All @@ -58,51 +57,55 @@ public class FlutterUxcamPlugin implements MethodCallHandler, FlutterPlugin, Act
/**
* Plugin registration.
*/
private static Activity activity;

public static void registerWith(Registrar registrar) {
activity = registrar.activity();
register(registrar.messenger());
}
private MethodChannel channel;
private Activity activity;
private ActivityPluginBinding activityBinding;

@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
register(binding.getBinaryMessenger());
channel = new MethodChannel(binding.getBinaryMessenger(), "flutter_uxcam");
channel.setMethodCallHandler(this);
}

@Override
public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
if (channel != null) {
channel.setMethodCallHandler(null);
channel = null;
}
}

public static void register(BinaryMessenger messenger) {
final MethodChannel channel = new MethodChannel(messenger, "flutter_uxcam");
channel.setMethodCallHandler(new FlutterUxcamPlugin());
}


@Override
public void onAttachedToActivity(ActivityPluginBinding activityPluginBinding) {
public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) {
activity = activityPluginBinding.getActivity();
activityBinding = activityPluginBinding;
}

@Override
public void onDetachedFromActivityForConfigChanges() {
onDetachedFromActivity();
}

@Override
public void onReattachedToActivityForConfigChanges(ActivityPluginBinding activityPluginBinding) {
activity = activityPluginBinding.getActivity();
public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding activityPluginBinding) {
onAttachedToActivity(activityPluginBinding);
}

@Override
public void onDetachedFromActivity() {
activity = null;
activityBinding = null;
}

@Override
public void onMethodCall(MethodCall call, Result result) {
public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
if (call.method.equals("getPlatformVersion")) {
result.success("Android " + Build.VERSION.RELEASE);
} else if (call.method.equals("startWithKey")) {
if (activity == null) {
result.error("Activity not attached", "Cannot start UXCam without an activity", null);
return;
}
String key = call.argument("key");
UXCam.startApplicationWithKeyForCordova(activity, key);
addListener(result);
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
dependencies:
flutter:
sdk: flutter
stack_trace: ^1.11.1
stack_trace: ^1.12.1
visibility_detector: ^0.4.0+2

# For information on the generic Dart part of this file, see the
Expand Down