Skip to content

Centralize version header value #877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gthea wants to merge 1 commit into
base: development
Choose a base branch
from
Draft

Centralize version header value #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main/src/main/java/io/split/android/client/SplitClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.X509TrustManager;

import io.split.android.client.main.BuildConfig;
import io.split.android.client.impressions.ImpressionListener;
import io.split.android.client.network.CertificatePinningConfiguration;
import io.split.android.client.network.SdkVersionProvider;
import io.split.android.client.network.DevelopmentSslConfig;
import io.split.android.client.network.HttpProxy;
import io.split.android.client.network.ProxyConfiguration;
Expand Down Expand Up @@ -242,7 +242,7 @@ private SplitClientConfig(String endpoint,

mUserConsent = userConsent;

splitSdkVersion = "Android-" + BuildConfig.SPLIT_VERSION_NAME;
splitSdkVersion = SdkVersionProvider.getSdkVersion();

mShouldRecordTelemetry = shouldRecordTelemetry;

Expand Down
10 changes: 10 additions & 0 deletions main/src/main/java/io/split/android/client/network/SdkVersionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package io.split.android.client.network;

import io.split.android.client.main.BuildConfig;

public class SdkVersionProvider {

public static String getSdkVersion() {
return "Android-" + BuildConfig.SPLIT_VERSION_NAME;
}
}
4 changes: 2 additions & 2 deletions main/src/main/java/io/split/android/client/service/workmanager/HttpClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

import io.split.android.client.main.BuildConfig;
import io.split.android.client.dtos.HttpProxyDto;
import io.split.android.client.network.BasicCredentialsProvider;
import io.split.android.client.network.BearerCredentialsProvider;
import io.split.android.client.network.CertificatePinningConfiguration;
import io.split.android.client.network.CertificatePinningConfigurationProvider;
import io.split.android.client.network.HttpClient;
import io.split.android.client.network.HttpClientImpl;
import io.split.android.client.network.SdkVersionProvider;
import io.split.android.client.network.HttpProxy;
import io.split.android.client.network.SplitHttpHeadersBuilder;
import io.split.android.client.storage.cipher.SplitCipherFactory;
Expand Down Expand Up @@ -43,7 +43,7 @@ private static HttpClient buildHttpClient(String apiKey, @Nullable CertificatePi
.build();

SplitHttpHeadersBuilder headersBuilder = new SplitHttpHeadersBuilder();
headersBuilder.setClientVersion(BuildConfig.SPLIT_VERSION_NAME);
headersBuilder.setClientVersion(SdkVersionProvider.getSdkVersion());
headersBuilder.setApiToken(apiKey);
headersBuilder.addJsonTypeHeaders();
httpClient.addHeaders(headersBuilder.build());
Expand Down
21 changes: 21 additions & 0 deletions main/src/test/java/io/split/android/client/network/SdkVersionProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.split.android.client.network;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import org.junit.Test;

public class SdkVersionProviderTest {

@Test
public void getSdkVersionStartsWithAndroidPrefix() {
assertTrue(SdkVersionProvider.getSdkVersion().startsWith("Android-"));
}

@Test
public void getSdkVersionContainsNonEmptyVersionAfterPrefix() {
String version = SdkVersionProvider.getSdkVersion();
String suffix = version.substring("Android-".length());
assertFalse(suffix.isEmpty());
}
}
Loading