Merge pull request #63 from ngageoint/develop

v2.1.6 merge

Author: jclark118

mapcache/build.gradle

@@ -15,8 +15,8 @@ android {
         resValue "string", "applicationId", applicationId
         minSdkVersion 28
         targetSdkVersion 31
-        versionCode 45
-        versionName '2.1.5'
+        versionCode 46
+        versionName '2.1.6'
         multiDexEnabled true
     }
     buildTypes {
@@ -53,10 +53,10 @@ dependencies {
     api 'com.google.android.material:material:1.0.0'
     api 'androidx.preference:preference:1.1.1'
     api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    api 'mil.nga.geopackage.map:geopackage-android-map:6.7.0' // comment out to build locally
+    api 'mil.nga.geopackage.map:geopackage-android-map:6.7.1' // comment out to build locally
     //api project(':geopackage-map') // uncomment me to build locally
-    api 'mil.nga.mgrs:mgrs-android:2.2.0'
-    api 'mil.nga.gars:gars-android:1.2.0'
+    api 'mil.nga.mgrs:mgrs-android:2.2.2'
+    api 'mil.nga.gars:gars-android:1.2.2'
     api 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'

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

@@ -101,8 +101,10 @@ public void run() {
 
             if(!webViewHandlingRequest) {
                 int responseCode = connection.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED
-                        && (urlString.startsWith("https") || urlString.contains("10.0.2.2"))) {
+//                if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED
+//                        && (urlString.startsWith("https") || urlString.contains("10.0.2.2"))) {
+                if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED){
+
                     addBasicAuth(connection.getURL());
                     responseCode = connection.getResponseCode();
                 }

mapcache/src/main/java/mil/nga/mapcache/utils/SampleDownloader.java

@@ -97,27 +97,33 @@ public void handleResponse(InputStream stream, int responseCode) {
                         JSONObject mainObject = new JSONObject(sb.toString());
                         sampleList.putAll(new Gson().fromJson(sb.toString(), HashMap.class));
                         activity.runOnUiThread(new Runnable() {
-
                             @Override
                             public void run() {
-                                adapter.addAll(sampleList.keySet());
-
+                                adapter.clear();
+                                if(sampleList.isEmpty()){
+                                    adapter.add(activity.getString(R.string.examples_unavailable));
+                                } else {
+                                    adapter.addAll(sampleList.keySet());
+                                }
                             }
                         });
                     }
                 } catch (Exception e){
                     Log.e("error", e.toString());
                 }
-
         }
-
-
-
     }
 
     @Override
     public void handleException(IOException exception) {
         Log.e(SampleDownloader.class.getSimpleName(), "Failed to get sample data: ", exception);
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                adapter.clear();
+                adapter.add(activity.getString(R.string.examples_unavailable));
+            }
+        });
     }
 
     @Override

mapcache/src/main/java/mil/nga/mapcache/wizards/createtile/NewTileLayerUI.java

@@ -212,26 +212,28 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
         });
 
         // Show a menu to choose from saved urls
-        TextView defaultText = (TextView) alertView.findViewById(R.id.default_url);
+        TextView defaultText = alertView.findViewById(R.id.default_url);
         defaultText.setOnClickListener((View view) -> controller.loadSavedUrls());
 
         // Example URLs from github
-        TextView exampleUrlText = (TextView) alertView.findViewById(R.id.example_urls);
+        TextView exampleUrlText = alertView.findViewById(R.id.example_urls);
         exampleUrlText.setOnClickListener(view -> {
             AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AppCompatAlertDialogStyle);
             builder.setTitle(fragment.getString(R.string.example_url_header));
             ArrayAdapter<String> adapter = new ArrayAdapter<>(
                     context, android.R.layout.select_dialog_item);
 
             SampleDownloader sampleDownloader = new SampleDownloader(fragment.getActivity(), adapter);
+            adapter.add(activity.getString(R.string.fetching_examples));
             sampleDownloader.getExampleData(activity.getString(R.string.sample_tile_urls));
             builder.setAdapter(adapter,
                     (DialogInterface d, int item) -> {
-
                         if (item >= 0) {
                             String name = adapter.getItem(item);
-                            inputName.setText(name);
-                            inputUrl.setText(sampleDownloader.getSampleList().get(name));
+                            if(!activity.getString(R.string.examples_unavailable).equalsIgnoreCase(name)) {
+                                inputName.setText(name);
+                                inputUrl.setText(sampleDownloader.getSampleList().get(name));
+                            }
                         }
                     });
             builder.show();

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

@@ -2,8 +2,8 @@
 <resources>
 
     <string name="app_name">MapCache</string>
-    <string name="app_version">Version 2.1.5</string>
-    <string name="app_release_date">Released Dec 2022</string>
+    <string name="app_version">Version 2.1.6</string>
+    <string name="app_release_date">Released Feb 2023</string>
     <string name="app_label_name">MapCache</string>
     <string name="title_map">Map</string>
     <string name="title_manager">Manager</string>
@@ -381,12 +381,8 @@
     <string name="geopackage_android_url">&lt;a href=http://ngageoint.github.io/geopackage-android>GeoPackage Android on Github&lt;/a></string>
     <string name="ogc_url">&lt;a href=http://www.geopackage.org/#implementations_nga>OGC GeoPackage&lt;/a></string>
     <string name="release_notes">
-        Release Notes - 2.1.5\n \n
-        - New status display for tile downloads\n
-        - New server status display\n
-        - New sample data\n
-        - Authenticated Tile downloads
-        - Bug fixes and usability updates
+        Release Notes - 2.1.6\n \n
+        - Authenticated tile download patch
         </string>
 
 
@@ -465,5 +461,8 @@
     <string name="limit_features">Limit the number of features to display in active layers for faster processing</string>
     <string name="sample_tile_urls">https://raw.githubusercontent.com/ngageoint/GeoPackage/master/docs/examples/android/exampleTileUrls.json</string>
     <string name="sample_geopackage_url">https://raw.githubusercontent.com/ngageoint/GeoPackage/master/docs/examples/android/hostedGeopackages.json</string>
+    <string name="fetching_examples">fetching examples...</string>
+    <string name="examples_unavailable">examples unavailable</string>
+
 
 </resources>