Fix:Android:Fix file size shown in download dialog, when resuming downloads

[profile/ivi/navit.git] / navit / navit / android / src / org / navitproject / navit / NavitMapDownloader.java

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 2035332..df69919 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -345,7 +345,7 @@ public class NavitMapDownloader extends Thread
                Log.d(TAG, "stop_me -> true");\r
        }\r
 \r
-       public NavitMapDownloader(int map_id, int dialog_num)\r
+       public NavitMapDownloader(int map_id)\r
        {\r
                this.map_values = osm_maps[map_id];\r
        }\r
@@ -435,7 +435,7 @@ public class NavitMapDownloader extends Thread
                                        file.delete();\r
                                }\r
                        }\r
-                               \r
+\r
                        if (url == null)\r
                        {\r
                                url = new URL("http://maps.navit-project.org/api/map/?bbox=" + map_values.lon1 + ","\r
@@ -455,12 +455,11 @@ public class NavitMapDownloader extends Thread
                                already_read = old_download_size;\r
                        }\r
 \r
-                       real_size_bytes = c.getContentLength();\r
+                       real_size_bytes = c.getContentLength() + already_read;\r
                        long fileTime = c.getLastModified();\r
-                       Log.d(TAG, "size: " + real_size_bytes \r
+                       Log.d(TAG, "size: " + real_size_bytes\r
                                        + ", read: " + already_read\r
                                        + ", timestamp: " + fileTime);\r
-                       \r
 \r
                        if (!resume)\r
                        {\r
@@ -471,9 +470,10 @@ public class NavitMapDownloader extends Thread
                                infoStream.writeUTF(c.getURL().getProtocol());\r
                                infoStream.writeUTF(c.getURL().getHost());\r
                                infoStream.writeUTF(c.getURL().getFile());\r
+                               infoStream.writeLong(real_size_bytes);\r
                                infoStream.close();\r
                        }\r
-                       \r
+\r
                        Log.v(TAG, "Connection ref: " + c.getURL());\r
                        if ( real_size_bytes <= 0)\r
                                real_size_bytes = map_values.est_size_bytes;\r