From b951a16364435bb9cd07467a03450b170440b79a Mon Sep 17 00:00:00 2001 From: youtaol Date: Tue, 6 Mar 2012 11:40:49 +0800 Subject: [PATCH] Add double convert in SendFusionTablesAsyncTask and SendMapsAsyncTask, to make the computation of update percentage is right. --- .../mytracks/io/fusiontables/SendFusionTablesAsyncTask.java | 2 +- .../android/apps/mytracks/io/maps/SendMapsAsyncTask.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java index eb91bc30a..b8600dcdd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java @@ -454,7 +454,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask { * @param total the number of total locations */ private void updateProgress(int uploaded, int total) { - double totalPercentage = uploaded / total; + double totalPercentage = (double) uploaded / total; double scaledPercentage = totalPercentage * (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN; publishProgress((int) scaledPercentage); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java index f18a3c164..00c866922 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java @@ -472,8 +472,8 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask { * @param total the number of total locations */ private void updateProgress(int uploaded, int total) { - double totalPercentage = uploaded / total; - double scaledPercentage = totalPercentage + double totalPercentage = (double) uploaded / total; + double scaledPercentage = totalPercentage * (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN; publishProgress((int) scaledPercentage); }