Merge pull request #79 from ngageoint/databaseCheck

Handler for invalid db
ngageoint · Jan 10, 2024 · 06b39c8 · 06b39c8
2 parents 812f2e2 + 15c2949
commit 06b39c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/mapcache/build.gradle b/mapcache/build.gradle
@@ -23,7 +23,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         minSdkVersion 28
         targetSdkVersion 34
-        versionCode 60
+        versionCode 61
         versionName '2.1.11'
         multiDexEnabled true
     }

diff --git a/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java b/mapcache/src/main/java/mil/nga/mapcache/repository/GeoPackageRepository.java
@@ -402,7 +402,7 @@ public List<List<GeoPackageTable>> regenerateTableList() {
 
             // Delete any databases with invalid headers
             if (!manager.validateHeader(database) ||
-                    database.equalsIgnoreCase("ue3.db")) {
+                    database.equalsIgnoreCase(context.getString(R.string.invalidDb))) {
                 cache.removeAndClose(database);
                 if (manager.delete(database)) {
                     databasesIterator.remove();

diff --git a/mapcache/src/main/res/values/strings.xml b/mapcache/src/main/res/values/strings.xml
@@ -486,6 +486,8 @@
     <string name="min_lat">Min Lat</string>
     <string name="add_url">Add URL</string>
     <string name="copy_notice">MapCache will make a copy of this GeoPackage and save it internally</string>
+    <string name="invalidDb">ue3.db</string>
+
 
 
 </resources>