mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle provider not found

This commit is contained in:
M66B 2022-03-22 18:04:05 +01:00
parent b136b5baf7
commit fdce403c26
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/EmailService.java
View File

@ -47,6 +47,7 @@ import com.sun.mail.util.SocketConnectException;
import com.sun.mail.util.TraceOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@ -450,6 +451,8 @@ public class EmailService implements AutoCloseable {
try {
authenticator.refreshToken(true);
connect(host, port, auth, user, factory);
} catch (FileNotFoundException ex1) {
throw new AuthenticationFailedException(ex1.getMessage(), ex1);
} catch (Exception ex1) {
Log.e(ex1);
String msg = ex.getMessage();

5
app/src/main/java/eu/faircode/email/ServiceAuthenticator.java
View File

@ -34,6 +34,7 @@ import net.openid.appauth.NoClientAuthentication;
import org.json.JSONException;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Date;
import java.util.Objects;
@ -146,7 +147,7 @@ public class ServiceAuthenticator extends Authenticator {
}
private static void OAuthRefresh(Context context, String id, AuthState authState, boolean expire, long keep_alive)
throws MessagingException {
throws FileNotFoundException, MessagingException {
try {
Long expiration = authState.getAccessTokenExpirationTime();
if (expiration != null && expiration - keep_alive < new Date().getTime()) {
@ -188,6 +189,8 @@ public class ServiceAuthenticator extends Authenticator {
if (holder.error != null)
throw holder.error;
} catch (FileNotFoundException ex) {
throw ex; // provider not found
} catch (Exception ex) {
throw new MessagingException("OAuth refresh id=" + id, ex);
}