36
36
import java .lang .reflect .Field ;
37
37
import java .lang .reflect .Modifier ;
38
38
import java .util .Collection ;
39
+ import java .util .List ;
39
40
40
41
import org .jetbrains .annotations .NonNls ;
41
42
import org .jetbrains .annotations .NotNull ;
@@ -59,24 +60,30 @@ public static boolean initializeAndDetectFlutter(@NotNull Project project) {
59
60
if (!FlutterModuleUtils .hasFlutterModule (project )) {
60
61
connection .subscribe (ModuleListener .TOPIC , new ModuleListener () {
61
62
@ Override
62
- public void moduleAdded (@ NotNull Project proj , @ NotNull Module mod ) {
63
- if (AndroidUtils .FLUTTER_MODULE_NAME .equals (mod .getName ()) ||
64
- (FlutterUtils .flutterGradleModuleName (project )).equals (mod .getName ())) {
65
- //connection.disconnect(); TODO(messick) Test this deletion!
66
- AppExecutorUtil .getAppExecutorService ().execute (() -> {
67
- GradleUtils .enableCoeditIfAddToAppDetected (project );
68
- });
63
+ public void modulesAdded (@ NotNull Project proj , @ NotNull List <? extends Module > modules ) {
64
+ for (Module module : modules ) {
65
+ if (module == null ) continue ;
66
+ if (AndroidUtils .FLUTTER_MODULE_NAME .equals (module .getName ()) ||
67
+ (FlutterUtils .flutterGradleModuleName (project )).equals (module .getName ())) {
68
+ //connection.disconnect(); TODO(messick) Test this deletion!
69
+ AppExecutorUtil .getAppExecutorService ().execute (() -> {
70
+ GradleUtils .enableCoeditIfAddToAppDetected (project );
71
+ });
72
+ }
69
73
}
74
+
70
75
}
71
76
});
72
77
return false ;
73
78
}
74
79
else {
75
80
Collection <ProjectType > projectTypes = ProjectTypeService .getProjectTypes (project );
76
- for (ProjectType projectType : projectTypes ) {
77
- if (projectType != null && "Android" .equals (projectType .getId ())) {
78
- // This is an add-to-app project.
79
- connection .subscribe (DebuggerManagerListener .TOPIC , makeAddToAppAttachListener (project ));
81
+ if (projectTypes != null ) {
82
+ for (ProjectType projectType : projectTypes ) {
83
+ if (projectType != null && "Android" .equals (projectType .getId ())) {
84
+ // This is an add-to-app project.
85
+ connection .subscribe (DebuggerManagerListener .TOPIC , makeAddToAppAttachListener (project ));
86
+ }
80
87
}
81
88
}
82
89
}
0 commit comments