Skip to content

Commit 82aab89

Browse files
praveekpraveek
authored
[MOB-22457] Fix incorrect HTTP timeouts (#728)
1 parent df27aac commit 82aab89

File tree

9 files changed

+24
-25
lines changed

9 files changed

+24
-25
lines changed

‎code/core/src/main/java/com/adobe/marketing/mobile/internal/configuration/ConfigurationDownloader.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ internal class ConfigurationDownloader {
4747
const val HTTP_HEADER_LAST_MODIFIED = "Last-Modified"
4848
const val HTTP_HEADER_ETAG = "ETag"
4949
internal const val CONFIG_CACHE_NAME = "config"
50-
private const val DEFAULT_CONNECTION_TIMEOUT_MS = 10000
51-
private const val DEFAULT_READ_TIMEOUT_MS = 10000
50+
private const val DEFAULT_CONNECTION_TIMEOUT_SECONDS = 10
51+
private const val DEFAULT_READ_TIMEOUT_SECONDS = 10
5252
}
5353

5454
/**
@@ -103,8 +103,8 @@ internal class ConfigurationDownloader {
103103
HttpMethod.GET,
104104
null,
105105
headers,
106-
DEFAULT_CONNECTION_TIMEOUT_MS,
107-
DEFAULT_READ_TIMEOUT_MS
106+
DEFAULT_CONNECTION_TIMEOUT_SECONDS,
107+
DEFAULT_READ_TIMEOUT_SECONDS
108108
)
109109

110110
val networkCallback = NetworkCallback { response: HttpConnecting? ->

‎code/core/src/main/java/com/adobe/marketing/mobile/launch/rulesengine/download/RulesLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public class RulesLoader {
4545

4646
private static final String TAG = "RulesLoader";
4747

48-
private static final int DEFAULT_CONNECTION_TIMEOUT_MS = 10000;
49-
private static final int DEFAULT_READ_TIMEOUT_MS = 10000;
48+
private static final int DEFAULT_CONNECTION_TIMEOUT_SECONDS = 10;
49+
private static final int DEFAULT_READ_TIMEOUT_SECONDS = 10;
5050

5151
static final String HTTP_HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
5252
static final String HTTP_HEADER_IF_NONE_MATCH = "If-None-Match";
@@ -98,8 +98,8 @@ public void loadFromUrl(
9898
HttpMethod.GET,
9999
null,
100100
extractHeadersFromCache(cacheResult),
101-
DEFAULT_CONNECTION_TIMEOUT_MS,
102-
DEFAULT_READ_TIMEOUT_MS);
101+
DEFAULT_CONNECTION_TIMEOUT_SECONDS,
102+
DEFAULT_READ_TIMEOUT_SECONDS);
103103

104104
final NetworkCallback networkCallback =
105105
response -> {

‎code/core/src/test/java/com/adobe/marketing/mobile/internal/configuration/ConfigurationDownloaderTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ class ConfigurationDownloaderTest {
309309
Locale.US
310310
)
311311
),
312-
10000,
313-
10000
312+
10,
313+
10
314314
)
315315
verifyNetworkRequestParams(expectedNetworkRequest, networkRequestCaptor.firstValue)
316316

‎code/core/src/test/java/com/adobe/marketing/mobile/launch/rulesengine/download/RulesLoaderTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void testLoadFromURL_NullResponse() {
130130
.connectAsync(any(NetworkRequest.class), any(NetworkCallback.class));
131131

132132
final NetworkRequest expectedNetworkRequest =
133-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10000, 10000);
133+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10, 10);
134134

135135
// Test
136136
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
@@ -180,7 +180,7 @@ public void testLoadFromURL_Happy_NoCachedEntryForKey() throws FileNotFoundExcep
180180
.connectAsync(any(NetworkRequest.class), any(NetworkCallback.class));
181181

182182
final NetworkRequest expectedNetworkRequest =
183-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10000, 10000);
183+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10, 10);
184184

185185
// Test
186186
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
@@ -251,7 +251,7 @@ public void testLoadFromURL_Happy_CachedFileExists() throws FileNotFoundExceptio
251251
RulesLoader.HTTP_HEADER_IF_MODIFIED_SINCE, SAMPLE_LAST_MODIFIED_RFC2822);
252252

253253
final NetworkRequest expectedNetworkRequest =
254-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, expectedHeaders, 10000, 10000);
254+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, expectedHeaders, 10, 10);
255255

256256
// Test
257257
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
@@ -301,7 +301,7 @@ public void testLoadFromURL_UnExtractableZipFile() throws FileNotFoundException
301301
.connectAsync(any(NetworkRequest.class), any(NetworkCallback.class));
302302

303303
final NetworkRequest expectedNetworkRequest =
304-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10000, 10000);
304+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10, 10);
305305

306306
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
307307

@@ -344,7 +344,7 @@ public void testLoadFromURL_ZipFileCannotBeCopied() throws IOException {
344344
.connectAsync(any(NetworkRequest.class), any(NetworkCallback.class));
345345

346346
final NetworkRequest expectedNetworkRequest =
347-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10000, 10000);
347+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10, 10);
348348

349349
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
350350

@@ -385,7 +385,7 @@ public void testLoadFromURL_InvalidZipContents() throws FileNotFoundException {
385385
.connectAsync(any(NetworkRequest.class), any(NetworkCallback.class));
386386

387387
final NetworkRequest expectedNetworkRequest =
388-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10000, 10000);
388+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10, 10);
389389

390390
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
391391

@@ -439,7 +439,7 @@ public void testLoadFromURL_Response_HTTP_NOT_MODIFIED() throws FileNotFoundExce
439439
RulesLoader.HTTP_HEADER_IF_MODIFIED_SINCE, SAMPLE_LAST_MODIFIED_RFC2822);
440440

441441
final NetworkRequest expectedNetworkRequest =
442-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, expectedHeaders, 10000, 10000);
442+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, expectedHeaders, 10, 10);
443443

444444
// Test
445445
final AdobeCallback<RulesLoadResult> mockCallback = mock(AdobeCallback.class);
@@ -480,7 +480,7 @@ public void testLoadFromURL_Response_HTTP_NOT_FOUND() {
480480
.connectAsync(any(NetworkRequest.class), any(NetworkCallback.class));
481481

482482
final NetworkRequest expectedNetworkRequest =
483-
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10000, 10000);
483+
new NetworkRequest(VALID_URL, HttpMethod.GET, null, emptyMap(), 10, 10);
484484

485485
rulesLoader.loadFromUrl(VALID_URL, mockCallback);
486486

‎code/identity/src/main/java/com/adobe/marketing/mobile/identity/IdentityConstants.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ static final class Defaults {
2828
static final long DEFAULT_TTL_VALUE = 600;
2929
static final String SERVER = "dpm.demdex.net";
3030
static final String CID_DELIMITER = "%01";
31-
static final int TIMEOUT = 2;
32-
static final int TIMEOUT_IN_SECONDS = 2;
31+
static final int TIMEOUT_SECONDS = 2;
3332
static final boolean DEFAULT_SSL = true;
3433
static final MobilePrivacyStatus DEFAULT_MOBILE_PRIVACY = MobilePrivacyStatus.UNKNOWN;
3534
static final String ZERO_ADVERTISING_ID = "00000000-0000-0000-0000-000000000000";

‎code/identity/src/main/java/com/adobe/marketing/mobile/identity/IdentityExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,8 @@ void sendOptOutHit(final ConfigurationSharedStateIdentity configSharedState) {
611611
HttpMethod.GET,
612612
null,
613613
null,
614-
IdentityConstants.Defaults.TIMEOUT,
615-
IdentityConstants.Defaults.TIMEOUT);
614+
Defaults.TIMEOUT_SECONDS,
615+
Defaults.TIMEOUT_SECONDS);
616616
networkService.connectAsync(
617617
networkRequest,
618618
connection -> {

‎code/identity/src/main/java/com/adobe/marketing/mobile/identity/IdentityHitsProcessing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void processHit(
155155
@Override
156156
public void processHit(
157157
@NonNull final DataEntity entity, @NonNull final HitProcessingResult processingResult) {
158-
processHit(entity, IdentityConstants.Defaults.TIMEOUT_IN_SECONDS, processingResult);
158+
processHit(entity, IdentityConstants.Defaults.TIMEOUT_SECONDS, processingResult);
159159
}
160160

161161
IdentityResponseObject createIdentityObjectFromResponseJsonObject(final JSONObject jsonObject) {

‎code/signal/src/main/java/com/adobe/marketing/mobile/signal/internal/SignalConstants.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal object SignalConstants {
1515
const val EXTENSION_NAME = "com.adobe.module.signal"
1616
const val FRIENDLY_NAME = "Signal"
1717
const val LOG_TAG = "Signal"
18-
const val DEFAULT_NETWORK_TIMEOUT = 2
18+
const val DEFAULT_NETWORK_TIMEOUT_SECONDS = 2
1919
const val DEPRECATED_1X_HIT_DATABASE_FILENAME = "ADBMobileSignalDataCache.sqlite"
2020

2121
const val NETWORK_REQUEST_HEATER_CONTENT_TYPE = "Content-Type"

‎code/signal/src/main/java/com/adobe/marketing/mobile/signal/internal/SignalHitProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ internal class SignalHitProcessor : HitProcessing {
104104
return null
105105
}
106106
val timeoutRaw = signalDataEntity.timeout(0)
107-
val timeout = if (timeoutRaw > 0) timeoutRaw else SignalConstants.DEFAULT_NETWORK_TIMEOUT
107+
val timeout = if (timeoutRaw > 0) timeoutRaw else SignalConstants.DEFAULT_NETWORK_TIMEOUT_SECONDS
108108
val postBody = signalDataEntity.body
109109
val httpMethod =
110110
if (postBody.isEmpty()) HttpMethod.GET else HttpMethod.POST

0 commit comments

Comments
 (0)