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

Microsoft OAuth: fixed primary/secondary email addresses

This commit is contained in:
M66B 2021-06-18 12:10:58 +02:00
parent 8fecd5bc48
commit f8a3cc8cb3
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,13 +540,16 @@ public class FragmentOAuth extends FragmentBase {
} }
if (jpayload.has("verified_primary_email")) { if (jpayload.has("verified_primary_email")) {
String u = jpayload.getString("verified_primary_email"); 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)) if (!TextUtils.isEmpty(u) && !usernames.contains(u))
usernames.add(u); usernames.add(u);
} }
}
if (jpayload.has("verified_secondary_email")) if (jpayload.has("verified_secondary_email")) {
try {
JSONArray jsecondary = JSONArray jsecondary =
jpayload.getJSONArray("verified_secondary_email"); jpayload.getJSONArray("verified_secondary_email");
for (int i = 0; i < jsecondary.length(); i++) { for (int i = 0; i < jsecondary.length(); i++) {
@ -554,8 +557,6 @@ public class FragmentOAuth extends FragmentBase {
if (!TextUtils.isEmpty(u) && !usernames.contains(u)) if (!TextUtils.isEmpty(u) && !usernames.contains(u))
usernames.add(u); usernames.add(u);
} }
} catch (Throwable ex) {
Log.e(ex);
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);