projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae72c0a)
Call the application OnResume, on Android Resume instead of Restart. (#7477) Fixes...
authorKevin Petit <kevin.petit@outlook.com>
Thu, 28 Nov 2019 11:53:41 +0000 (12:53 +0100)
committerRui Marinho <me@ruimarinho.net>
Thu, 28 Nov 2019 11:53:41 +0000 (11:53 +0000)
Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs patch | blob | history
Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs patch | blob | history

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
index 9673e65..aff6032 100644 (file)
--- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
@@ -446,7 +446,7 @@ namespace Xamarin.Forms.Platform.Android
 
                        if (_previousState == AndroidApplicationLifecycleState.OnCreate && _currentState == AndroidApplicationLifecycleState.OnStart)
                                _application.SendStart();
-                       else if (_previousState == AndroidApplicationLifecycleState.OnStop && _currentState == AndroidApplicationLifecycleState.OnRestart)
+                       else if (_previousState == AndroidApplicationLifecycleState.OnRestart && _currentState == AndroidApplicationLifecycleState.OnStart)     
                                _application.SendResume();
                        else if (_previousState == AndroidApplicationLifecycleState.OnPause && _currentState == AndroidApplicationLifecycleState.OnStop)
                                _application.SendSleep();
diff --git a/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs b/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
index 46303f6..631ff94 100644 (file)
--- a/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
+++ b/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
@@ -263,7 +263,7 @@ namespace Xamarin.Forms.Platform.Android
 
                        if (_previousState == AndroidApplicationLifecycleState.OnCreate && _currentState == AndroidApplicationLifecycleState.OnStart)
                                _application.SendStart();
-                       else if (_previousState == AndroidApplicationLifecycleState.OnStop && _currentState == AndroidApplicationLifecycleState.OnRestart)
+                       else if (_previousState == AndroidApplicationLifecycleState.OnRestart && _currentState == AndroidApplicationLifecycleState.OnStart)     
                                _application.SendResume();
                        else if (_previousState == AndroidApplicationLifecycleState.OnPause && _currentState == AndroidApplicationLifecycleState.OnStop)
                                _application.SendSleep();
Domain: Dotnet / UI;