mirror of https://github.com/M66B/FairEmail.git
Check on changing insecure
This commit is contained in:
parent
03ff3d068a
commit
8c2132fc56
|
@ -842,11 +842,12 @@ public class FragmentAccount extends FragmentBase {
|
||||||
String accountRealm = (account == null ? null : account.realm);
|
String accountRealm = (account == null ? null : account.realm);
|
||||||
|
|
||||||
boolean check = (synchronize && (account == null ||
|
boolean check = (synchronize && (account == null ||
|
||||||
!account.synchronize || account.error != null ||
|
!account.synchronize ||
|
||||||
|
account.insecure != insecure ||
|
||||||
!host.equals(account.host) || Integer.parseInt(port) != account.port ||
|
!host.equals(account.host) || Integer.parseInt(port) != account.port ||
|
||||||
!user.equals(account.user) || !password.equals(account.password) ||
|
!user.equals(account.user) || !password.equals(account.password) ||
|
||||||
!Objects.equals(realm, accountRealm) ||
|
!Objects.equals(realm, accountRealm) ||
|
||||||
!TextUtils.isEmpty(account.error)));
|
account.error != null));
|
||||||
boolean reload = (check || account == null ||
|
boolean reload = (check || account == null ||
|
||||||
account.synchronize != synchronize ||
|
account.synchronize != synchronize ||
|
||||||
account.notify != notify ||
|
account.notify != notify ||
|
||||||
|
|
|
@ -668,12 +668,13 @@ public class FragmentIdentity extends FragmentBase {
|
||||||
String identityRealm = (identity == null ? null : identity.realm);
|
String identityRealm = (identity == null ? null : identity.realm);
|
||||||
|
|
||||||
boolean check = (synchronize && (identity == null ||
|
boolean check = (synchronize && (identity == null ||
|
||||||
!identity.synchronize || identity.error != null ||
|
!identity.synchronize ||
|
||||||
|
identity.insecure != insecure ||
|
||||||
!host.equals(identity.host) || Integer.parseInt(port) != identity.port ||
|
!host.equals(identity.host) || Integer.parseInt(port) != identity.port ||
|
||||||
!user.equals(identity.user) || !password.equals(identity.password) ||
|
!user.equals(identity.user) || !password.equals(identity.password) ||
|
||||||
!Objects.equals(realm, identityRealm) ||
|
!Objects.equals(realm, identityRealm) ||
|
||||||
use_ip != identity.use_ip) ||
|
use_ip != identity.use_ip) ||
|
||||||
!TextUtils.isEmpty(identity.error));
|
identity.error != null);
|
||||||
|
|
||||||
Long last_connected = null;
|
Long last_connected = null;
|
||||||
if (identity != null && synchronize == identity.synchronize)
|
if (identity != null && synchronize == identity.synchronize)
|
||||||
|
|
Loading…
Reference in New Issue