From f8a3cc8cb38fd45893012348a32d4bc6471c5542 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 18 Jun 2021 12:10:58 +0200 Subject: [PATCH] Microsoft OAuth: fixed primary/secondary email addresses --- .../java/eu/faircode/email/FragmentOAuth.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index fe426d095e..b3b16815bc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -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); }