Skip to content
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

Fixing memory leaks #706

Merged
merged 13 commits into from
Nov 13, 2021
Merged

Fixing memory leaks #706

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a2afbbb
Fix optionals in location requests
AAverin Jul 23, 2021
904cb88
Make sure onStyleLoaded callback is invoked when map is loaded and ready
AAverin Sep 11, 2021
7fd342b
Update iOS SDK
AAverin Oct 4, 2021
fb33f0e
Clear and dispose everything that could be holding references
AAverin Oct 4, 2021
6b184a7
Clear more of the platform argument callbacks
AAverin Oct 4, 2021
eebfc4a
Merge branch 'feature/389_disposing_controller' into local_master
AAverin Oct 4, 2021
86148d2
Clear method channel handler
AAverin Oct 4, 2021
ee12a09
Dispose leaking MapboxGLPlatform
AAverin Oct 4, 2021
e86ad17
Merge in #704 simplifying platform usage
stanlry Oct 5, 2021
06e041e
Merge branch 'master' into feature/389_disposing_controller
AAverin Oct 31, 2021
061acab
Bring back final modifiers to variables
AAverin Oct 31, 2021
fb7fa1c
Merge branch 'master' into feature/389_disposing_controller
AAverin Nov 4, 2021
f1a1aad
Merge branch 'master' into feature/389_disposing_controller
tobrun Nov 13, 2021
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
2 changes: 1 addition & 1 deletion ios/mapbox_gl.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A new Flutter plugin.
s.public_header_files = 'Classes/**/*.h'
s.dependency 'Flutter'
s.dependency 'MapboxAnnotationExtension', '~> 0.0.1-beta.1'
s.dependency 'Mapbox-iOS-SDK', '~> 6.3.0'
s.dependency 'Mapbox-iOS-SDK', '~> 6.4.0'
s.swift_version = '4.2'
s.ios.deployment_target = '9.0'
end
Expand Down
7 changes: 6 additions & 1 deletion lib/src/controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ class MapboxMapController extends ChangeNotifier {
}

final OnStyleLoadedCallback? onStyleLoadedCallback;

final OnMapClickCallback? onMapClick;
final OnMapLongClickCallback? onMapLongClick;

Expand Down Expand Up @@ -854,4 +853,10 @@ class MapboxMapController extends ChangeNotifier {
Future<double> getMetersPerPixelAtLatitude(double latitude) async {
return _mapboxGlPlatform.getMetersPerPixelAtLatitude(latitude);
}

@override
void dispose() {
super.dispose();
_mapboxGlPlatform.dispose();
}
}
9 changes: 9 additions & 0 deletions lib/src/mapbox_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,15 @@ class _MapboxMapState extends State<MapboxMap> {
_mapboxMapOptions = _MapboxMapOptions.fromWidget(widget);
}

@override
void dispose() async {
super.dispose();
if (_controller.isCompleted) {
final controller = await _controller.future;
controller.dispose();
}
}

@override
void didUpdateWidget(MapboxMap oldWidget) {
super.didUpdateWidget(oldWidget);
Expand Down
3 changes: 3 additions & 0 deletions mapbox_gl_platform_interface/lib/src/mapbox_gl_platform_interface.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,7 @@ abstract class MapboxGlPlatform {
throw UnimplementedError(
'getMetersPerPixelAtLatitude() has not been implemented.');
}

void dispose() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might want to convert this to be abstract

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The class is abstract already

}
}
6 changes: 6 additions & 0 deletions mapbox_gl_platform_interface/lib/src/method_channel_mapbox_gl.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,4 +719,10 @@ class MethodChannelMapboxGl extends MapboxGlPlatform {
return new Future.error(e);
}
}

@override
void dispose() {
super.dispose();
_channel.setMethodCallHandler(null);
}
}