Skip to content

Finish HT-side implementation of sync-interrupted scenario (HT-508) #338

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

Draft
wmergenthal wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Finish HT-side implementation of sync-interrupted scenario (HT-508) #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fa56d3
HT now sends 'sync_interrupted' when a sync is cancelled before compl…
wmergenthal Aug 25, 2025
3e83c01
PR preparation: remove unneeded diffs
wmergenthal Aug 27, 2025
d0c0115
HT-508: finish HT-side implementation of sync-interrupted scenario
wmergenthal Aug 28, 2025
163fd96
Add minHtaVersion
wmergenthal Oct 1, 2025
e441ef5
Safety commit: watchdog works, debug info shows sync activities
wmergenthal Oct 1, 2025
6c4a107
Merge branch 'master' into sync-notification-for-cancel
tombogle Jan 16, 2026
4cc6b7a
Cleanup to enable PR acceptance
wmergenthal Feb 7, 2026
96b4481
Revert some added 'l' chars, update copyright dates
wmergenthal Feb 9, 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
16 changes: 11 additions & 5 deletions src/HearThis/Communication/AndroidLink.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// --------------------------------------------------------------------------------------------
#region // Copyright (c) 2014-2025, SIL Global.
// <copyright from='2014' to='2025' company='SIL Global'>
// Copyright (c) 2014-2025, SIL Global.
#region // Copyright (c) 2014-2026, SIL Global.
// <copyright from='2014' to='2026' company='SIL Global'>
// Copyright (c) 2014-2026, SIL Global.
//
// Distributable under the terms of the MIT License (https://sil.mit-license.org/)
// </copyright>
#endregion
// --------------------------------------------------------------------------------------------
using System;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Text;
Expand Down Expand Up @@ -133,10 +134,15 @@ public bool PutFile(string androidPath, byte[] data)
return true;
}

public bool SendNotification(string message)
public bool SendNotification(string status)
{
// Send sync status to Android.
// Note: commenting out the UploadData() call here causes HearThis to never
// finish the sync in progress. This is a convenient way to provoke and measure
// a timeout on the Android.
WebClient myClient = new WebClient();
myClient.UploadData(_address + "/notify?message=" + Uri.EscapeDataString(message), new byte[] {0});
myClient.UploadData(_address + "/notify?status=" + Uri.EscapeDataString(status), new byte[] {0});

return true;
}

Expand Down
24 changes: 12 additions & 12 deletions src/HearThis/Communication/AndroidSynchronization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
// --------------------------------------------------------------------------------------------
#region // Copyright (c) 2016-2025, SIL Global.
// <copyright from='2016' to='2025' company='SIL Global'>
// Copyright (c) 2016-2025, SIL Global.
#region // Copyright (c) 2016-2026, SIL Global.
// <copyright from='2016' to='2026' company='SIL Global'>
// Copyright (c) 2016-2026, SIL Global.
//
// Distributable under the terms of the MIT License (https://sil.mit-license.org/)
// </copyright>
#endregion
// --------------------------------------------------------------------------------------------
using DesktopAnalytics;
using HearThis.Script;
using HearThis.UI;
using L10NSharp;
using SIL.IO;
using System;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.Sockets;
using System.Threading.Tasks;
using System.Windows.Forms;
using DesktopAnalytics;
using HearThis.Script;
using HearThis.UI;
using L10NSharp;
using SIL.IO;
using static System.String;
using static HearThis.Communication.PreferredNetworkInterfaceResolver;
using static System.String;

namespace HearThis.Communication
{
Expand Down Expand Up @@ -137,10 +138,9 @@ bool RetryOnTimeout(WebException ex, string path)
}
else
{
// TODO (HT-508): Send a specific notification so HTA knows the sync was
// HT-508: Send a specific notification so HTA knows the sync was
// interrupted.
// theirLink.SendNotification("sync_interrupted");
theirLink.SendNotification("sync_success");
theirLink.SendNotification("sync_canceled");
dlg.ProgressBox.WriteMessage(LocalizationManager.GetString(
"AndroidSynchronization.Progress.Canceled",
"Sync was canceled by the user."));
Expand Down
2 changes: 1 addition & 1 deletion src/HearThis/Communication/PreferredNetworkInterfaceResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public IPAddress GetBestActiveInterface(out FailureReason failureReason)
// Of these, we care only about Wi-Fi and Ethernet.
if (ni.Type == Wireless80211)
{
// We always assume that wireless is better than wired, so once we get a
// We always assume that wireless is preferred over wired, so once we get a
// Wi-Fi candidate, we ignore any subsequent Ethernet candidates.
RememberBestInterface(ref wifiInterface, ni, ip, interfaceIndex);
}
Expand Down
23 changes: 12 additions & 11 deletions src/HearThis/Script/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
// --------------------------------------------------------------------------------------------
#region // Copyright (c) 2011-2025, SIL Global.
// <copyright from='2011' to='2025' company='SIL Global'>
// Copyright (c) 2011-2025, SIL Global.
#region // Copyright (c) 2011-2026, SIL Global.
// <copyright from='2011' to='2026' company='SIL Global'>
// Copyright (c) 2011-2026, SIL Global.
//
// Distributable under the terms of the MIT License (https://sil.mit-license.org/)
// </copyright>
#endregion
// --------------------------------------------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using DesktopAnalytics;
using HearThis.Properties;
using HearThis.Publishing;
using L10NSharp;
using SIL.IO;
using SIL.Reporting;
using static HearThis.Script.BibleStatsBase;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using static HearThis.Program;
using static System.String;
using static HearThis.SafeSettings;
using static HearThis.Script.BibleStatsBase;
using static System.String;

namespace HearThis.Script
{
Expand Down
17 changes: 9 additions & 8 deletions src/HearThis/UI/AndroidSyncDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
// --------------------------------------------------------------------------------------------
#region // Copyright (c) 2015-2025, SIL Global.
// <copyright from='2015' to='2025' company='SIL Global'>
// Copyright (c) 2015-2025, SIL Global.
#region // Copyright (c) 2015-2026, SIL Global.
// <copyright from='2015' to='2026' company='SIL Global'>
// Copyright (c) 2015-2026, SIL Global.
//
// Distributable under the terms of the MIT License (https://sil.mit-license.org/)
// </copyright>
#endregion
// --------------------------------------------------------------------------------------------
using L10NSharp;
using SIL.Reporting;
using SIL.Windows.Forms.Extensions;
using SIL.Windows.Forms.Progress;
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Windows.Forms;
using L10NSharp;
using SIL.Reporting;
using SIL.Windows.Forms.Extensions;
using SIL.Windows.Forms.Progress;
using ZXing;
using static SIL.Windows.Forms.Extensions.ControlExtensions.ErrorHandlingAction;
using static System.String;
using static System.Windows.Forms.MessageBoxButtons;
using static SIL.Windows.Forms.Extensions.ControlExtensions.ErrorHandlingAction;

namespace HearThis.UI
{
Expand Down