Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/f-droid/fdroidclient

Browse Source
This commit is contained in:
David Black 2013-04-16 22:00:57 +01:00
commit 1c01024733
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/fdroid/fdroid/UpdateService.java
View File

@ -44,8 +44,8 @@ import android.util.Log;
public class UpdateService extends IntentService implements ProgressListener { public class UpdateService extends IntentService implements ProgressListener {
public static final String RESULT_MESSAGE = "msg"; public static final String RESULT_MESSAGE = "msg";
public static final int STATUS_COMPLETE = 0; public static final int STATUS_COMPLETE = 0;
public static final int STATUS_ERROR = 1; public static final int STATUS_ERROR = 1;
public static final int STATUS_INFO = 2; public static final int STATUS_INFO = 2;
@ -339,13 +339,13 @@ public class UpdateService extends IntentService implements ProgressListener {
String message = ""; String message = "";
if (event.type == RepoXMLHandler.PROGRESS_TYPE_DOWNLOAD) { if (event.type == RepoXMLHandler.PROGRESS_TYPE_DOWNLOAD) {
String repoAddress = event.data.getString(RepoXMLHandler.PROGRESS_DATA_REPO); String repoAddress = event.data.getString(RepoXMLHandler.PROGRESS_DATA_REPO);
String downloadedSize = Utils.getFriendlySize( event.progress ); String downloadedSize = Utils.getFriendlySize( event.progress );
String totalSize = Utils.getFriendlySize( event.total ); String totalSize = Utils.getFriendlySize( event.total );
int percent = (int)((double)event.progress/event.total * 100); int percent = (int)((double)event.progress/event.total * 100);
message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent); message = getString(R.string.status_download, repoAddress, downloadedSize, totalSize, percent);
} else if (event.type == RepoXMLHandler.PROGRESS_TYPE_PROCESS_XML) { } else if (event.type == RepoXMLHandler.PROGRESS_TYPE_PROCESS_XML) {
String repoAddress = event.data.getString(RepoXMLHandler.PROGRESS_DATA_REPO); String repoAddress = event.data.getString(RepoXMLHandler.PROGRESS_DATA_REPO);
message = getString(R.string.status_processing_xml, repoAddress, event.progress, event.total); message = getString(R.string.status_processing_xml, repoAddress, event.progress, event.total);
} }