mirror of https://github.com/M66B/FairEmail.git
Small improvements/fixes
This commit is contained in:
parent
5fe713180d
commit
1fe8784b1f
|
@ -49,14 +49,14 @@ public class EntityAccount {
|
||||||
@NonNull
|
@NonNull
|
||||||
public Integer auth_type;
|
public Integer auth_type;
|
||||||
@NonNull
|
@NonNull
|
||||||
public Boolean primary;
|
|
||||||
@NonNull
|
|
||||||
public Boolean synchronize;
|
public Boolean synchronize;
|
||||||
|
@NonNull
|
||||||
|
public Boolean primary;
|
||||||
public Integer color;
|
public Integer color;
|
||||||
@NonNull
|
@NonNull
|
||||||
public Boolean store_sent; // obsolete
|
public Boolean store_sent; // obsolete
|
||||||
@NonNull
|
@NonNull
|
||||||
public Integer poll_interval; // NOOP interval
|
public Integer poll_interval; // keep-alive interval
|
||||||
public Long seen_until;
|
public Long seen_until;
|
||||||
public String state;
|
public String state;
|
||||||
public String error;
|
public String error;
|
||||||
|
@ -66,12 +66,16 @@ public class EntityAccount {
|
||||||
if (obj instanceof EntityAccount) {
|
if (obj instanceof EntityAccount) {
|
||||||
EntityAccount other = (EntityAccount) obj;
|
EntityAccount other = (EntityAccount) obj;
|
||||||
return ((this.name == null ? other.name == null : this.name.equals(other.name)) &&
|
return ((this.name == null ? other.name == null : this.name.equals(other.name)) &&
|
||||||
|
(this.signature == null ? other.signature == null : this.signature.equals(other.signature)) &&
|
||||||
this.host.equals(other.host) &&
|
this.host.equals(other.host) &&
|
||||||
this.port.equals(other.port) &&
|
this.port.equals(other.port) &&
|
||||||
this.user.equals(other.user) &&
|
this.user.equals(other.user) &&
|
||||||
this.password.equals(other.password) &&
|
this.password.equals(other.password) &&
|
||||||
this.primary.equals(other.primary) &&
|
this.auth_type.equals(other.auth_type) &&
|
||||||
this.synchronize.equals(other.synchronize) &&
|
this.synchronize.equals(other.synchronize) &&
|
||||||
|
this.primary.equals(other.primary) &&
|
||||||
|
(this.color == null ? other.color == null : this.color.equals(other.color)) &&
|
||||||
|
this.store_sent.equals(other.store_sent) &&
|
||||||
this.poll_interval.equals(other.poll_interval) &&
|
this.poll_interval.equals(other.poll_interval) &&
|
||||||
(this.seen_until == null ? other.seen_until == null : this.seen_until.equals(other.seen_until)) &&
|
(this.seen_until == null ? other.seen_until == null : this.seen_until.equals(other.seen_until)) &&
|
||||||
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
|
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
|
||||||
|
|
|
@ -102,6 +102,7 @@ public class FragmentAccount extends FragmentEx {
|
||||||
private TextInputLayout tilPassword;
|
private TextInputLayout tilPassword;
|
||||||
|
|
||||||
private Button btnAdvanced;
|
private Button btnAdvanced;
|
||||||
|
|
||||||
private TextView tvName;
|
private TextView tvName;
|
||||||
private EditText etName;
|
private EditText etName;
|
||||||
private Button btnColor;
|
private Button btnColor;
|
||||||
|
@ -109,11 +110,12 @@ public class FragmentAccount extends FragmentEx {
|
||||||
private ImageView ibColorDefault;
|
private ImageView ibColorDefault;
|
||||||
private EditText etSignature;
|
private EditText etSignature;
|
||||||
private ImageButton ibPro;
|
private ImageButton ibPro;
|
||||||
|
|
||||||
private CheckBox cbSynchronize;
|
private CheckBox cbSynchronize;
|
||||||
private CheckBox cbPrimary;
|
private CheckBox cbPrimary;
|
||||||
private EditText etInterval;
|
private EditText etInterval;
|
||||||
private Button btnCheck;
|
|
||||||
|
|
||||||
|
private Button btnCheck;
|
||||||
private ProgressBar pbCheck;
|
private ProgressBar pbCheck;
|
||||||
|
|
||||||
private TextView tvIdle;
|
private TextView tvIdle;
|
||||||
|
@ -169,6 +171,7 @@ public class FragmentAccount extends FragmentEx {
|
||||||
tilPassword = view.findViewById(R.id.tilPassword);
|
tilPassword = view.findViewById(R.id.tilPassword);
|
||||||
|
|
||||||
btnAdvanced = view.findViewById(R.id.btnAdvanced);
|
btnAdvanced = view.findViewById(R.id.btnAdvanced);
|
||||||
|
|
||||||
etName = view.findViewById(R.id.etName);
|
etName = view.findViewById(R.id.etName);
|
||||||
tvName = view.findViewById(R.id.tvName);
|
tvName = view.findViewById(R.id.tvName);
|
||||||
btnColor = view.findViewById(R.id.btnColor);
|
btnColor = view.findViewById(R.id.btnColor);
|
||||||
|
@ -576,10 +579,11 @@ public class FragmentAccount extends FragmentEx {
|
||||||
args.putString("password", tilPassword.getEditText().getText().toString());
|
args.putString("password", tilPassword.getEditText().getText().toString());
|
||||||
args.putInt("auth_type", authorized == null ? Helper.AUTH_TYPE_PASSWORD : provider.getAuthType());
|
args.putInt("auth_type", authorized == null ? Helper.AUTH_TYPE_PASSWORD : provider.getAuthType());
|
||||||
|
|
||||||
args.putBoolean("synchronize", cbSynchronize.isChecked());
|
|
||||||
args.putString("name", etName.getText().toString());
|
args.putString("name", etName.getText().toString());
|
||||||
args.putInt("color", color);
|
args.putInt("color", color);
|
||||||
args.putString("signature", Html.toHtml(etSignature.getText()));
|
args.putString("signature", Html.toHtml(etSignature.getText()));
|
||||||
|
|
||||||
|
args.putBoolean("synchronize", cbSynchronize.isChecked());
|
||||||
args.putBoolean("primary", cbPrimary.isChecked());
|
args.putBoolean("primary", cbPrimary.isChecked());
|
||||||
args.putString("interval", etInterval.getText().toString());
|
args.putString("interval", etInterval.getText().toString());
|
||||||
|
|
||||||
|
@ -601,6 +605,7 @@ public class FragmentAccount extends FragmentEx {
|
||||||
String name = args.getString("name");
|
String name = args.getString("name");
|
||||||
int color = args.getInt("color");
|
int color = args.getInt("color");
|
||||||
String signature = args.getString("signature");
|
String signature = args.getString("signature");
|
||||||
|
|
||||||
boolean synchronize = args.getBoolean("synchronize");
|
boolean synchronize = args.getBoolean("synchronize");
|
||||||
boolean primary = args.getBoolean("primary");
|
boolean primary = args.getBoolean("primary");
|
||||||
String interval = args.getString("interval");
|
String interval = args.getString("interval");
|
||||||
|
@ -660,19 +665,23 @@ public class FragmentAccount extends FragmentEx {
|
||||||
boolean update = (account != null);
|
boolean update = (account != null);
|
||||||
if (account == null)
|
if (account == null)
|
||||||
account = new EntityAccount();
|
account = new EntityAccount();
|
||||||
account.name = name;
|
|
||||||
account.color = color;
|
|
||||||
account.signature = signature;
|
|
||||||
account.host = host;
|
account.host = host;
|
||||||
account.port = Integer.parseInt(port);
|
account.port = Integer.parseInt(port);
|
||||||
account.user = user;
|
account.user = user;
|
||||||
account.password = password;
|
account.password = password;
|
||||||
account.auth_type = auth_type;
|
account.auth_type = auth_type;
|
||||||
|
|
||||||
|
account.name = name;
|
||||||
|
account.color = color;
|
||||||
|
account.signature = signature;
|
||||||
|
|
||||||
account.synchronize = synchronize;
|
account.synchronize = synchronize;
|
||||||
account.primary = (account.synchronize && primary);
|
account.primary = (account.synchronize && primary);
|
||||||
account.store_sent = false;
|
|
||||||
account.poll_interval = Integer.parseInt(interval);
|
account.poll_interval = Integer.parseInt(interval);
|
||||||
|
|
||||||
|
account.store_sent = false;
|
||||||
|
|
||||||
if (!synchronize)
|
if (!synchronize)
|
||||||
account.error = null;
|
account.error = null;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue