mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 16:33:47 +00:00
Code Issues Releases Wiki Activity

Improved error message

Browse source
This commit is contained in:
M66B 2019-12-23 09:00:30 +01:00
parent e8ae7dfd98
commit 81d82d3f08
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/ActivitySetup.java
View file

@ -1030,9 +1030,10 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
if (der)
cert = (X509Certificate) fact.generateCertificate(is);
else {
// throws DecoderException extends IllegalStateException
PemObject pem = new PemReader(new InputStreamReader(is)).readPemObject();
if (pem == null)
throw new IllegalArgumentException(context.getString(R.string.title_invalid_key));
throw new IllegalStateException();
ByteArrayInputStream bis = new ByteArrayInputStream(pem.getContent());
cert = (X509Certificate) fact.generateCertificate(bis);
}
@ -1058,6 +1059,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException)
ToastEx.makeText(ActivitySetup.this, ex.getMessage(), Toast.LENGTH_LONG).show();
else if (ex instanceof IllegalStateException)
ToastEx.makeText(ActivitySetup.this, R.string.title_invalid_key, Toast.LENGTH_LONG).show();
else
Log.unexpectedError(getSupportFragmentManager(), ex);
}