Improvements

pull/50/head
M66B 7 years ago
parent 9e602ca950
commit d727c2bb52

@ -609,7 +609,8 @@ public class FragmentAccount extends FragmentEx {
spProvider.setAdapter(padapter); spProvider.setAdapter(padapter);
if (savedInstanceState == null) { if (savedInstanceState == null) {
if (!once) { if (once)
return;
once = true; once = true;
etName.setText(account == null ? null : account.name); etName.setText(account == null ? null : account.name);
@ -619,23 +620,22 @@ public class FragmentAccount extends FragmentEx {
tilPassword.getEditText().setText(account == null ? null : account.password); tilPassword.getEditText().setText(account == null ? null : account.password);
cbSynchronize.setChecked(account == null ? true : account.synchronize); cbSynchronize.setChecked(account == null ? true : account.synchronize);
cbPrimary.setChecked(account == null ? true : account.primary); cbPrimary.setChecked(account == null ? true : account.primary);
}
} else { } else {
int provider = savedInstanceState.getInt("provider"); int provider = savedInstanceState.getInt("provider");
spProvider.setTag(provider); spProvider.setTag(provider);
spProvider.setSelection(provider); spProvider.setSelection(provider);
tilPassword.getEditText().setText(savedInstanceState.getString("password")); tilPassword.getEditText().setText(savedInstanceState.getString("password"));
} }
Helper.setViewsEnabled(view, true); Helper.setViewsEnabled(view, true);
cbPrimary.setEnabled(cbSynchronize.isChecked()); cbPrimary.setEnabled(cbSynchronize.isChecked());
ibDelete.setVisibility(account == null ? View.GONE : View.VISIBLE);
btnCheck.setVisibility(cbSynchronize.isChecked() ? View.VISIBLE : View.GONE); btnCheck.setVisibility(cbSynchronize.isChecked() ? View.VISIBLE : View.GONE);
btnSave.setVisibility(cbSynchronize.isChecked() ? View.GONE : View.VISIBLE); btnSave.setVisibility(cbSynchronize.isChecked() ? View.GONE : View.VISIBLE);
// Consider previous check/save/delete as cancelled
ibDelete.setVisibility(account == null ? View.GONE : View.VISIBLE);
btnCheck.setEnabled(true); btnCheck.setEnabled(true);
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
} }

@ -133,11 +133,6 @@ public class FragmentFolder extends FragmentEx {
return view; return view;
} }
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
}
@Override @Override
public void onActivityCreated(@Nullable final Bundle savedInstanceState) { public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
@ -158,14 +153,15 @@ public class FragmentFolder extends FragmentEx {
} }
if (savedInstanceState == null) { if (savedInstanceState == null) {
if (!once) { if (once)
return;
once = true; once = true;
cbSynchronize.setChecked(folder.synchronize); cbSynchronize.setChecked(folder.synchronize);
etAfter.setText(Integer.toString(folder.after)); etAfter.setText(Integer.toString(folder.after));
} }
}
// Consider previous save as cancelled
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
Helper.setViewsEnabled(view, true); Helper.setViewsEnabled(view, true);
btnSave.setEnabled(true); btnSave.setEnabled(true);

@ -398,7 +398,8 @@ public class FragmentIdentity extends FragmentEx {
@Override @Override
public void onChanged(@Nullable final EntityIdentity identity) { public void onChanged(@Nullable final EntityIdentity identity) {
if (savedInstanceState == null) { if (savedInstanceState == null) {
if (!once) { if (once)
return;
once = true; once = true;
etName.setText(identity == null ? null : identity.name); etName.setText(identity == null ? null : identity.name);
@ -413,15 +414,15 @@ public class FragmentIdentity extends FragmentEx {
cbPrimary.setChecked(identity == null ? true : identity.primary); cbPrimary.setChecked(identity == null ? true : identity.primary);
etName.requestFocus(); etName.requestFocus();
}
} else } else
tilPassword.getEditText().setText(savedInstanceState.getString("password")); tilPassword.getEditText().setText(savedInstanceState.getString("password"));
Helper.setViewsEnabled(view, true); Helper.setViewsEnabled(view, true);
cbPrimary.setEnabled(cbSynchronize.isChecked()); cbPrimary.setEnabled(cbSynchronize.isChecked());
ibDelete.setVisibility(identity == null ? View.GONE : View.VISIBLE);
// Consider previous save/delete as cancelled
ibDelete.setVisibility(identity == null ? View.GONE : View.VISIBLE);
btnSave.setEnabled(true); btnSave.setEnabled(true);
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);

Loading…
Cancel
Save