Prevent NULL account name

master
M66B 4 months ago
parent 3d245d7399
commit 2a28047767

@ -986,7 +986,10 @@ public class FragmentOAuth extends FragmentBase {
int at = account.user.indexOf('@'); int at = account.user.indexOf('@');
String user = account.user.substring(0, at); 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.synchronize = true;
account.primary = (primary == null); account.primary = (primary == null);

@ -621,7 +621,10 @@ public class FragmentQuickSetup extends FragmentBase {
account.password = password; account.password = password;
account.fingerprint = imap_fingerprint; 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.synchronize = true;
account.primary = (primary == null); account.primary = (primary == null);

Loading…
Cancel
Save