Skip to content

Android: Migrate to Flutter Android embedding v2 (fix build on Flutter 3.29+) #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VikasNadcab wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Android: Migrate to Flutter Android embedding v2 (fix build on Flutter 3.29+) #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8df1bb8
change regfistration
VikasNadcab Dec 11, 2025
5e95638
asd
VikasNadcab Dec 11, 2025
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 android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ rootProject.allprojects {
apply plugin: 'com.android.library'

android {
namespace 'com.bluechilli.flutteruploader'
compileSdkVersion 31

defaultConfig {
Expand Down
98 changes: 53 additions & 45 deletions android/src/main/java/com/bluechilli/flutteruploader/FlutterUploaderPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,52 @@
package com.bluechilli.flutteruploader;

import static com.bluechilli.flutteruploader.MethodCallHandlerImpl.FLUTTER_UPLOAD_WORK_TAG;

import android.content.Context;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.LiveData;
import androidx.work.WorkInfo;
import androidx.work.WorkManager;

import com.bluechilli.flutteruploader.plugin.CachingStreamHandler;
import com.bluechilli.flutteruploader.plugin.StatusListener;
import com.bluechilli.flutteruploader.plugin.UploadObserver;

import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.EventChannel;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.PluginRegistry.Registrar;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/** FlutterUploaderPlugin */
import static com.bluechilli.flutteruploader.MethodCallHandlerImpl.FLUTTER_UPLOAD_WORK_TAG;

/** FlutterUploaderPlugin - Fully migrated to Flutter Android v2 embedding */
public class FlutterUploaderPlugin implements FlutterPlugin, StatusListener {

private static final String CHANNEL_NAME = "flutter_uploader";
private static final String PROGRESS_EVENT_CHANNEL_NAME = "flutter_uploader/events/progress";
private static final String RESULT_EVENT_CHANNEL_NAME = "flutter_uploader/events/result";

private MethodChannel channel;
private MethodCallHandlerImpl methodCallHandler;
private UploadObserver uploadObserver;
private @Nullable MethodChannel methodChannel;
private @Nullable MethodCallHandlerImpl methodCallHandler;
private @Nullable UploadObserver uploadObserver;
private @Nullable LiveData<List<WorkInfo>> workInfoLiveData;

private EventChannel progressEventChannel;
private @Nullable EventChannel progressEventChannel;
private final CachingStreamHandler<Map<String, Object>> progressStreamHandler =
new CachingStreamHandler<>();

private EventChannel resultEventChannel;
private @Nullable EventChannel resultEventChannel;
private final CachingStreamHandler<Map<String, Object>> resultStreamHandler =
new CachingStreamHandler<>();
private LiveData<List<WorkInfo>> workInfoLiveData;

public static void registerWith(Registrar registrar) {
final FlutterUploaderPlugin plugin = new FlutterUploaderPlugin();
plugin.startListening(registrar.context(), registrar.messenger());
registrar.addViewDestroyListener(
view -> {
plugin.stopListening();
return false;
});
}

// ---------- FlutterPlugin Lifecycle ----------

@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
Expand All @@ -63,64 +58,77 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
stopListening();
}

// ---------- Setup & Teardown ----------

private void startListening(Context context, BinaryMessenger messenger) {
final int timeout = FlutterUploaderInitializer.getConnectionTimeout(context);

channel = new MethodChannel(messenger, CHANNEL_NAME);
// Method channel
methodChannel = new MethodChannel(messenger, CHANNEL_NAME);
methodCallHandler = new MethodCallHandlerImpl(context, timeout, this);
methodChannel.setMethodCallHandler(methodCallHandler);

// Observe WorkManager uploads
uploadObserver = new UploadObserver(this);
workInfoLiveData =
WorkManager.getInstance(context).getWorkInfosByTagLiveData(FLUTTER_UPLOAD_WORK_TAG);
workInfoLiveData = WorkManager.getInstance(context)
.getWorkInfosByTagLiveData(FLUTTER_UPLOAD_WORK_TAG);
workInfoLiveData.observeForever(uploadObserver);

channel.setMethodCallHandler(methodCallHandler);

// Progress event channel
progressEventChannel = new EventChannel(messenger, PROGRESS_EVENT_CHANNEL_NAME);
progressEventChannel.setStreamHandler(progressStreamHandler);

// Result event channel
resultEventChannel = new EventChannel(messenger, RESULT_EVENT_CHANNEL_NAME);
resultEventChannel.setStreamHandler(resultStreamHandler);
}

private void stopListening() {
channel.setMethodCallHandler(null);
channel = null;
// Method channel
if (methodChannel != null) {
methodChannel.setMethodCallHandler(null);
methodChannel = null;
}
methodCallHandler = null;

if (uploadObserver != null) {
// WorkManager observer
if (uploadObserver != null && workInfoLiveData != null) {
workInfoLiveData.removeObserver(uploadObserver);
workInfoLiveData = null;
uploadObserver = null;
}

methodCallHandler = null;

progressEventChannel.setStreamHandler(null);
progressEventChannel = null;

resultEventChannel.setStreamHandler(null);
resultEventChannel = null;
// Event channels
if (progressEventChannel != null) {
progressEventChannel.setStreamHandler(null);
progressEventChannel = null;
}
if (resultEventChannel != null) {
resultEventChannel.setStreamHandler(null);
resultEventChannel = null;
}

// Clear cached events
progressStreamHandler.clear();
resultStreamHandler.clear();
}

// ---------- StatusListener Callbacks ----------

@Override
public void onEnqueued(String id) {
Map<String, Object> args = new HashMap<>();
args.put("taskId", id);
args.put("status", UploadStatus.ENQUEUED);

resultStreamHandler.add(id, args);
}

@Override
public void onUpdateProgress(String id, int status, int progress) {
final Map<String, Object> args = new HashMap<>();
Map<String, Object> args = new HashMap<>();
args.put("taskId", id);
args.put("status", status);
args.put("progress", progress);

progressStreamHandler.add(id, args);
}

Expand All @@ -132,17 +140,16 @@ public void onFailed(
String code,
String message,
@Nullable String[] details) {

Map<String, Object> args = new HashMap<>();
args.put("taskId", id);
args.put("status", status);
args.put("statusCode", statusCode);
args.put("code", code);
args.put("message", message);
args.put(
"details",
details != null
? new ArrayList<>(Arrays.asList(details))
: Collections.<String>emptyList());
args.put("details", details != null
? new ArrayList<>(Arrays.asList(details))
: Collections.<String>emptyList());

resultStreamHandler.add(id, args);
}
Expand All @@ -154,12 +161,13 @@ public void onCompleted(
int statusCode,
String response,
@Nullable Map<String, String> headers) {

Map<String, Object> args = new HashMap<>();
args.put("taskId", id);
args.put("status", status);
args.put("statusCode", statusCode);
args.put("message", response);
args.put("headers", headers != null ? headers : Collections.<String, Object>emptyMap());
args.put("headers", headers != null ? headers : Collections.emptyMap());

resultStreamHandler.add(id, args);
}
Expand All @@ -169,4 +177,4 @@ public void onWorkPruned() {
progressStreamHandler.clear();
resultStreamHandler.clear();
}
}
}