Skip to content

Commit 6faae81

Browse files
author
Vignesh Raja
authored
Enforce 60 seconds minimum datafile refresh time (#72)
1 parent 91b00a9 commit 6faae81

File tree

2 files changed

+75
-0
lines changed

2 files changed

+75
-0
lines changed

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@ public class OptimizelyManager {
8989
this.logger = logger;
9090
}
9191

92+
@NonNull
93+
public Long getDataFileDownloadInterval() {
94+
return dataFileDownloadInterval;
95+
}
96+
97+
@NonNull
98+
public TimeUnit getDataFileDownloadIntervalTimeUnit() {
99+
return dataFileDownloadIntervalTimeUnit;
100+
}
101+
92102
/**
93103
* Returns the {@link OptimizelyManager} builder
94104
*
@@ -606,6 +616,14 @@ public Builder withDataFileDownloadInterval(long interval, @NonNull TimeUnit tim
606616
public OptimizelyManager build() {
607617
final Logger logger = LoggerFactory.getLogger(OptimizelyManager.class);
608618

619+
// AlarmManager doesn't allow intervals less than 60 seconds
620+
if (dataFileDownloadIntervalTimeUnit.toMillis(dataFileDownloadInterval) < (60 * 1000)) {
621+
dataFileDownloadIntervalTimeUnit = TimeUnit.SECONDS;
622+
dataFileDownloadInterval = 60L;
623+
logger.warn("Minimum datafile polling interval is 60 seconds. " +
624+
"Defaulting to 60 seconds.");
625+
}
626+
609627
return new OptimizelyManager(projectId,
610628
eventHandlerDispatchInterval,
611629
eventHandlerDispatchIntervalTimeUnit,
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/****************************************************************************
2+
* Copyright 2017, Optimizely, Inc. and contributors *
3+
* *
4+
* Licensed under the Apache License, Version 2.0 (the "License"); *
5+
* you may not use this file except in compliance with the License. *
6+
* You may obtain a copy of the License at *
7+
* *
8+
* http://www.apache.org/licenses/LICENSE-2.0 *
9+
* *
10+
* Unless required by applicable law or agreed to in writing, software *
11+
* distributed under the License is distributed on an "AS IS" BASIS, *
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
13+
* See the License for the specific language governing permissions and *
14+
* limitations under the License. *
15+
***************************************************************************/
16+
17+
package com.optimizely.ab.android.sdk;
18+
19+
import org.junit.Test;
20+
import org.junit.runner.RunWith;
21+
import org.mockito.runners.MockitoJUnitRunner;
22+
23+
import java.util.concurrent.TimeUnit;
24+
25+
import static junit.framework.Assert.assertEquals;
26+
27+
@RunWith(MockitoJUnitRunner.class)
28+
public class OptimizelyManagerBuilderTest {
29+
30+
/**
31+
* Verify that building the {@link OptimizelyManager} with a polling interval less than 60
32+
* seconds defaults to 60 seconds.
33+
*/
34+
@Test
35+
public void testBuildWithInvalidPollingInterval() {
36+
OptimizelyManager manager = OptimizelyManager.builder("1")
37+
.withDataFileDownloadInterval(5, TimeUnit.SECONDS)
38+
.build();
39+
40+
assertEquals(60L, manager.getDataFileDownloadInterval().longValue());
41+
assertEquals(TimeUnit.SECONDS, manager.getDataFileDownloadIntervalTimeUnit());
42+
}
43+
44+
/**
45+
* Verify that building the {@link OptimizelyManager} with a polling interval greater than 60
46+
* seconds is properly registered.
47+
*/
48+
@Test
49+
public void testBuildWithValidPollingInterval() {
50+
OptimizelyManager manager = OptimizelyManager.builder("1")
51+
.withDataFileDownloadInterval(61, TimeUnit.SECONDS)
52+
.build();
53+
54+
assertEquals(61L, manager.getDataFileDownloadInterval().longValue());
55+
assertEquals(TimeUnit.SECONDS, manager.getDataFileDownloadIntervalTimeUnit());
56+
}
57+
}

0 commit comments

Comments
 (0)