Merge branch 'sqlitePruningFix' into mergeBunch

Author: brnkhy

Runtime/Mapbox/BaseModule/Data/Platform/Cache/ISqliteCache.cs

@@ -10,7 +10,7 @@ namespace Mapbox.BaseModule.Data.Platform.Cache
 {
 	public interface ISqliteCache
 	{
-		event Action<string> DataPruned;
+		event Action<string> DataPrunedForFile;
 
 		void ReadySqliteDatabase();
 		bool IsUpToDate();

Runtime/Mapbox/BaseModule/Data/Platform/Cache/MapboxCacheManager.cs

@@ -43,7 +43,7 @@ public MapboxCacheManager(UnityContext unityContext, MemoryCache memoryCache, Fi
 
             if (_sqLiteCache != null && _textureFileCache != null)
             {
-                _sqLiteCache.DataPruned += path => _textureFileCache.DeleteByFileRelativePath(path);
+                _sqLiteCache.DataPrunedForFile += path => _textureFileCache.DeleteByFileRelativePath(path);
             }
 
             if (_sqLiteCache != null)

Runtime/Mapbox/BaseModule/Data/Platform/Cache/SQLiteCache/SqliteCache.cs

@@ -15,7 +15,7 @@ namespace Mapbox.BaseModule.Data.Platform.Cache.SQLiteCache
 {
 	public class SqliteCache : ISqliteCache, IDisposable
 	{
-		public event Action<string> DataPruned = s => { };
+		public event Action<string> DataPrunedForFile = s => { };
 
 		public const int PruneCacheDelta = 20;
 
@@ -664,7 +664,7 @@ private void prune()
 				tiles tile = null;
 				try
 				{
-					var cmd = _sqlite.CreateCommand("SELECT * FROM tiles WHERE rowid IN ( SELECT rowid FROM tiles ORDER BY timestamp ASC LIMIT ? );", toDelete);
+					var cmd = _sqlite.CreateCommand("SELECT * FROM tiles WHERE tile_path <> '' AND rowid IN ( SELECT rowid FROM tiles ORDER BY timestamp ASC LIMIT ? );", toDelete);
 					var tilesToDelete = cmd.ExecuteQuery<tiles>();
 					DeleteFile(tilesToDelete);
 
@@ -688,7 +688,7 @@ private void DeleteFile(List<tiles> tilesToDelete)
 		{
 			foreach (var tile in tilesToDelete)
 			{
-				DataPruned(tile.tile_path);
+				DataPrunedForFile(tile.tile_path);
 			}
 		}