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.

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

[Android] Fix NavigationPage dispose crash when it parents a MasterDetailPage #577

Merged
merged 2 commits into from Dec 30, 2016

Conversation

Projects
None yet
5 participants
@adrianknight89
Contributor

adrianknight89 commented Nov 30, 2016

Description of Change

When a MasterDetailPage is nested under NavigationPage, hitting the back button triggers disposal of NavigationPage and results in a hard-crash.

Bugs Fixed

PR Checklist

  • Has tests (if omitted, state reason in description)
  • Rebased on top of master at time of PR
  • Changes adhere to coding standard
  • Consolidate commits as makes sense
@@ -173,13 +152,52 @@ protected override void Dispose(bool disposing)
if (_drawerLayout != null && _drawerListener != null)
{
_drawerLayout.RemoveDrawerListener(_drawerListener);

This comment has been minimized.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

The issue is _drawerLayout is disposed because of the above foreach loop. That block of code should be executed at the end so that we can remove drawer listeners safely before disposing the MDP.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

The issue is _drawerLayout is disposed because of the above foreach loop. That block of code should be executed at the end so that we can remove drawer listeners safely before disposing the MDP.

{
_backgroundDrawable.Dispose();
_backgroundDrawable = null;
}

This comment has been minimized.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

Dispose _backgroundDrawable in case it's not null.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

Dispose _backgroundDrawable in case it's not null.

@@ -173,13 +152,52 @@ protected override void Dispose(bool disposing)
if (_drawerLayout != null && _drawerListener != null)
{
_drawerLayout.RemoveDrawerListener(_drawerListener);
}
if (_drawerListener != null)

This comment has been minimized.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

This can be moved to its own if block since the previous _drawerLayout != null && _drawerListener != null may evaluate to false.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

This can be moved to its own if block since the previous _drawerLayout != null && _drawerListener != null may evaluate to false.

@@ -499,7 +514,7 @@ void RegisterToolbar()
if (renderer == null)
return;
_drawerLayout = (DrawerLayout)renderer;
_drawerLayout = renderer;

This comment has been minimized.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

renderer is always a DrawerLayout.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

renderer is always a DrawerLayout.

navController.PopToRootRequested -= OnPoppedToRoot;
navController.InsertPageBeforeRequested -= OnInsertPageBeforeRequested;
navController.RemovePageRequested -= OnRemovePageRequested;
}

This comment has been minimized.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

Execute this logic at the end.

@adrianknight89

adrianknight89 Nov 30, 2016

Contributor

Execute this logic at the end.

@hartez hartez self-assigned this Dec 8, 2016

@hartez

Looks good, just needs some minor changes.

@adrianknight89

This comment has been minimized.

Show comment
Hide comment
@adrianknight89

adrianknight89 Dec 30, 2016

Contributor

Done.

Contributor

adrianknight89 commented Dec 30, 2016

Done.

@hartez

hartez approved these changes Dec 30, 2016

@hartez

This comment has been minimized.

Show comment
Hide comment
@hartez

hartez Dec 30, 2016

Member

@adrianknight89 Sorry for the trouble, but could you rebase this? I think the .pfx files are out of date and it's failing to build (on our CI server).

Member

hartez commented Dec 30, 2016

@adrianknight89 Sorry for the trouble, but could you rebase this? I think the .pfx files are out of date and it's failing to build (on our CI server).

@adrianknight89

This comment has been minimized.

Show comment
Hide comment
@adrianknight89

adrianknight89 Dec 30, 2016

Contributor

Done.

Contributor

adrianknight89 commented Dec 30, 2016

Done.

@hartez

This comment has been minimized.

Show comment
Hide comment
@hartez
Member

hartez commented Dec 30, 2016

@adrianknight89 Thanks!

@hartez

This comment has been minimized.

Show comment
Hide comment
@hartez

hartez Dec 30, 2016

Member

Only failing test is the broken CellsGalleryImageUrlCellList test on iOS 10; not an issue with these changes.

Member

hartez commented Dec 30, 2016

Only failing test is the broken CellsGalleryImageUrlCellList test on iOS 10; not an issue with these changes.

@hartez hartez merged commit ee608ba into xamarin:master Dec 30, 2016

5 of 6 checks passed

