From 5041a2c8320dc362d76a6622583a833d88c62787 Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 4 Apr 2012 10:04:57 +0200 Subject: [PATCH] SingleMessageView cleanup --- assets/empty.html | 11 ---------- assets/loading.html | 17 --------------- assets/test.html | 18 ---------------- res/values/strings.xml | 4 +++- src/com/fsck/k9/activity/MessageView.java | 5 +++-- src/com/fsck/k9/view/SingleMessageView.java | 23 +++++++++++---------- 6 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 assets/empty.html delete mode 100644 assets/loading.html delete mode 100644 assets/test.html diff --git a/assets/empty.html b/assets/empty.html deleted file mode 100644 index ae837b940..000000000 --- a/assets/empty.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - -
- No text -
- - diff --git a/assets/loading.html b/assets/loading.html deleted file mode 100644 index fc8c14ac8..000000000 --- a/assets/loading.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - -
- Loading... -
-
-
-
-
- -
- - \ No newline at end of file diff --git a/assets/test.html b/assets/test.html deleted file mode 100644 index 09d6f119e..000000000 --- a/assets/test.html +++ /dev/null @@ -1,18 +0,0 @@ - - -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus dui dui, luctus sit amet, hendrerit ac, blandit quis, diam. Duis libero velit, elementum id, mattis ut, fermentum aliquet, tortor. Maecenas tincidunt egestas pede. Integer sagittis ipsum ut lorem. Morbi egestas egestas sapien. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis eget erat ac sem iaculis sollicitudin. Maecenas in velit id mauris cursus tincidunt. Sed ultrices elit in sapien ullamcorper imperdiet. Nunc viverra, lacus id varius elementum, nisl turpis lacinia tellus, sit amet viverra neque odio quis nisl. Quisque facilisis, ipsum non vulputate malesuada, leo augue elementum tortor, nec eleifend tellus lectus non massa. -

-Maecenas pulvinar rutrum risus. Phasellus mattis arcu sit amet neque. Aliquam sed quam at nulla laoreet pretium. Proin elit. Integer ullamcorper dolor a pede. Nam lobortis quam ut mauris. Pellentesque non mauris ut lacus hendrerit iaculis. In volutpat nulla et turpis. Fusce mollis. Aliquam sit amet tortor fermentum orci lacinia convallis. Donec tincidunt tortor sed erat sollicitudin gravida. In hac habitasse platea dictumst. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed pulvinar arcu consectetuer dolor. Nunc luctus aliquam leo. In hac habitasse platea dictumst. Praesent et mi sit amet ligula blandit hendrerit. Nam aliquam tincidunt est. Aliquam erat volutpat. -

-Curabitur augue. Fusce pulvinar nisi vitae diam. Donec dictum. Sed suscipit convallis magna. Ut hendrerit tortor in mauris. In at diam. Maecenas commodo. Aliquam erat volutpat. Nunc odio eros, vestibulum at, sodales id, congue et, risus. Curabitur feugiat blandit lacus. Nulla gravida placerat enim. Nunc turpis. Praesent malesuada. -

-Aenean quis erat. Vivamus non ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed metus magna, porta eu, ultricies vitae, vulputate et, urna. Sed pulvinar, massa at ultricies rhoncus, nunc eros dapibus felis, quis congue risus orci rhoncus nibh. Pellentesque quam ante, laoreet vitae, iaculis a, gravida in, nibh. In hac habitasse platea dictumst. Aliquam erat volutpat. Suspendisse augue neque, posuere eu, sollicitudin quis, sagittis et, massa. Maecenas varius sem sodales ipsum. Donec congue mi nec orci. Nam pede ipsum, varius sed, condimentum ac, rhoncus non, lorem. Integer vestibulum, neque vitae ornare euismod, mauris turpis congue massa, non venenatis arcu lorem eget metus. Sed sollicitudin, enim aliquam pharetra cursus, neque augue bibendum leo, vitae ullamcorper ante felis nec massa. Maecenas vitae urna. Proin tincidunt, urna eu sodales vulputate, nisl tellus pretium ligula, ut venenatis metus nulla eu lectus. Integer urna purus, sagittis ut, posuere sed, sagittis non, mauris. Nunc eros risus, lacinia sit amet, dictum in, faucibus quis, urna. Fusce dictum mattis enim. Vivamus luctus sagittis felis. -

