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

OAuth improvements

This commit is contained in:
M66B 2020-01-09 17:53:00 +01:00
parent 73e5fa3b89
commit 25aaae6960
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View File

@ -253,9 +253,15 @@ public class FragmentOAuth extends FragmentBase {
prefs.edit().putString("oauth." + provider.id, authState.jsonSerializeString()).apply(); prefs.edit().putString("oauth." + provider.id, authState.jsonSerializeString()).apply();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
if ("gmail".equals(provider.id)) if ("gmail".equals(provider.id))
params.put("access_type", "offline"); params.put("access_type", "offline");
if ("yandex".equals(provider.id)) {
params.put("device_name", "Android/FairEmail");
params.put("force_confirm", "true");
}
AuthorizationRequest.Builder authRequestBuilder = AuthorizationRequest.Builder authRequestBuilder =
new AuthorizationRequest.Builder( new AuthorizationRequest.Builder(
serviceConfig, serviceConfig,
@ -352,6 +358,7 @@ public class FragmentOAuth extends FragmentBase {
args.putString("name", name); args.putString("name", name);
args.putString("token", accessToken); args.putString("token", accessToken);
args.putString("state", state.jsonSerializeString()); args.putString("state", state.jsonSerializeString());
args.putBoolean("askAccount", askAccount);
args.putString("personal", etName.getText().toString().trim()); args.putString("personal", etName.getText().toString().trim());
args.putString("address", etEmail.getText().toString().trim()); args.putString("address", etEmail.getText().toString().trim());
@ -362,6 +369,7 @@ public class FragmentOAuth extends FragmentBase {
String name = args.getString("name"); String name = args.getString("name");
String token = args.getString("token"); String token = args.getString("token");
String state = args.getString("state"); String state = args.getString("state");
boolean askAccount = args.getBoolean("askAccount", false);
String personal = args.getString("personal"); String personal = args.getString("personal");
String address = args.getString("address"); String address = args.getString("address");
@ -443,7 +451,7 @@ public class FragmentOAuth extends FragmentBase {
identities.add(new Pair<>(email, displayName)); identities.add(new Pair<>(email, displayName));
} }
} }
} else if ("yandex".equals(id)) { } else if (askAccount) {
primaryEmail = address; primaryEmail = address;
identities.add(new Pair<>(address, personal)); identities.add(new Pair<>(address, personal));
} else } else