Fixes

Author: gthea

src/main/java/io/split/android/client/service/splits/OutdatedSplitProxyHandler.java

@@ -11,7 +11,7 @@
 import io.split.android.client.utils.logger.Logger;
 
 /**
- * Handles proxy spec fallback and recovery for Split SDK.
+ * Handles proxy spec fallback and recovery.
  *
  * <p>This class manages the state machine that determines which spec version (latest or legacy) should be used
  * to communicate with the Split Proxy, based on observed proxy compatibility errors.
@@ -34,16 +34,11 @@
  * </ul>
  * <p>Only an explicit proxy outdated error triggers fallback. Generic 400s do not.</p>
  *
- * <p>This class provides the following functionality:</p>
- * <ul>
- *   <li>Tracks proxy errors and updates the state machine accordingly.</li>
- *   <li>Performs periodic proxy checks to attempt recovery.</li>
- *   <li>Provides the current spec version based on the state machine.</li>
- *   <li>Indicates whether the SDK is in fallback or recovery mode.</li>
- * </ul>
  */
 public class OutdatedSplitProxyHandler {
 
+    private static final String PREVIOUS_SPEC = "1.2";
+
     private final String mLatestSpec;
     private final String mPreviousSpec;
     private final boolean mForBackgroundSync;
@@ -53,6 +48,10 @@ public class OutdatedSplitProxyHandler {
     private final GeneralInfoStorage mGeneralInfoStorage;
     private final AtomicReference<ProxyHandlingType> mCurrentProxyHandlingType = new AtomicReference<>(ProxyHandlingType.NONE);
 
+    OutdatedSplitProxyHandler(String flagSpec, boolean forBackgroundSync, GeneralInfoStorage generalInfoStorage, long proxyCheckIntervalMillis) {
+        this(flagSpec, PREVIOUS_SPEC, forBackgroundSync, generalInfoStorage, proxyCheckIntervalMillis);
+    }
+
     /**
      * Constructs an OutdatedSplitProxyHandler instance with a custom proxy check interval.
      *

src/main/java/io/split/android/client/service/splits/SplitsSyncHelper.java

@@ -113,8 +113,7 @@ public SplitsSyncHelper(@NonNull HttpFetcher<TargetingRulesChange> splitFetcher,
         mRuleBasedSegmentStorage = checkNotNull(ruleBasedSegmentStorage);
         mTelemetryRuntimeProducer = checkNotNull(telemetryRuntimeProducer);
         mBackoffCounter = checkNotNull(backoffCounter);
-        String mPreviousSpec = "1.2";
-        mOutdatedSplitProxyHandler = new OutdatedSplitProxyHandler(flagsSpec, mPreviousSpec, forBackgroundSync, generalInfoStorage, proxyCheckIntervalMillis);
+        mOutdatedSplitProxyHandler = new OutdatedSplitProxyHandler(flagsSpec, forBackgroundSync, generalInfoStorage, proxyCheckIntervalMillis);
     }
 
     public SplitTaskExecutionInfo sync(SinceChangeNumbers till, int onDemandFetchBackoffMaxRetries) {

src/test/java/io/split/android/client/service/SplitsSyncHelperTest.java

@@ -10,7 +10,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -22,7 +21,6 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
-import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
@@ -469,51 +467,27 @@ public void proxyErrorTriggersFallbackAndOmitsRbSince() throws Exception {
     @Test
     public void fallbackPersistsUntilIntervalElapses() throws Exception {
         // Simulate proxy outdated error
+        long timestamp = System.currentTimeMillis();
+        when(mGeneralInfoStorage.getLastProxyUpdateTimestamp()).thenReturn(timestamp);
         when(mSplitsFetcher.execute(any(), any()))
                 .thenThrow(new HttpFetcherException("Proxy outdated", "Proxy outdated", HttpStatus.INTERNAL_PROXY_OUTDATED.getCode()))
                 // First fallback fetch returns till=2, second fallback fetch returns till=2 (still not caught up),
                 // third fallback fetch returns till=3 (caught up, loop can exit)
                 .thenReturn(TargetingRulesChange.create(SplitChange.create(-1, 2, Collections.emptyList()), RuleBasedSegmentChange.create(-1, 2, Collections.emptyList())))
-                .thenReturn(TargetingRulesChange.create(SplitChange.create(2, 3, Collections.emptyList()), RuleBasedSegmentChange.create(2, 3, Collections.emptyList())));
+                .thenReturn(TargetingRulesChange.create(SplitChange.create(3, 3, Collections.emptyList()), RuleBasedSegmentChange.create(3, 3, Collections.emptyList())));
         // Simulate advancing change numbers for storage
         when(mSplitsStorage.getTill()).thenReturn(-1L, 2L, 3L);
         // Trigger fallback
         try { mSplitsSyncHelper.sync(getSinceChangeNumbers(-1, -1L), false, false, ServiceConstants.ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES); } catch (Exception ignored) {}
         // Simulate time NOT elapsed
-        when(mGeneralInfoStorage.getLastProxyUpdateTimestamp()).thenReturn(System.currentTimeMillis());
+        when(mGeneralInfoStorage.getLastProxyUpdateTimestamp()).thenReturn(timestamp);
         mSplitsSyncHelper.sync(getSinceChangeNumbers(-1, -1L), false, false, ServiceConstants.ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES);
         verify(mSplitsFetcher, times(2)).execute(argThat(params ->
                 "1.2".equals(params.get("s")) &&
                 !params.containsKey("rbSince")
         ), any());
     }
 
-    @Test
-    public void recoveryAttemptsWithLatestSpecAfterInterval() throws Exception {
-        // Simulate proxy outdated error
-        when(mSplitsFetcher.execute(any(), any()))
-                .thenThrow(new HttpFetcherException("Proxy outdated", "Proxy outdated", HttpStatus.INTERNAL_PROXY_OUTDATED.getCode()))
-                .thenReturn(TargetingRulesChange.create(SplitChange.create(-1, 2, Collections.emptyList()), RuleBasedSegmentChange.create(-1, 2, Collections.emptyList())))
-                .thenReturn(TargetingRulesChange.create(SplitChange.create(2, 2, Collections.emptyList()), RuleBasedSegmentChange.create(2, 2, Collections.emptyList())));
-        when(mSplitsStorage.getTill()).thenReturn(-1L, -1L, 2L);
-        // Trigger fallback
-        try { mSplitsSyncHelper.sync(getSinceChangeNumbers(-1, -1L), false, false, ServiceConstants.ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES); } catch (Exception ignored) {}
-        // Simulate interval elapsed
-        when(mGeneralInfoStorage.getLastProxyUpdateTimestamp()).thenReturn(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1));
-        mSplitsSyncHelper.sync(getSinceChangeNumbers(-1, -1L), false, false, ServiceConstants.ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES);
-        // Should now attempt with latest spec
-        verify(mSplitsFetcher, times(1)).execute(argThat(params ->
-                "1.3".equals(params.get("s")) &&
-                params.containsKey("rbSince")
-        ), any());
-        // Assert that storage is cleared before update during recovery
-        InOrder inOrder = inOrder(mSplitsStorage, mRuleBasedSegmentStorageProducer);
-        inOrder.verify(mSplitsStorage).clear();
-        inOrder.verify(mRuleBasedSegmentStorageProducer).clear();
-        inOrder.verify(mSplitsStorage).update(any());
-        inOrder.verify(mRuleBasedSegmentStorageProducer).update(any(), any(), any());
-    }
-
     @Test
     public void generic400InFallbackDoesNotResetToNone() throws Exception {
         // Simulate proxy outdated error