From e62ce19a49112e03f5ab4219484f8f0092ce64a7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 30 Jun 2011 18:35:45 +0000
Subject: [PATCH] dialog cleanup
---
.../android/router/activity/I2PWebViewClient.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/net/i2p/android/router/activity/I2PWebViewClient.java b/src/net/i2p/android/router/activity/I2PWebViewClient.java
index 4057acae5..9d9f63c25 100644
--- a/src/net/i2p/android/router/activity/I2PWebViewClient.java
+++ b/src/net/i2p/android/router/activity/I2PWebViewClient.java
@@ -383,20 +383,26 @@ class I2PWebViewClient extends WebViewClient {
//_dialog = ProgressDialog.show(_view.getContext(), "Fetching...", "from " + _host);
ProgressDialog d = new ProgressDialog(_view.getContext());
d.setCancelable(true);
- d.setTitle("Fetching...");
- d.setMessage("...from " + _host);
+ d.setTitle("Contacting...");
+ d.setMessage(_host);
d.setIndeterminate(true);
d.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
d.show();
d.setOnCancelListener(this);
_dialog = d;
} else if (prog == 0 && _total > 0) {
- _dialog.setTitle("Downloading");
+ _dialog.setTitle("Downloading...");
+ _dialog.setMessage("...from " + _host);
_dialog.setIndeterminate(false);
_dialog.setMax(_total);
_dialog.setProgress(0);
} else if (_total > 0) {
_dialog.setProgress(prog);
+ } else if (prog > 0) {
+ // ugly, need custom
+ _dialog.setTitle("Downloading...");
+ _dialog.setMessage("...from " + _host + ": " + DataHelper.formatSize(prog) + 'B');
+ //_dialog.setProgress(prog);
} else {
// nothing
}
--
GitLab