Skip to content

Commit bdfc193

Browse files
committed
allow tile download over http
1 parent 1f0cb77 commit bdfc193

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

mapcache/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
resValue "string", "applicationId", applicationId
1616
minSdkVersion 28
1717
targetSdkVersion 31
18-
versionCode 45
19-
versionName '2.1.5'
18+
versionCode 46
19+
versionName '2.1.6'
2020
multiDexEnabled true
2121
}
2222
buildTypes {

mapcache/src/main/java/mil/nga/mapcache/io/network/HttpGetRequest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ public void run() {
101101

102102
if(!webViewHandlingRequest) {
103103
int responseCode = connection.getResponseCode();
104-
if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED
105-
&& (urlString.startsWith("https") || urlString.contains("10.0.2.2"))) {
104+
// if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED
105+
// && (urlString.startsWith("https") || urlString.contains("10.0.2.2"))) {
106+
if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED){
107+
106108
addBasicAuth(connection.getURL());
107109
responseCode = connection.getResponseCode();
108110
}

mapcache/src/main/res/values/strings.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<resources>
33

44
<string name="app_name">MapCache</string>
5-
<string name="app_version">Version 2.1.5</string>
6-
<string name="app_release_date">Released Dec 2022</string>
5+
<string name="app_version">Version 2.1.6</string>
6+
<string name="app_release_date">Released Feb 2023</string>
77
<string name="app_label_name">MapCache</string>
88
<string name="title_map">Map</string>
99
<string name="title_manager">Manager</string>
@@ -381,12 +381,8 @@
381381
<string name="geopackage_android_url">&lt;a href=http://ngageoint.github.io/geopackage-android>GeoPackage Android on Github&lt;/a></string>
382382
<string name="ogc_url">&lt;a href=http://www.geopackage.org/#implementations_nga>OGC GeoPackage&lt;/a></string>
383383
<string name="release_notes">
384-
Release Notes - 2.1.5\n \n
385-
- New status display for tile downloads\n
386-
- New server status display\n
387-
- New sample data\n
388-
- Authenticated Tile downloads
389-
- Bug fixes and usability updates
384+
Release Notes - 2.1.6\n \n
385+
- Authenticated tile download patch
390386
</string>
391387

392388

0 commit comments

Comments
 (0)