From 115a98b6fe42b5f2b176f6eb4c71313854d94ee3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 17 Mar 2023 09:56:27 +0100
Subject: [PATCH] ARC improvements

---
 .../main/java/eu/faircode/email/MessageHelper.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 02cb320c25..3062bc0260 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2068,13 +2068,11 @@ public class MessageHelper {
                         break;
                 }
 
-                ok = (ok && as.size() > 0);
-                Log.i("ARC as=" + as.size() + " aar=" + aar.size() + " ams=" + ams.size() + " ok=" + ok);
+                if (ok)
+                    ok = (as.size() > 0 && as.size() <= 50 &&
+                            as.size() == aar.size() && as.size() == ams.size());
 
-                if (ok &&
-                        as.size() <= 50 &&
-                        as.size() == aar.size() &&
-                        as.size() == ams.size()) {
+                if (ok)
                     for (int i = 1; i <= as.size(); i++) {
                         // 3.B. The instance values of the ARC Sets MUST form a continuous sequence from 1..N with no gaps or repetition
                         if (!as.containsKey(i) || !aar.containsKey(i) || !ams.containsKey(i)) {
@@ -2094,8 +2092,7 @@ public class MessageHelper {
                             break;
                         }
                     }
-                }
-                Log.i("ARC sets=" + ok);
+                Log.i("ARC as=" + as.size() + " aar=" + aar.size() + " ams=" + ams.size() + " ok=" + ok);
 
                 // 4. Validate the AMS with the greatest instance value (most recent).
                 //    If validation fails, then the Chain Validation Status is "fail", and the algorithm stops here.