Skip to content

Fix and improve Webdav and background sync behavior #3326

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
PhilippC merged 2 commits into from
Oct 14, 2026
Merged

Fix and improve Webdav and background sync behavior #3326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22601ca
store SSIDs in JSON instead of with join-character
PhilippC Oct 12, 2026
7f850cb
Merge pull request #3325 from PhilippC/bugfix/support-ssids-with-bar
PhilippC Oct 12, 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
21 changes: 19 additions & 2 deletions src/keepass2android-app/settings/SSIDManagerActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public class SSIDManagerActivity : AppCompatActivity
SSIDAdapter adapter;

const string PrefsName = "SSIDPrefs";
const string KeySSIDs = "SSIDs";
const string KeySSIDs = "SSIDs"; // legacy: '|'-separated
const string KeySSIDsJson = "SSIDsJson";

protected override void OnCreate(Bundle savedInstanceState)
{
Expand Down Expand Up @@ -96,6 +97,21 @@ void LoadSSIDs()
public static List<string> LoadSSIDS(Context context)
{
var prefs = context.GetSharedPreferences(PrefsName, FileCreationMode.Private);
var json = prefs.GetString(KeySSIDsJson, null);
if (json != null)
{
try
{
return System.Text.Json.JsonSerializer.Deserialize<List<string>>(json) ?? new List<string>();
}
catch (System.Text.Json.JsonException)
{
return new List<string>();
}
}

// legacy format (before SSIDs containing '|' were supported): '|'-separated list.
// Didn't work with SSIDs containing '|'
var ssids = prefs.GetString(KeySSIDs, "");
if (!string.IsNullOrEmpty(ssids))
return ssids.Split('|').ToList();
Expand All @@ -112,7 +128,8 @@ public static void SaveSSIDs(List<string> ssidList, Context context)
{
var prefs = context.GetSharedPreferences(PrefsName, FileCreationMode.Private);
var prefsEditor = prefs.Edit();
prefsEditor.PutString(KeySSIDs, string.Join("|", ssidList));
prefsEditor.PutString(KeySSIDsJson, System.Text.Json.JsonSerializer.Serialize(ssidList));
prefsEditor.Remove(KeySSIDs); // legacy key, superseded by KeySSIDsJson
prefsEditor.Commit();

}
Expand Down
Loading