mirror of https://github.com/M66B/FairEmail.git
Microsoft OAuth: fixed primary/secondary email addresses
This commit is contained in:
parent
8fecd5bc48
commit
f8a3cc8cb3
|
@ -540,23 +540,24 @@ public class FragmentOAuth extends FragmentBase {
|
|||
}
|
||||
|
||||
if (jpayload.has("verified_primary_email")) {
|
||||
String u = jpayload.getString("verified_primary_email");
|
||||
if (!TextUtils.isEmpty(u) && !usernames.contains(u))
|
||||
usernames.add(u);
|
||||
JSONArray jsecondary =
|
||||
jpayload.getJSONArray("verified_primary_email");
|
||||
for (int i = 0; i < jsecondary.length(); i++) {
|
||||
String u = jsecondary.getString(i);
|
||||
if (!TextUtils.isEmpty(u) && !usernames.contains(u))
|
||||
usernames.add(u);
|
||||
}
|
||||
}
|
||||
|
||||
if (jpayload.has("verified_secondary_email"))
|
||||
try {
|
||||
JSONArray jsecondary =
|
||||
jpayload.getJSONArray("verified_secondary_email");
|
||||
for (int i = 0; i < jsecondary.length(); i++) {
|
||||
String u = jsecondary.getString(i);
|
||||
if (!TextUtils.isEmpty(u) && !usernames.contains(u))
|
||||
usernames.add(u);
|
||||
}
|
||||
} catch (Throwable ex) {
|
||||
Log.e(ex);
|
||||
if (jpayload.has("verified_secondary_email")) {
|
||||
JSONArray jsecondary =
|
||||
jpayload.getJSONArray("verified_secondary_email");
|
||||
for (int i = 0; i < jsecondary.length(); i++) {
|
||||
String u = jsecondary.getString(i);
|
||||
if (!TextUtils.isEmpty(u) && !usernames.contains(u))
|
||||
usernames.add(u);
|
||||
}
|
||||
}
|
||||
} catch (Throwable ex) {
|
||||
Log.e(ex);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue