Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-11-07 09:20:04 +01:00
Code Issues Projects Releases Wiki Activity

PM-3349 Added Window events unsubscription of events. Also changed code to avoid potentially having multiple autofillwindow

Browse Source
This commit is contained in:
Dinis Vieira 2023-12-18 22:56:21 +00:00
parent c3370b58ec
commit d4e75e9de8
No known key found for this signature in database
GPG Key ID: 9389160FF6C295F3
1 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/Core/App.xaml.cs
View File

@ -94,55 +94,64 @@ namespace Bit.App
return new Window(new NavigationPage()); //No actual page needed. Only used for auto-filling the fields directly (externally) return new Window(new NavigationPage()); //No actual page needed. Only used for auto-filling the fields directly (externally)
} }
//If there's already an existing autofill window we try to get rid of it, mostly to avoid edge cases scenarios.
if (_autofillWindow != null)
{
CloseWindow(_autofillWindow);
}
//"Internal" Autofill and Uri/Otp/CreateSend. This is where we create the autofill specific Window //"Internal" Autofill and Uri/Otp/CreateSend. This is where we create the autofill specific Window
if (Options != null && (Options.FromAutofillFramework || Options.Uri != null || Options.OtpData != null || Options.CreateSend != null)) if (Options != null && (Options.FromAutofillFramework || Options.Uri != null || Options.OtpData != null || Options.CreateSend != null))
{ {
_autofillWindow = new Window(new NavigationPage(new AndroidNavigationRedirectPage())); _autofillWindow = new Window(new NavigationPage(new AndroidNavigationRedirectPage()));
_autofillWindow.Created += (sender, args) => _autofillWindow.Created += WindowOnCreatedOrActivated;
{ _autofillWindow.Activated += WindowOnCreatedOrActivated;
CurrentWindow = _autofillWindow; _autofillWindow.Stopped += WindowOnStopped;
}; _autofillWindow.Destroying += AutofillWindowOnDestroying;
_autofillWindow.Activated += (sender, args) =>
{
CurrentWindow = _autofillWindow;
};
_autofillWindow.Stopped += (sender, args) =>
{
CurrentWindow = null;
};
_isResumed = true; _isResumed = true;
return _autofillWindow; return _autofillWindow;
} }
//If we run CreateWindow for a normal "mainWindow" we want to get rid of any existing _autofillWindow. //If we don't have an existing main window we create it, otherwise we just reuse the one we had.
//Mostly to avoid edge cases scenarios. if(_mainWindow == null)
if (_autofillWindow != null)
{ {
CloseWindow(_autofillWindow); _mainWindow = new Window(new NavigationPage(new HomePage(Options)));
_autofillWindow = null; _mainWindow.Created += WindowOnCreatedOrActivated;
_mainWindow.Activated += WindowOnCreatedOrActivated;
_mainWindow.Stopped += WindowOnStopped;
_mainWindow.Destroying += MainWindowOnDestroying;
} }
//If we already have a MainWindow we can try to reuse it.
if(_mainWindow != null)
{
return _mainWindow; return _mainWindow;
} }
//Default scenario where we create a MainWindow private void MainWindowOnDestroying(object sender, EventArgs e)
_mainWindow = new Window(new NavigationPage(new HomePage(Options)));
_mainWindow.Created += (sender, args) =>
{ {
CurrentWindow = _mainWindow; _mainWindow.Created -= WindowOnCreatedOrActivated;
}; _mainWindow.Activated -= WindowOnCreatedOrActivated;
_mainWindow.Activated += (sender, args) => _mainWindow.Stopped -= WindowOnStopped;
_mainWindow.Destroying -= AutofillWindowOnDestroying;
}
private void AutofillWindowOnDestroying(object sender, EventArgs e)
{ {
CurrentWindow = _mainWindow; _autofillWindow.Created -= WindowOnCreatedOrActivated;
}; _autofillWindow.Activated -= WindowOnCreatedOrActivated;
_mainWindow.Stopped += (sender, args) => _autofillWindow.Stopped -= WindowOnStopped;
_autofillWindow.Destroying -= AutofillWindowOnDestroying;
}
private void WindowOnStopped(object sender, EventArgs e)
{ {
CurrentWindow = null; CurrentWindow = null;
}; }
return _mainWindow;
private void WindowOnCreatedOrActivated(object sender, EventArgs e)
{
if (sender is Window window)
{
CurrentWindow = window;
}
} }
#elif IOS #elif IOS
//iOS doesn't use the CreateWindow override used in Android so we just set the Application.Current.MainPage directly //iOS doesn't use the CreateWindow override used in Android so we just set the Application.Current.MainPage directly