From ec08ba05516dd24316aadb497bf9a48418dbe7d9 Mon Sep 17 00:00:00 2001 From: rikky Date: Tue, 22 May 2012 16:31:17 +0000 Subject: [PATCH] Fix:Android:Fix file size shown in download dialog, when resuming downloads git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5111 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- .../android/src/org/navitproject/navit/NavitMapDownloader.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java index b6c386d..df69919 100644 --- a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java +++ b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java @@ -435,7 +435,7 @@ public class NavitMapDownloader extends Thread file.delete(); } } - + if (url == null) { url = new URL("http://maps.navit-project.org/api/map/?bbox=" + map_values.lon1 + "," @@ -455,12 +455,11 @@ public class NavitMapDownloader extends Thread already_read = old_download_size; } - real_size_bytes = c.getContentLength(); + real_size_bytes = c.getContentLength() + already_read; long fileTime = c.getLastModified(); - Log.d(TAG, "size: " + real_size_bytes + Log.d(TAG, "size: " + real_size_bytes + ", read: " + already_read + ", timestamp: " + fileTime); - if (!resume) { @@ -471,9 +470,10 @@ public class NavitMapDownloader extends Thread infoStream.writeUTF(c.getURL().getProtocol()); infoStream.writeUTF(c.getURL().getHost()); infoStream.writeUTF(c.getURL().getFile()); + infoStream.writeLong(real_size_bytes); infoStream.close(); } - + Log.v(TAG, "Connection ref: " + c.getURL()); if ( real_size_bytes <= 0) real_size_bytes = map_values.est_size_bytes; -- 2.7.4