-Fusce pulvinar, erat a facilisis congue, lacus libero imperdiet dui, nec luctus justo neque sit amet mauris. Praesent sodales. Sed sed nisl a arcu tempus placerat. Duis sagittis risus. Aliquam tristique. Ut a mi. Integer volutpat, turpis vitae lobortis blandit, lorem sapien suscipit arcu, sit amet dignissim felis mauris vitae ipsum. Sed elit. Mauris elementum, pede nec accumsan pretium, leo metus fringilla erat, at feugiat turpis arcu pretium urna. Morbi lorem tellus, commodo sed, convallis id, suscipit sed, leo. Donec egestas ultricies tellus. Curabitur sapien orci, interdum nec, molestie at, pharetra eu, magna. Duis pharetra orci sed felis posuere malesuada. Donec nec nisi non urna ultricies porttitor. Maecenas lectus. Sed dignissim malesuada justo. Nunc rutrum consectetuer nunc. - - - more text - - more text - - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 0851d3823..6cffb0097 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -300,8 +300,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin More… Fetching attachment. Unable to find viewer for %s. - Download complete message + Downloading… Not all headers have been downloaded or saved. Select \"Save all headers locally\" in the account\'s incoming server settings to enable this for the future. @@ -1142,6 +1142,8 @@ the import operation. Please install a file manager application from Android Mar Open Market Close + No text + Open for viewing Share link Copy link to clipboard diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 91ea29690..864668b98 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -980,7 +980,8 @@ public class MessageView extends K9Activity implements OnClickListener { public void run() { if (!clonedMessage.isSet(Flag.X_DOWNLOADED_FULL) && !clonedMessage.isSet(Flag.X_DOWNLOADED_PARTIAL)) { - mMessageView.loadBodyFromUrl("file:///android_asset/downloading.html"); + String text = getString(R.string.message_view_downloading); + mMessageView.showStatusMessage(text); } mMessageView.setHeaders(clonedMessage, account); mMessageView.setOnFlagListener(new OnClickListener() { @@ -1033,7 +1034,7 @@ public class MessageView extends K9Activity implements OnClickListener { } if ((MessageView.this.mMessage == null) || !MessageView.this.mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL)) { - mMessageView.loadBodyFromUrl("file:///android_asset/empty.html"); + mMessageView.showStatusMessage(getString(R.string.webview_empty_message)); } } }); diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java index c5109db8c..31df37bc2 100644 --- a/src/com/fsck/k9/view/SingleMessageView.java +++ b/src/com/fsck/k9/view/SingleMessageView.java @@ -524,15 +524,13 @@ public class SingleMessageView extends LinearLayout implements OnClickListener, resetView(); String type; - String text = pgpData.getDecryptedData(); + String text = null; + if (pgpData != null) { + text = pgpData.getDecryptedData(); + } if (text != null) { - /* - * also return here html instead of text/plain. with text/plain the - * webview does not render the CSS on the darktheme to make the text - * white. so the user is not able to see the mailcontent. - */ type = "text/html"; - + text = "
" + text + "
"; } else { // getTextForDisplay() always returns HTML-ified content. text = message.getTextForDisplay(); @@ -544,7 +542,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener, loadBodyFromText(emailText, contentType); updateCryptoLayout(account.getCryptoProvider(), pgpData, message); } else { - loadBodyFromUrl("file:///android_asset/empty.html"); + showStatusMessage(getContext().getString(R.string.webview_empty_message)); } mHasAttachments = message.hasAttachments(); @@ -596,10 +594,12 @@ public class SingleMessageView extends LinearLayout implements OnClickListener, } } - public void loadBodyFromUrl(String url) { - mMessageContentView.loadUrl(url); + public void showStatusMessage(String status) { + String text = "
" + + status + + "
"; + loadBodyFromText(text, "text/html"); mCryptoView.hide(); - } private void loadBodyFromText(String emailText, String contentType) { @@ -769,6 +769,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener, mSavedState = savedState; } + @Override public void onLayoutChanged() { if (mMessageContentView != null) { mMessageContentView.invalidate();