From 2a28047767ba229dcf951de6d4687d7a783fc1d6 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 16 May 2026 06:54:05 +0200 Subject: [PATCH] Prevent NULL account name --- app/src/main/java/eu/faircode/email/FragmentOAuth.java | 5 ++++- app/src/main/java/eu/faircode/email/FragmentQuickSetup.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index b602b773b8..e2a1601918 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -986,7 +986,10 @@ public class FragmentOAuth extends FragmentBase { int at = account.user.indexOf('@'); String user = account.user.substring(0, at); - account.name = provider.name + "/" + user; + if (TextUtils.isEmpty(provider.name)) + account.name = account.user; + else + account.name = provider.name + "/" + user; account.synchronize = true; account.primary = (primary == null); diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java index 52818bf2a2..c8d7790a9f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -621,7 +621,10 @@ public class FragmentQuickSetup extends FragmentBase { account.password = password; account.fingerprint = imap_fingerprint; - account.name = provider.name + "/" + username; + if (TextUtils.isEmpty(provider.name)) + account.name = email; + else + account.name = provider.name + "/" + username; account.synchronize = true; account.primary = (primary == null);