Skip to content

Release 7.0.3-beta (archive StatusText fix) #1003

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

Merged
justcoding121 merged 3 commits into from
Aug 31, 2026
Merged

Release 7.0.3-beta (archive StatusText fix) #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55c9c2a
fix(inspector): keep archive export StatusText on UI sync context
justcoding121 Aug 31, 2026
44da346
fix(inspector): import archive StatusText on UI sync context
justcoding121 Aug 31, 2026
9103d6e
Merge pull request #1002 from justcoding121/fix/macos-export-archive-…
justcoding121 Aug 31, 2026
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
37 changes: 18 additions & 19 deletions src/Titanium.Inspector/ViewModels/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
}
}

if (last is not null)

Check warning on line 444 in src/Titanium.Inspector/ViewModels/MainWindowViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

Change this condition so that it does not always evaluate to 'True'.
{
throw last;
}
Expand Down Expand Up @@ -1274,7 +1274,7 @@
public bool SystemProxy
{
get => _systemProxy;
set // NOSONAR S4275 -- fail paths leave _systemProxy unchanged and re-raise PropertyChanged to snap the checkbox back

Check warning on line 1277 in src/Titanium.Inspector/ViewModels/MainWindowViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

Refactor this setter so that it actually refers to the field '_systemProxy'.
{
if (_systemProxy == value)
{
Expand Down Expand Up @@ -1409,7 +1409,7 @@
public bool DecryptHttps
{
get => _decryptHttps;
set // NOSONAR S4275 -- true path updates _decryptHttps via SetDecryptHttpsCore after async trust flow

Check warning on line 1412 in src/Titanium.Inspector/ViewModels/MainWindowViewModel.cs

View workflow job for this annotation

GitHub Actions / build 

Refactor this setter so that it actually refers to the field '_decryptHttps'.
{
if (_decryptHttpsBusy || _decryptHttps == value)
{
Expand Down Expand Up @@ -2345,8 +2345,11 @@
try
{
var sessions = _all.ToList();
await _store.EnsureBodiesLoadedAsync(sessions).ConfigureAwait(false);
await SessionArchive.ExportNativeArchiveAsync(sessions, path).ConfigureAwait(false);
// Stay on the UI sync context (RelayCommand). ConfigureAwait(false) + StatusText update
// raced with headless WaitUntil pumps on macOS (file written, StatusText stayed Ready).
StatusText = "Exporting archive…";
await _store.EnsureBodiesLoadedAsync(sessions);
await SessionArchive.ExportNativeArchiveAsync(sessions, path);
StatusText = $"Exported {sessions.Count} sessions to {path}";
}
catch (Exception ex)
Expand All @@ -2373,8 +2376,9 @@

try
{
await _store.EnsureBodiesLoadedAsync(sessions).ConfigureAwait(false);
await SessionArchive.ExportNativeArchiveAsync(sessions, path).ConfigureAwait(false);
StatusText = "Exporting archive…";
await _store.EnsureBodiesLoadedAsync(sessions);
await SessionArchive.ExportNativeArchiveAsync(sessions, path);
StatusText = $"Exported {sessions.Count} sessions to {path}";
}
catch (Exception ex)
Expand All @@ -2395,23 +2399,18 @@
StatusText = "Importing archive…";
try
{
// Off the UI sync context for zip IO so headless WaitUntil pumps cannot deadlock the import.
var imported = await SessionArchive.ImportNativeArchiveAsync(path).ConfigureAwait(false);
var count = imported.Count;
var fileName = Path.GetFileName(path);
await MarshalToUiAsync(() =>
// Stay on the UI sync context (RelayCommand). ConfigureAwait(false) + off-thread
// StatusText throws Avalonia "Call from invalid thread" on Windows CI, and
// nested MarshalToUiAsync StatusText updates flaked on macOS headless.
var imported = await SessionArchive.ImportNativeArchiveAsync(path);
foreach (var snap in imported)
{
foreach (var snap in imported)
{
_store.Add(snap);
}
_store.Add(snap);
}

ApplyFilter();
RefreshSessionCountText();
});
// Match ExportArchive: set StatusText after ConfigureAwait(false) without nesting it
// inside MarshalToUiAsync (StatusText remeasure was leaving "Importing…" stuck on macOS CI).
StatusText = $"Appended {count} sessions from {fileName}";
ApplyFilter();
RefreshSessionCountText();
StatusText = $"Appended {imported.Count} sessions from {Path.GetFileName(path)}";
}
catch (Exception ex)
{
Expand Down
16 changes: 11 additions & 5 deletions tests/Titanium.E2E.Tests/UiHeadless/AutomationIdCoverageHeadlessTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,20 @@ await fx.DispatchAsync(() =>
});

await fx.WaitUntilAsync(
() => fx.ViewModel.StatusText.Contains("Exported 1 sessions", StringComparison.Ordinal),
TimeSpan.FromSeconds(15));
() => fx.ViewModel.StatusText.Contains("Exported 1 sessions", StringComparison.Ordinal)
|| fx.ViewModel.StatusText.Contains("Export archive failed", StringComparison.Ordinal)
|| File.Exists(zip),
TimeSpan.FromSeconds(20));

await fx.DispatchAsync(() =>
{
Assert.IsTrue(fx.PathPicker.SaveCalls >= 1);
Assert.IsTrue(File.Exists(zip));
StringAssert.Contains(fx.ViewModel.StatusText, "Exported 1 sessions");
Assert.IsTrue(fx.PathPicker.SaveCalls >= 1, "Export path picker was not invoked");
Assert.IsTrue(
fx.ViewModel.StatusText.Contains("Exported 1 sessions", StringComparison.Ordinal)
|| File.Exists(zip),
"StatusText after export: " + fx.ViewModel.StatusText
+ "; zipExists=" + File.Exists(zip));
Assert.IsTrue(File.Exists(zip), "Export zip was not written");
});

// Import from a copy so any lingering exclusive handle on the export path cannot block macOS.
Expand Down
Loading