iOS10-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Cycle 8 :: UI Tests :: OSX Test Cloud Package - Run iOS Unified iOS10 : Tests failed: 1,…
Details
Android-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Cycle 8 :: UI Tests :: OSX Test Cloud Package - Run Android 6.0.1 : Tests passed: 351, i…
Details
OSX-Debug-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Cycle 8 :: OSX Debug : Running
Details
Windows-Debug-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Cycle 8 :: Windows Debug : Tests passed: 3689, ignored: 10
Details
iOS8-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Cycle 8 :: UI Tests :: OSX Test Cloud Package - Run iOS Unified IOS8 : Tests passed: 344…
Details
iOS9-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Cycle 8 :: UI Tests :: OSX Test Cloud Package - Run iOS Unified iOS9 : Tests passed: 346…
Details

rookiejava added a commit to rookiejava/Xamarin.Forms that referenced this pull request Jan 9, 2017

[Android] Fix NavigationPage dispose crash when it parents a MasterDe…
…tailPage (xamarin#577)

* fix navigation page dispose crash

* changes after review

rmarinho added a commit that referenced this pull request Feb 2, 2017

Add pressed and released events to Button (#446)
* Add pressed and released events to Button

* Update ButtonRenderer.cs

* Apply safely casting to android button renderer

* Use safety casting for Android buttin renderer

* [Windows] Fix modal pages being laid out below soft buttons (#395)

* Add sample HanselForms and TwitterDemo to ControlGallery (#651)

* [Controls] Add Hanselforms sample

* Remove extra twitter sample

* [Controls]Add TwitterDemo sample

* [Controls] Fix build

* Slider should show user-set value on initial load (#378)

* [UWP] Use toolbar foreground color on primary items (#640)

* Avoid duplicating code in OmPlatform (#591)

* [iOS] Entry should not pass a newline to the next responder (#397)

* UITextField should not return so that the next field does not get passed a newline

* Added code sample

* [XamlC] import members on x:Static and factories (#642)

* [Xaml] support short Properties for PropertyCondition (#645)

* Xamlc compile data triggers (#648)

* [Xaml] DataTrigger and PropertyCondition no longer use a ServiceProvider

* [XamlC] avoid generating ServiceProvider for unused ProvideValue

* fix tests

* Fix comment typo

* [UWP] Fix TextBox style for foreground focus color (#618)

* Adding image to use for CellsGalleryImageUrlCellList UI test

* Update ImageCellListPage to use an image we control;
Update CellsGalleryImageUrlCellList test to wait longer than 1s for images
to load if necessary

* fix nre when changing content in datepickerselected (#494)

* Make CellsGalleryImageUrlCellList test finish early if possible

* [iOS] Change keyboard type while keyboard is visible (#443)

* Change keyboard while changing text

* add sample code

* [Android] Fix NavigationPage dispose crash when it parents a MasterDetailPage (#577)

* fix navigation page dispose crash

* changes after review

* [XamlC] detect duplicate x:Name at compile time (#655)

* [XamlC] detect duplicate x:Name at compile time

* invoking methods with the right arguments produces better results

* Make UWP toolbar display rules consistent with other platforms (#638)

* Allow subscriber to be collected if MessagingCenter is the only reference to it (#617)

* Repro

* Make messaging center callbacks weak references

* Preserve attribute

* Fix test method name

* Watch for collection of actual delegate target instead of wrapper delegate

* Preserve the original platform instance when changing main page

* Better tests for lambda situations

* Update tests, make callback target a weakreference if it's the subscriber

* Ensure old Platform MessagingCenter subs are gone before creating new Platform

* [iOS] Prevent multiple ListView cells from being swiped simultaneously (#578)

* disable multiple cell swipe

* add sample code

* refactored

* convert to weakreference

* remove null setting

* change weakreference setting place

* remove if

* revert isopen changes

* add instructions

* [WinRT/UWP] Apply BackgroundColor to Stepper buttons (#581)

* [WinRT/UWP] Apply BackgroundColor to Stepper buttons

* Add explanatory text; use nameof

* Move explanatory text to a label

* Return group instead of internal class (#461)

* [iOS/Android] Move Map camera to correct region on layout change (#548)

* Move to region on layout change

* remove visibility check

* [iOS] Platform specifics for controlling Picker SelectedIndex change behavior (#540)

* picker selected index could change when picker view is dismissed

* use enum

* [iOS] Ignore intermittent failing test on XTC (#666)

* [UITest] Update to UITest 2.0.5 (#665)

* Rebase the current branch onto upstream latest

@samhouts samhouts added this to the 2.5.1 milestone May 5, 2018

@samhouts samhouts modified the milestones: 2.5.1, 2.3.4 Jun 27, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment