Skip to content

Commit f5deff5

Browse files
committed
update network configuration to be changed in runtime
1 parent f061740 commit f5deff5

3 files changed

Lines changed: 52 additions & 17 deletions

File tree

.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,20 @@
88
/build
99
/captures
1010
.externalNativeBuild
11+
/.idea/.gitignore
12+
/app/dev/release/app-dev-release.apk
13+
/.idea/caches/build_file_checksums.ser
14+
/.idea/codeStyles/codeStyleConfig.xml
15+
/.idea/compiler.xml
16+
/.idea/encodings.xml
17+
/.idea/gradle.xml
18+
/.idea/caches/gradle_models.ser
19+
/.idea/jarRepositories.xml
20+
/key.jks
21+
/.idea/misc.xml
22+
/app/dev/release/output.json
23+
/.idea/codeStyles/Project.xml
24+
/.idea/runConfigurations.xml
25+
/.idea/dictionaries/SmartIntr.xml
26+
/app/test_key.jks
27+
/.idea/vcs.xml

core_library/src/main/java/com/futurist_labs/android/base_library/repository/network/NetworkRequestHelper.java

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,34 @@
66
import com.futurist_labs.android.base_library.repository.persistence.BaseJsonParser;
77
import com.futurist_labs.android.base_library.utils.LogUtils;
88

9-
import javax.net.ssl.*;
10-
import java.io.*;
11-
import java.net.*;
9+
import java.io.BufferedReader;
10+
import java.io.DataOutputStream;
11+
import java.io.File;
12+
import java.io.FileInputStream;
13+
import java.io.FileOutputStream;
14+
import java.io.IOException;
15+
import java.io.InputStream;
16+
import java.io.InputStreamReader;
17+
import java.io.OutputStream;
18+
import java.net.HttpURLConnection;
19+
import java.net.MalformedURLException;
20+
import java.net.ProtocolException;
21+
import java.net.URL;
22+
import java.net.URLEncoder;
1223
import java.security.KeyManagementException;
1324
import java.security.NoSuchAlgorithmException;
1425
import java.util.ArrayList;
1526
import java.util.HashMap;
1627
import java.util.Iterator;
1728
import java.util.Map;
1829

30+
import javax.net.ssl.HostnameVerifier;
31+
import javax.net.ssl.HttpsURLConnection;
32+
import javax.net.ssl.SSLContext;
33+
import javax.net.ssl.SSLSession;
34+
import javax.net.ssl.TrustManager;
35+
import javax.net.ssl.X509TrustManager;
36+
1937

2038
/**
2139
* Created by Galeen on 18.1.2016 г..
@@ -140,11 +158,11 @@ static NetworkResponse sendPost(String endpoint, String params, String authToken
140158

141159
private static void addMainHeaders(final String authToken, final HttpURLConnection conn) {
142160
if (authToken != null) {
143-
conn.setRequestProperty(NetConstants.HEADER_AUTHORIZATION, authToken);
161+
conn.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderAuthorizationFieldName(), authToken);
144162
}
145163

146-
if (NetConstants.SHOULD_ADD_LOCALE) {
147-
conn.setRequestProperty(NetConstants.HEADER_LOCALE_FIELD, BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldValue());
164+
if (BaseLibraryConfiguration.getInstance().isAddLocale()) {
165+
conn.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldName(), BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldValue());
148166
}
149167

150168
if (BaseLibraryConfiguration.getInstance().getHeaderOS() != null) {
@@ -231,10 +249,10 @@ static NetworkResponse sendAuthenticatedGet(String serverUrl, String token, Map<
231249
headers = new HashMap<>();
232250
}
233251
if (token != null) {
234-
headers.put(NetConstants.HEADER_AUTHORIZATION, token);
252+
headers.put(BaseLibraryConfiguration.getInstance().getHeaderAuthorizationFieldName(), token);
235253
}
236-
if (NetConstants.SHOULD_ADD_LOCALE) {
237-
headers.put(NetConstants.HEADER_LOCALE_FIELD,
254+
if (BaseLibraryConfiguration.getInstance().isAddLocale()) {
255+
headers.put(BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldName(),
238256
BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldValue());
239257
}
240258
return sendGet(serverUrl, params, headers);
@@ -336,9 +354,9 @@ static NetworkResponse postFile(String urlLink, File uploadFile, String token, M
336354
httpUrlConnection.setRequestProperty(
337355
"Content-Type", "multipart/form-data;boundary=" + boundary);
338356
// if (token != null)
339-
// httpUrlConnection.setRequestProperty(NetConstants.HEADER_AUTHORIZATION, token);
340-
if (NetConstants.SHOULD_ADD_LOCALE) {
341-
httpUrlConnection.setRequestProperty(NetConstants.HEADER_LOCALE_FIELD,
357+
// httpUrlConnection.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderAuthorizationFieldName(), token);
358+
if (BaseLibraryConfiguration.getInstance().isAddLocale()) {
359+
httpUrlConnection.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldName(),
342360
BaseLibraryConfiguration.getInstance().getHeaderLocaleFieldValue());
343361
}
344362
DataOutputStream request = null;
@@ -419,7 +437,7 @@ static NetworkResponse multipartRequest(String urlTo, Map<String, String> params
419437
connection.setUseCaches(false);
420438

421439
if (token != null) {
422-
connection.setRequestProperty(NetConstants.HEADER_AUTHORIZATION, token);
440+
connection.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderAuthorizationFieldName(), token);
423441
}
424442
connection.setRequestMethod("POST");
425443
connection.setRequestProperty("Connection", "Keep-Alive");
@@ -503,7 +521,7 @@ static NetworkResponse multipartRequest(String urlTo, Map<String, String> params
503521
connection.setUseCaches(false);
504522

505523
if (token != null) {
506-
connection.setRequestProperty(NetConstants.HEADER_AUTHORIZATION, token);
524+
connection.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderAuthorizationFieldName(), token);
507525
}
508526
connection.setRequestMethod("POST");
509527
connection.setRequestProperty("Connection", "Keep-Alive");
@@ -585,7 +603,7 @@ static NetworkResponse downloadFile(String fileURL, File file, String authToken,
585603
URL url = new URL(fileURL);
586604
HttpURLConnection httpConn = (HttpURLConnection) url.openConnection();
587605
if (authToken != null) {
588-
httpConn.setRequestProperty(NetConstants.HEADER_AUTHORIZATION, authToken);
606+
httpConn.setRequestProperty(BaseLibraryConfiguration.getInstance().getHeaderAuthorizationFieldName(), authToken);
589607
}
590608

591609
if (headers != null) {

core_library/src/main/java/com/futurist_labs/android/base_library/repository/network/ServerOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected NetworkResponse doInBackground(Action... params) {
7171
}
7272

7373
if (res != null && res.isResponsePositive()) {
74-
if (!action.isCheckServerUrl || (res.url != null && res.url.startsWith(NetConstants.SERVER_ADDRESS))) {
74+
if (!action.isCheckServerUrl || (res.url != null && res.url.startsWith(BaseLibraryConfiguration.getInstance().getServerUrl()))) {
7575
//we can use the url from action too
7676
if (mCallback != null){
7777
mCallback.inTheEndOfDoInBackground(res);
@@ -112,7 +112,7 @@ public static NetworkResponse doServerCall(final Action action, String token) {
112112
try {
113113
tracker.startTracker();
114114
if (!action.isFullUrl)
115-
action.endpoint = NetConstants.SERVER_ADDRESS + action.endpoint;
115+
action.endpoint = BaseLibraryConfiguration.getInstance().getServerUrl() + action.endpoint;
116116
tracker.logPrettyJson(action, token);
117117
switch (action.operation) {
118118
case Action.PUT:

0 commit comments

Comments
 (0)