msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Improved error handling

Browse Source
pull/147/head
M66B 7 years ago
parent cb6ccc4a3d
commit 76c2354d00
5 changed files with 127 additions and 62 deletions
Show Stats Download Patch File Download Diff File

112
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -96,7 +96,6 @@ public class FragmentAccount extends FragmentEx {
private EditText etUser; private EditText etUser;
private TextInputLayout tilPassword; private TextInputLayout tilPassword;
private TextView tvName;
private EditText etName; private EditText etName;
private Button btnColor; private Button btnColor;
private View vwColor; private View vwColor;
@ -123,6 +122,8 @@ public class FragmentAccount extends FragmentEx {
private Button btnSave; private Button btnSave;
private ContentLoadingProgressBar pbSave; private ContentLoadingProgressBar pbSave;
private TextView tvError;
private ContentLoadingProgressBar pbWait; private ContentLoadingProgressBar pbWait;
private Group grpServer; private Group grpServer;
@ -166,7 +167,6 @@ public class FragmentAccount extends FragmentEx {
tilPassword = view.findViewById(R.id.tilPassword); tilPassword = view.findViewById(R.id.tilPassword);
etName = view.findViewById(R.id.etName); etName = view.findViewById(R.id.etName);
tvName = view.findViewById(R.id.tvName);
btnColor = view.findViewById(R.id.btnColor); btnColor = view.findViewById(R.id.btnColor);
vwColor = view.findViewById(R.id.vwColor); vwColor = view.findViewById(R.id.vwColor);
ibColorDefault = view.findViewById(R.id.ibColorDefault); ibColorDefault = view.findViewById(R.id.ibColorDefault);
@ -192,6 +192,7 @@ public class FragmentAccount extends FragmentEx {
btnSave = view.findViewById(R.id.btnSave); btnSave = view.findViewById(R.id.btnSave);
pbSave = view.findViewById(R.id.pbSave); pbSave = view.findViewById(R.id.pbSave);
tvError = view.findViewById(R.id.tvError);
pbWait = view.findViewById(R.id.pbWait); pbWait = view.findViewById(R.id.pbWait);
@ -257,12 +258,9 @@ public class FragmentAccount extends FragmentEx {
} }
}); });
btnAutoConfig.setEnabled(false);
btnAutoConfig.setOnClickListener(new View.OnClickListener() { btnAutoConfig.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("domain", etDomain.getText().toString()); args.putString("domain", etDomain.getText().toString());
@ -414,14 +412,6 @@ public class FragmentAccount extends FragmentEx {
btnCheck.setOnClickListener(new View.OnClickListener() { btnCheck.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Helper.setViewsEnabled(view, false);
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
pbCheck.setVisibility(View.VISIBLE);
tvIdle.setVisibility(View.GONE);
grpFolders.setVisibility(View.GONE);
btnSave.setVisibility(View.GONE);
Provider provider = (Provider) spProvider.getSelectedItem(); Provider provider = (Provider) spProvider.getSelectedItem();
Bundle args = new Bundle(); Bundle args = new Bundle();
@ -435,6 +425,26 @@ public class FragmentAccount extends FragmentEx {
args.putInt("auth_type", authorized == null ? Helper.AUTH_TYPE_PASSWORD : provider.getAuthType()); args.putInt("auth_type", authorized == null ? Helper.AUTH_TYPE_PASSWORD : provider.getAuthType());
new SimpleTask<CheckResult>() { new SimpleTask<CheckResult>() {
@Override
protected void onInit(Bundle args) {
Helper.setViewsEnabled(view, false);
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
pbCheck.setVisibility(View.VISIBLE);
tvIdle.setVisibility(View.GONE);
grpFolders.setVisibility(View.GONE);
btnSave.setVisibility(View.GONE);
tvError.setVisibility(View.GONE);
}
@Override
protected void onCleanup(Bundle args) {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
pbCheck.setVisibility(View.GONE);
}
@Override @Override
protected CheckResult onLoad(Context context, Bundle args) throws Throwable { protected CheckResult onLoad(Context context, Bundle args) throws Throwable {
long id = args.getLong("id"); long id = args.getLong("id");
@ -524,11 +534,6 @@ public class FragmentAccount extends FragmentEx {
@Override @Override
protected void onLoaded(Bundle args, CheckResult result) { protected void onLoaded(Bundle args, CheckResult result) {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
pbCheck.setVisibility(View.GONE);
tvIdle.setVisibility(result.idle ? View.GONE : View.VISIBLE); tvIdle.setVisibility(result.idle ? View.GONE : View.VISIBLE);
setFolders(result.folders); setFolders(result.folders);
@ -543,21 +548,21 @@ public class FragmentAccount extends FragmentEx {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
pbCheck.setVisibility(View.GONE);
grpFolders.setVisibility(View.GONE); grpFolders.setVisibility(View.GONE);
btnSave.setVisibility(View.GONE); btnSave.setVisibility(View.GONE);
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else else {
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner()) tvError.setText(Helper.formatThrowable(ex));
.setMessage(Helper.formatThrowable(ex)) tvError.setVisibility(View.VISIBLE);
.setPositiveButton(android.R.string.cancel, null) new Handler().post(new Runnable() {
.create() @Override
.show(); public void run() {
((ScrollView) view).smoothScrollTo(0, tvError.getBottom());
}
});
}
} }
}.load(FragmentAccount.this, args); }.load(FragmentAccount.this, args);
} }
@ -566,12 +571,6 @@ public class FragmentAccount extends FragmentEx {
btnSave.setOnClickListener(new View.OnClickListener() { btnSave.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Helper.setViewsEnabled(view, false);
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
Provider provider = (Provider) spProvider.getSelectedItem(); Provider provider = (Provider) spProvider.getSelectedItem();
EntityFolder drafts = (EntityFolder) spDrafts.getSelectedItem(); EntityFolder drafts = (EntityFolder) spDrafts.getSelectedItem();
@ -619,6 +618,25 @@ public class FragmentAccount extends FragmentEx {
args.putSerializable("junk", junk); args.putSerializable("junk", junk);
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override
protected void onInit(Bundle args) {
Helper.setViewsEnabled(view, false);
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
tvError.setVisibility(View.GONE);
}
@Override
protected void onCleanup(Bundle args) {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE);
}
@Override @Override
protected Void onLoad(Context context, Bundle args) throws Throwable { protected Void onLoad(Context context, Bundle args) throws Throwable {
long id = args.getLong("id"); long id = args.getLong("id");
@ -834,20 +852,18 @@ public class FragmentAccount extends FragmentEx {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE);
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else else {
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner()) tvError.setText(Helper.formatThrowable(ex));
.setMessage(Helper.formatThrowable(ex)) tvError.setVisibility(View.VISIBLE);
.setPositiveButton(android.R.string.cancel, null) new Handler().post(new Runnable() {
.create() @Override
.show(); public void run() {
((ScrollView) view).smoothScrollTo(0, tvError.getBottom());
}
});
}
} }
}.load(FragmentAccount.this, args); }.load(FragmentAccount.this, args);
} }
@ -864,6 +880,9 @@ public class FragmentAccount extends FragmentEx {
// Initialize // Initialize
Helper.setViewsEnabled(view, false); Helper.setViewsEnabled(view, false);
btnAutoConfig.setEnabled(false);
btnAuthorize.setVisibility(View.GONE); btnAuthorize.setVisibility(View.GONE);
cbStartTls.setVisibility(View.GONE); cbStartTls.setVisibility(View.GONE);
cbInsecure.setVisibility(View.GONE); cbInsecure.setVisibility(View.GONE);
@ -878,6 +897,7 @@ public class FragmentAccount extends FragmentEx {
btnSave.setVisibility(View.GONE); btnSave.setVisibility(View.GONE);
pbSave.setVisibility(View.GONE); pbSave.setVisibility(View.GONE);
tvError.setVisibility(View.GONE);
grpServer.setVisibility(View.GONE); grpServer.setVisibility(View.GONE);
grpAuthorize.setVisibility(View.GONE); grpAuthorize.setVisibility(View.GONE);

50
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -52,6 +52,7 @@ import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView;
import com.android.colorpicker.ColorPickerDialog; import com.android.colorpicker.ColorPickerDialog;
import com.android.colorpicker.ColorPickerSwatch; import com.android.colorpicker.ColorPickerSwatch;
@ -110,6 +111,8 @@ public class FragmentIdentity extends FragmentEx {
private Button btnSave; private Button btnSave;
private ContentLoadingProgressBar pbSave; private ContentLoadingProgressBar pbSave;
private TextView tvError;
private ContentLoadingProgressBar pbWait; private ContentLoadingProgressBar pbWait;
private Group grpAuthorize; private Group grpAuthorize;
@ -149,8 +152,10 @@ public class FragmentIdentity extends FragmentEx {
btnAdvanced = view.findViewById(R.id.btnAdvanced); btnAdvanced = view.findViewById(R.id.btnAdvanced);
spProvider = view.findViewById(R.id.spProvider); spProvider = view.findViewById(R.id.spProvider);
etDomain = view.findViewById(R.id.etDomain); etDomain = view.findViewById(R.id.etDomain);
btnAutoConfig = view.findViewById(R.id.btnAutoConfig); btnAutoConfig = view.findViewById(R.id.btnAutoConfig);
etHost = view.findViewById(R.id.etHost); etHost = view.findViewById(R.id.etHost);
cbStartTls = view.findViewById(R.id.cbStartTls); cbStartTls = view.findViewById(R.id.cbStartTls);
cbInsecure = view.findViewById(R.id.cbInsecure); cbInsecure = view.findViewById(R.id.cbInsecure);
@ -169,6 +174,8 @@ public class FragmentIdentity extends FragmentEx {
btnSave = view.findViewById(R.id.btnSave); btnSave = view.findViewById(R.id.btnSave);
pbSave = view.findViewById(R.id.pbSave); pbSave = view.findViewById(R.id.pbSave);
tvError = view.findViewById(R.id.tvError);
pbWait = view.findViewById(R.id.pbWait); pbWait = view.findViewById(R.id.pbWait);
grpAuthorize = view.findViewById(R.id.grpAuthorize); grpAuthorize = view.findViewById(R.id.grpAuthorize);
@ -348,8 +355,6 @@ public class FragmentIdentity extends FragmentEx {
} }
}); });
btnAutoConfig.setEnabled(false);
btnAutoConfig.setOnClickListener(new View.OnClickListener() { btnAutoConfig.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -413,10 +418,6 @@ public class FragmentIdentity extends FragmentEx {
btnSave.setOnClickListener(new View.OnClickListener() { btnSave.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Helper.setViewsEnabled(view, false);
btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
EntityAccount account = (EntityAccount) spAccount.getSelectedItem(); EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
String name = etName.getText().toString(); String name = etName.getText().toString();
@ -450,6 +451,21 @@ public class FragmentIdentity extends FragmentEx {
args.putSerializable("sent", (EntityFolder) spSent.getSelectedItem()); args.putSerializable("sent", (EntityFolder) spSent.getSelectedItem());
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override
protected void onInit(Bundle args) {
Helper.setViewsEnabled(view, false);
btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
tvError.setVisibility(View.GONE);
}
@Override
protected void onCleanup(Bundle args) {
Helper.setViewsEnabled(view, true);
btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE);
}
@Override @Override
protected Void onLoad(Context context, Bundle args) throws Throwable { protected Void onLoad(Context context, Bundle args) throws Throwable {
long id = args.getLong("id"); long id = args.getLong("id");
@ -596,18 +612,18 @@ public class FragmentIdentity extends FragmentEx {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.setViewsEnabled(view, true);
btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE);
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else else {
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner()) tvError.setText(Helper.formatThrowable(ex));
.setMessage(Helper.formatThrowable(ex)) tvError.setVisibility(View.VISIBLE);
.setPositiveButton(android.R.string.cancel, null) new Handler().post(new Runnable() {
.create() @Override
.show(); public void run() {
((ScrollView) view).smoothScrollTo(0, tvError.getBottom());
}
});
}
} }
}.load(FragmentIdentity.this, args); }.load(FragmentIdentity.this, args);
} }
@ -619,11 +635,13 @@ public class FragmentIdentity extends FragmentEx {
// Initialize // Initialize
Helper.setViewsEnabled(view, false); Helper.setViewsEnabled(view, false);
btnAutoConfig.setEnabled(false);
cbInsecure.setVisibility(View.GONE); cbInsecure.setVisibility(View.GONE);
tilPassword.setPasswordVisibilityToggleEnabled(id < 0); tilPassword.setPasswordVisibilityToggleEnabled(id < 0);
btnSave.setVisibility(View.GONE); btnSave.setVisibility(View.GONE);
btnAdvanced.setVisibility(View.GONE); btnAdvanced.setVisibility(View.GONE);
pbSave.setVisibility(View.GONE); pbSave.setVisibility(View.GONE);
tvError.setVisibility(View.GONE);
grpAuthorize.setVisibility(View.GONE); grpAuthorize.setVisibility(View.GONE);
grpAdvanced.setVisibility(View.GONE); grpAdvanced.setVisibility(View.GONE);

13
app/src/main/res/layout/fragment_account.xml
Unescape View File

@ -560,6 +560,19 @@
app:layout_constraintStart_toEndOf="@id/btnSave" app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnSave" /> app:layout_constraintTop_toTopOf="@id/btnSave" />
<TextView
android:id="@+id/tvError"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:autoLink="web"
android:text="error"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?attr/colorWarning"
android:textIsSelectable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSave" />
<eu.faircode.email.ContentLoadingProgressBar <eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/pbWait" android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar" style="@style/Base.Widget.AppCompat.ProgressBar"

13
app/src/main/res/layout/fragment_identity.xml
Unescape View File

@ -501,6 +501,19 @@
app:layout_constraintStart_toEndOf="@id/btnSave" app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnSave" /> app:layout_constraintTop_toTopOf="@id/btnSave" />
<TextView
android:id="@+id/tvError"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:autoLink="web"
android:text="error"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?attr/colorWarning"
android:textIsSelectable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSave" />
<eu.faircode.email.ContentLoadingProgressBar <eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/pbWait" android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar" style="@style/Base.Widget.AppCompat.ProgressBar"

1
app/src/main/res/layout/fragment_setup.xml
Unescape View File

@ -90,6 +90,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:autoLink="web"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="error" android:text="error"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"

Write Preview
Loading…
Cancel
Save