Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugin.common.PluginRegistry.Registrar;

import static android.app.Activity.RESULT_CANCELED;
import static android.provider.ContactsContract.CommonDataKinds;
Expand All @@ -66,15 +65,7 @@ public class ContactsServicePlugin implements MethodCallHandler, FlutterPlugin,
private final ExecutorService executor =
new ThreadPoolExecutor(0, 10, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(1000));

private void initDelegateWithRegister(Registrar registrar) {
this.delegate = new ContactServiceDelegateOld(registrar);
}

public static void registerWith(Registrar registrar) {
ContactsServicePlugin instance = new ContactsServicePlugin();
instance.initInstance(registrar.messenger(), registrar.context());
instance.initDelegateWithRegister(registrar);
}

private void initInstance(BinaryMessenger messenger, Context context) {
methodChannel = new MethodChannel(messenger, "github.com/clovisnicolas/flutter_contacts");
Expand Down Expand Up @@ -383,23 +374,6 @@ private void openDeviceContactPicker(Result result, boolean localizedLabels) {
}
}

private class ContactServiceDelegateOld extends BaseContactsServiceDelegate {
private final PluginRegistry.Registrar registrar;

ContactServiceDelegateOld(PluginRegistry.Registrar registrar) {
this.registrar = registrar;
registrar.addActivityResultListener(this);
}

@Override
void startIntent(Intent intent, int request) {
if (registrar.activity() != null) {
registrar.activity().startActivityForResult(intent, request);
} else {
registrar.context().startActivity(intent);
}
}
}

private class ContactServiceDelegate extends BaseContactsServiceDelegate {
private final Context context;
Expand Down