|
|
|
@ -75,6 +75,7 @@ import java.util.Map;
|
|
|
|
|
import static android.app.Activity.RESULT_OK;
|
|
|
|
|
|
|
|
|
|
public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
private String id;
|
|
|
|
|
private String name;
|
|
|
|
|
|
|
|
|
|
private ViewGroup view;
|
|
|
|
@ -97,6 +98,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
super.onCreate(savedInstanceState);
|
|
|
|
|
|
|
|
|
|
Bundle args = getArguments();
|
|
|
|
|
id = args.getString("id");
|
|
|
|
|
name = args.getString("name");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -133,7 +135,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
tvGrantHint.setText(getString(R.string.title_setup_oauth_rationale, name));
|
|
|
|
|
pbOAuth.setVisibility(View.GONE);
|
|
|
|
|
tvAuthorized.setVisibility(View.GONE);
|
|
|
|
|
tvGmailHint.setVisibility("Gmail".equals(name) ? View.VISIBLE : View.GONE);
|
|
|
|
|
tvGmailHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
|
|
|
|
|
hideError();
|
|
|
|
|
|
|
|
|
|
return view;
|
|
|
|
@ -186,8 +188,8 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
pbOAuth.setVisibility(View.VISIBLE);
|
|
|
|
|
hideError();
|
|
|
|
|
|
|
|
|
|
for (EmailProvider provider : EmailProvider.loadProfiles(getContext()))
|
|
|
|
|
if (provider.name.equals(name) && provider.oauth != null) {
|
|
|
|
|
EmailProvider provider = EmailProvider.getProvider(getContext(), id);
|
|
|
|
|
|
|
|
|
|
AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder()
|
|
|
|
|
.setBrowserMatcher(new BrowserMatcher() {
|
|
|
|
|
@Override
|
|
|
|
@ -210,10 +212,10 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
|
|
|
|
|
AuthState authState = new AuthState(serviceConfig);
|
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
|
|
|
|
|
prefs.edit().putString("oauth." + provider.name, authState.jsonSerializeString()).apply();
|
|
|
|
|
prefs.edit().putString("oauth." + provider.id, authState.jsonSerializeString()).apply();
|
|
|
|
|
|
|
|
|
|
Map<String, String> params = new HashMap<>();
|
|
|
|
|
if ("Gmail".equals(provider.name))
|
|
|
|
|
if ("gmail".equals(provider.id))
|
|
|
|
|
params.put("access_type", "offline");
|
|
|
|
|
|
|
|
|
|
AuthorizationRequest.Builder authRequestBuilder =
|
|
|
|
@ -223,24 +225,19 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
ResponseTypeValues.CODE,
|
|
|
|
|
Uri.parse(provider.oauth.redirectUri))
|
|
|
|
|
.setScopes(provider.oauth.scopes)
|
|
|
|
|
.setState(provider.name)
|
|
|
|
|
.setState(provider.id)
|
|
|
|
|
.setAdditionalParameters(params);
|
|
|
|
|
|
|
|
|
|
if ("Gmail".equals(provider.name) && BuildConfig.DEBUG)
|
|
|
|
|
if ("gmail".equals(provider.id) && BuildConfig.DEBUG)
|
|
|
|
|
authRequestBuilder.setPrompt("consent");
|
|
|
|
|
|
|
|
|
|
AuthorizationRequest authRequest = authRequestBuilder.build();
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth request provider=" + provider.name);
|
|
|
|
|
Log.i("OAuth request provider=" + provider.id);
|
|
|
|
|
if (BuildConfig.DEBUG)
|
|
|
|
|
Log.i("OAuth uri=" + authRequest.toUri());
|
|
|
|
|
Intent authIntent = authService.getAuthorizationRequestIntent(authRequest);
|
|
|
|
|
startActivityForResult(authIntent, ActivitySetup.REQUEST_OAUTH);
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
throw new IllegalArgumentException("Unknown provider=" + name);
|
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
|
showError(ex);
|
|
|
|
|
btnOAuth.setEnabled(true);
|
|
|
|
@ -256,13 +253,15 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
|
|
|
|
|
tvAuthorized.setVisibility(View.VISIBLE);
|
|
|
|
|
|
|
|
|
|
for (final EmailProvider provider : EmailProvider.loadProfiles(getContext()))
|
|
|
|
|
if (provider.name.equals(auth.state)) {
|
|
|
|
|
final EmailProvider provider = EmailProvider.getProvider(getContext(), auth.state);
|
|
|
|
|
|
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
|
|
|
|
|
final AuthState authState = AuthState.jsonDeserialize(prefs.getString("oauth." + provider.name, null));
|
|
|
|
|
prefs.edit().remove("oauth." + provider.name).apply();
|
|
|
|
|
String json = prefs.getString("oauth." + provider.id, null);
|
|
|
|
|
prefs.edit().remove("oauth." + provider.id).apply();
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth get token provider=" + provider.name);
|
|
|
|
|
final AuthState authState = AuthState.jsonDeserialize(json);
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth get token provider=" + provider.id);
|
|
|
|
|
authState.update(auth, null);
|
|
|
|
|
if (BuildConfig.DEBUG)
|
|
|
|
|
Log.i("OAuth response=" + authState.jsonSerializeString());
|
|
|
|
@ -285,7 +284,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
if (access == null)
|
|
|
|
|
throw error;
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth got token provider=" + provider.name);
|
|
|
|
|
Log.i("OAuth got token provider=" + provider.id);
|
|
|
|
|
authState.update(access, null);
|
|
|
|
|
if (BuildConfig.DEBUG)
|
|
|
|
|
Log.i("OAuth response=" + authState.jsonSerializeString());
|
|
|
|
@ -299,11 +298,6 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
throw new IllegalArgumentException("Unknown state=" + auth.state);
|
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
|
showError(ex);
|
|
|
|
|
btnOAuth.setEnabled(true);
|
|
|
|
@ -313,6 +307,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
|
|
|
|
|
private void onOAuthorized(String accessToken, AuthState state) {
|
|
|
|
|
Bundle args = new Bundle();
|
|
|
|
|
args.putString("id", id);
|
|
|
|
|
args.putString("name", name);
|
|
|
|
|
args.putString("token", accessToken);
|
|
|
|
|
args.putString("state", state.jsonSerializeString());
|
|
|
|
@ -320,6 +315,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
new SimpleTask<Void>() {
|
|
|
|
|
@Override
|
|
|
|
|
protected Void onExecute(Context context, Bundle args) throws Throwable {
|
|
|
|
|
String id = args.getString("id");
|
|
|
|
|
String name = args.getString("name");
|
|
|
|
|
String token = args.getString("token");
|
|
|
|
|
String state = args.getString("state");
|
|
|
|
@ -327,7 +323,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
String primaryEmail = null;
|
|
|
|
|
List<Pair<String, String>> identities = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
if ("Gmail".equals(name)) {
|
|
|
|
|
if ("gmail".equals(id)) {
|
|
|
|
|
// https://developers.google.com/gmail/api/v1/reference/users/getProfile
|
|
|
|
|
URL url = new URL("https://www.googleapis.com/gmail/v1/users/me/settings/sendAs");
|
|
|
|
|
Log.i("Fetching " + url);
|
|
|
|
@ -366,7 +362,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else if ("Outlook/Office365".equals(name)) {
|
|
|
|
|
} else if ("outlook".equals(id)) {
|
|
|
|
|
// https://docs.microsoft.com/en-us/graph/api/user-get?view=graph-rest-1.0&tabs=http#http-request
|
|
|
|
|
URL url = new URL("https://graph.microsoft.com/v1.0/me?$select=displayName,otherMails");
|
|
|
|
|
Log.i("Fetching " + url);
|
|
|
|
@ -403,7 +399,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
throw new IllegalArgumentException("Unknown provider=" + name);
|
|
|
|
|
throw new IllegalArgumentException("Unknown provider=" + id);
|
|
|
|
|
|
|
|
|
|
if (TextUtils.isEmpty(primaryEmail) || identities.size() == 0)
|
|
|
|
|
throw new IllegalArgumentException("Primary email address not found");
|
|
|
|
@ -412,15 +408,14 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
for (Pair<String, String> identity : identities)
|
|
|
|
|
Log.i("OAuth identity=" + identity.first + "/" + identity.second);
|
|
|
|
|
|
|
|
|
|
for (EmailProvider provider : EmailProvider.loadProfiles(context))
|
|
|
|
|
if (provider.name.equals(name)) {
|
|
|
|
|
EmailProvider provider = EmailProvider.getProvider(context, id);
|
|
|
|
|
|
|
|
|
|
List<EntityFolder> folders;
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth checking IMAP provider=" + provider.name);
|
|
|
|
|
Log.i("OAuth checking IMAP provider=" + provider.id);
|
|
|
|
|
String aprotocol = provider.imap.starttls ? "imap" : "imaps";
|
|
|
|
|
try (MailService iservice = new MailService(context, aprotocol, null, false, true, true)) {
|
|
|
|
|
iservice.connect(provider.imap.host, provider.imap.port, MailService.AUTH_TYPE_OAUTH, primaryEmail, state, null);
|
|
|
|
|
iservice.connect(provider.imap.host, provider.imap.port, MailService.AUTH_TYPE_OAUTH, provider.id, primaryEmail, state, null);
|
|
|
|
|
|
|
|
|
|
folders = iservice.getFolders();
|
|
|
|
|
|
|
|
|
@ -428,13 +423,13 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
throw new IllegalArgumentException(context.getString(R.string.title_setup_no_system_folders));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth checking SMTP provider=" + provider.name);
|
|
|
|
|
Log.i("OAuth checking SMTP provider=" + provider.id);
|
|
|
|
|
String iprotocol = provider.smtp.starttls ? "smtp" : "smtps";
|
|
|
|
|
try (MailService iservice = new MailService(context, iprotocol, null, false, true, true)) {
|
|
|
|
|
iservice.connect(provider.smtp.host, provider.smtp.port, MailService.AUTH_TYPE_OAUTH, primaryEmail, state, null);
|
|
|
|
|
iservice.connect(provider.smtp.host, provider.smtp.port, MailService.AUTH_TYPE_OAUTH, provider.id, primaryEmail, state, null);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Log.i("OAuth passed provider=" + provider.name);
|
|
|
|
|
Log.i("OAuth passed provider=" + provider.id);
|
|
|
|
|
|
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
|
try {
|
|
|
|
@ -449,6 +444,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
account.starttls = provider.imap.starttls;
|
|
|
|
|
account.port = provider.imap.port;
|
|
|
|
|
account.auth_type = MailService.AUTH_TYPE_OAUTH;
|
|
|
|
|
account.provider = provider.id;
|
|
|
|
|
account.user = primaryEmail;
|
|
|
|
|
account.password = state;
|
|
|
|
|
|
|
|
|
@ -491,6 +487,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
ident.starttls = provider.smtp.starttls;
|
|
|
|
|
ident.port = provider.smtp.port;
|
|
|
|
|
ident.auth_type = MailService.AUTH_TYPE_OAUTH;
|
|
|
|
|
ident.provider = provider.id;
|
|
|
|
|
ident.user = primaryEmail;
|
|
|
|
|
ident.password = state;
|
|
|
|
|
ident.synchronize = true;
|
|
|
|
@ -506,7 +503,6 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ServiceSynchronize.eval(context, "OAuth");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
@ -542,7 +538,7 @@ public class FragmentOAuth extends FragmentBase {
|
|
|
|
|
|
|
|
|
|
grpError.setVisibility(View.VISIBLE);
|
|
|
|
|
|
|
|
|
|
if ("Gmail".equals(name))
|
|
|
|
|
if ("gmail".equals(id))
|
|
|
|
|
tvGmailDraftsHint.setVisibility(View.VISIBLE);
|
|
|
|
|
|
|
|
|
|
new Handler().post(new Runnable() {
|
|
|
|
|