appendMessages(Message[] messages) throws MessagingException {
appendWebDavMessages(messages);
+ return null;
}
public Message[] appendWebDavMessages(Message[] messages) throws MessagingException {
diff --git a/src/com/fsck/k9/mail/store/imap/ImapUtility.java b/src/com/fsck/k9/mail/store/imap/ImapUtility.java
new file mode 100644
index 000000000..d0ac2b31a
--- /dev/null
+++ b/src/com/fsck/k9/mail/store/imap/ImapUtility.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2012 The K-9 Dog Walkers
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.fsck.k9.mail.store.imap;
+
+import android.util.Log;
+
+import com.fsck.k9.K9;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility methods for use with IMAP.
+ */
+public class ImapUtility {
+ /**
+ * Gets all of the values in a sequence set per RFC 3501.
+ *
+ *
+ * Any ranges are expanded into a list of individual numbers.
+ *
+ *
+ *
+ * sequence-number = nz-number / "*"
+ * sequence-range = sequence-number ":" sequence-number
+ * sequence-set = (sequence-number / sequence-range) *("," sequence-set)
+ *
+ *
+ * @param set
+ * The sequence set string as received by the server.
+ *
+ * @return The list of IDs as strings in this sequence set. If the set is invalid, an empty
+ * list is returned.
+ */
+ public static List getImapSequenceValues(String set) {
+ ArrayList list = new ArrayList();
+ if (set != null) {
+ String[] setItems = set.split(",");
+ for (String item : setItems) {
+ if (item.indexOf(':') == -1) {
+ // simple item
+ try {
+ Integer.parseInt(item); // Don't need the value; just ensure it's valid
+ list.add(item);
+ } catch (NumberFormatException e) {
+ Log.d(K9.LOG_TAG, "Invalid UID value", e);
+ }
+ } else {
+ // range
+ list.addAll(getImapRangeValues(item));
+ }
+ }
+ }
+
+ return list;
+ }
+
+ /**
+ * Expand the given number range into a list of individual numbers.
+ *
+ *
+ * sequence-number = nz-number / "*"
+ * sequence-range = sequence-number ":" sequence-number
+ * sequence-set = (sequence-number / sequence-range) *("," sequence-set)
+ *
+ *
+ * @param range
+ * The range string as received by the server.
+ *
+ * @return The list of IDs as strings in this range. If the range is not valid, an empty list
+ * is returned.
+ */
+ public static List getImapRangeValues(String range) {
+ ArrayList list = new ArrayList();
+ try {
+ if (range != null) {
+ int colonPos = range.indexOf(':');
+ if (colonPos > 0) {
+ int first = Integer.parseInt(range.substring(0, colonPos));
+ int second = Integer.parseInt(range.substring(colonPos + 1));
+ if (first < second) {
+ for (int i = first; i <= second; i++) {
+ list.add(Integer.toString(i));
+ }
+ } else {
+ for (int i = first; i >= second; i--) {
+ list.add(Integer.toString(i));
+ }
+ }
+ }
+ }
+ } catch (NumberFormatException e) {
+ Log.d(K9.LOG_TAG, "Invalid range value", e);
+ }
+
+ return list;
+ }
+}
diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java
index c76b8f6aa..2309c1fb1 100644
--- a/src/com/fsck/k9/preferences/AccountSettings.java
+++ b/src/com/fsck/k9/preferences/AccountSettings.java
@@ -96,6 +96,9 @@ public class AccountSettings {
s.put("localStorageProvider", Settings.versions(
new V(1, new StorageProviderSetting())
));
+ s.put("markMessageAsReadOnView", Settings.versions(
+ new V(7, new BooleanSetting(true))
+ ));
s.put("maxPushFolders", Settings.versions(
new V(1, new IntegerRangeSetting(0, 100, 10))
));
diff --git a/src/com/fsck/k9/preferences/Editor.java b/src/com/fsck/k9/preferences/Editor.java
index 412d14ff8..88479d0e2 100644
--- a/src/com/fsck/k9/preferences/Editor.java
+++ b/src/com/fsck/k9/preferences/Editor.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
public class Editor implements android.content.SharedPreferences.Editor {
private Storage storage;
@@ -138,4 +139,9 @@ public class Editor implements android.content.SharedPreferences.Editor {
return this;
}
+ @Override
+ public android.content.SharedPreferences.Editor putStringSet(String arg0, Set arg1) {
+ throw new RuntimeException("Not implemented");
+ }
+
}
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 5032b53f1..b7f0a5b91 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -184,7 +184,7 @@ public class GlobalSettings {
new V(1, new BooleanSetting(false))
));
s.put("theme", Settings.versions(
- new V(1, new ThemeSetting(android.R.style.Theme_Light))
+ new V(1, new ThemeSetting(K9.THEME_LIGHT))
));
s.put("useGalleryBugWorkaround", Settings.versions(
new V(1, new GalleryBugWorkaroundSetting())
@@ -294,34 +294,47 @@ public class GlobalSettings {
/**
* The theme setting.
*/
- public static class ThemeSetting extends PseudoEnumSetting {
- private final Map mMapping;
+ public static class ThemeSetting extends SettingsDescription {
+ private static final String THEME_LIGHT = "light";
+ private static final String THEME_DARK = "dark";
public ThemeSetting(int defaultValue) {
super(defaultValue);
-
- Map mapping = new HashMap();
- mapping.put(android.R.style.Theme_Light, "light");
- mapping.put(android.R.style.Theme, "dark");
- mMapping = Collections.unmodifiableMap(mapping);
- }
-
- @Override
- protected Map getMapping() {
- return mMapping;
}
@Override
public Object fromString(String value) throws InvalidSettingValueException {
try {
Integer theme = Integer.parseInt(value);
- if (mMapping.containsKey(theme)) {
- return theme;
+ if (theme == K9.THEME_LIGHT ||
+ // We used to store the resource ID of the theme in the preference storage,
+ // but don't use the database upgrade mechanism to update the values. So
+ // we have to deal with the old format here.
+ theme == android.R.style.Theme_Light) {
+ return K9.THEME_LIGHT;
+ } else if (theme == K9.THEME_DARK || theme == android.R.style.Theme) {
+ return K9.THEME_DARK;
}
} catch (NumberFormatException e) { /* do nothing */ }
throw new InvalidSettingValueException();
}
+
+ @Override
+ public Object fromPrettyString(String value) throws InvalidSettingValueException {
+ if (THEME_LIGHT.equals(value)) {
+ return K9.THEME_LIGHT;
+ } else if (THEME_DARK.equals(value)) {
+ return K9.THEME_DARK;
+ }
+
+ throw new InvalidSettingValueException();
+ }
+
+ @Override
+ public String toPrettyString(Object value) {
+ return (((Integer)value).intValue() == K9.THEME_LIGHT) ? THEME_LIGHT : THEME_DARK;
+ }
}
/**
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 3b2bbb979..637d6d74d 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
*
* @see SettingsExporter
*/
- public static final int VERSION = 6;
+ public static final int VERSION = 7;
public static Map validate(int version, Map> settings,
diff --git a/src/com/fsck/k9/preferences/Storage.java b/src/com/fsck/k9/preferences/Storage.java
index 34c978754..b9041c8f6 100644
--- a/src/com/fsck/k9/preferences/Storage.java
+++ b/src/com/fsck/k9/preferences/Storage.java
@@ -15,6 +15,7 @@ import java.net.URI;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -399,4 +400,10 @@ public class Storage implements SharedPreferences {
Log.e(K9.LOG_TAG, "Error writing key '" + key + "', value = '" + value + "'");
}
}
+
+
+ @Override
+ public Set getStringSet(String arg0, Set arg1) {
+ throw new RuntimeException("Not implemented");
+ }
}
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index f2c1ec693..0557575af 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -1,18 +1,5 @@
package com.fsck.k9.provider;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import android.content.ContentProvider;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -46,6 +33,19 @@ import com.fsck.k9.mail.Message;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.store.LocalStore;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
public class MessageProvider extends ContentProvider {
public static interface MessageColumns extends BaseColumns {
@@ -60,7 +60,7 @@ public class MessageProvider extends ContentProvider {
* Type: TEXT
*/
String SENDER = "sender";
-
+
/**
* Type: TEXT
*/
@@ -245,7 +245,7 @@ public class MessageProvider extends ContentProvider {
final BlockingQueue> queue = new SynchronousQueue>();
// new code for integrated inbox, only execute this once as it will be processed afterwards via the listener
- final SearchAccount integratedInboxAccount = new SearchAccount(getContext(), true, null, null);
+ final SearchAccount integratedInboxAccount = SearchAccount.createUnifiedInboxAccount(getContext());
final MessagingController msgController = MessagingController.getInstance(K9.app);
msgController.searchLocalMessages(integratedInboxAccount, null,
@@ -714,6 +714,12 @@ public class MessageProvider extends ContentProvider {
checkClosed();
mCursor.unregisterDataSetObserver(observer);
}
+
+ @Override
+ public int getType(int columnIndex) {
+ checkClosed();
+ return mCursor.getType(columnIndex);
+ }
}
protected class ThrottlingQueryHandler implements QueryHandler {
diff --git a/src/com/fsck/k9/service/RemoteControlService.java b/src/com/fsck/k9/service/RemoteControlService.java
index 3cfa52a74..bd21b2061 100644
--- a/src/com/fsck/k9/service/RemoteControlService.java
+++ b/src/com/fsck/k9/service/RemoteControlService.java
@@ -123,7 +123,7 @@ public class RemoteControlService extends CoreService {
String theme = intent.getStringExtra(K9_THEME);
if (theme != null) {
- K9.setK9Theme(K9RemoteControl.K9_THEME_DARK.equals(theme) ? android.R.style.Theme : android.R.style.Theme_Light);
+ K9.setK9Theme(K9RemoteControl.K9_THEME_DARK.equals(theme) ? K9.THEME_DARK : K9.THEME_LIGHT);
}
SharedPreferences sPrefs = preferences.getPreferences();
diff --git a/src/com/fsck/k9/view/AttachmentView.java b/src/com/fsck/k9/view/AttachmentView.java
index 5eccda9eb..b4957637a 100644
--- a/src/com/fsck/k9/view/AttachmentView.java
+++ b/src/com/fsck/k9/view/AttachmentView.java
@@ -43,27 +43,6 @@ import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBodyPart;
import com.fsck.k9.provider.AttachmentProvider;
public class AttachmentView extends FrameLayout implements OnClickListener, OnLongClickListener {
- /**
- * Regular expression that represents characters we won't allow in file names.
- *
- *
- * Allowed are:
- *
- * - word characters (letters, digits, and underscores): {@code \w}
- * - spaces: {@code " "}
- * - special characters: {@code !}, {@code #}, {@code $}, {@code %}, {@code &}, {@code '},
- * {@code (}, {@code )}, {@code -}, {@code @}, {@code ^}, {@code `},
{,
- * }, {@code ~}, {@code .}, {@code ,}
- *
- */
- private static final String INVALID_CHARACTERS = "[^\\w !#$%&'()\\-@\\^`{}~.,]+";
-
- /**
- * Invalid characters in a file name are replaced by this character.
- */
- private static final String REPLACEMENT_CHARACTER = "_";
-
-
private Context mContext;
public Button viewButton;
public Button downloadButton;
@@ -259,7 +238,7 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
*/
public void writeFile(File directory) {
try {
- String filename = sanitizeFilename(name);
+ String filename = Utility.sanitizeFilename(name);
File file = Utility.createUniqueFile(directory, filename);
Uri uri = AttachmentProvider.getAttachmentUri(mAccount, part.getAttachmentId());
InputStream in = mContext.getContentResolver().openInputStream(uri);
@@ -278,18 +257,6 @@ public class AttachmentView extends FrameLayout implements OnClickListener, OnLo
}
}
- /**
- * Replace characters we don't allow in file names with a replacement character.
- *
- * @param filename
- * The original file name.
- *
- * @return The sanitized file name containing only allowed characters.
- */
- private String sanitizeFilename(String filename) {
- return filename.replaceAll(INVALID_CHARACTERS, REPLACEMENT_CHARACTER);
- }
-
/**
* saves the file to the defaultpath setting in the config, or if the config
* is not set => to the Environment
diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java
index 5d5443361..3aa158fa3 100644
--- a/src/com/fsck/k9/view/MessageHeader.java
+++ b/src/com/fsck/k9/view/MessageHeader.java
@@ -50,6 +50,7 @@ public class MessageHeader extends ScrollView implements OnClickListener {
private View mChip;
private View mChip2;
+ private View mChip3;
private CheckBox mFlagged;
private LinearLayout mToContainerView;
private LinearLayout mCcContainerView;
@@ -62,6 +63,8 @@ public class MessageHeader extends ScrollView implements OnClickListener {
private ImageView mShowAdditionalHeadersIcon;
private SavedState mSavedState;
+ private OnLayoutChangedListener mOnLayoutChangedListener;
+
/**
* Pair class is only available since API Level 5, so we need
* this helper class unfortunately
@@ -95,6 +98,7 @@ public class MessageHeader extends ScrollView implements OnClickListener {
mAdditionalHeadersView = (TextView) findViewById(R.id.additional_headers_view);
mChip = findViewById(R.id.chip);
mChip2 = findViewById(R.id.chip2);
+ mChip3 = findViewById(R.id.chip3);
mDateView = (TextView) findViewById(R.id.date);
mTimeView = (TextView) findViewById(R.id.time);
mFlagged = (CheckBox) findViewById(R.id.flagged);
@@ -115,12 +119,16 @@ public class MessageHeader extends ScrollView implements OnClickListener {
((TextView) findViewById(R.id.cc_label)).setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageViewCC());
findViewById(R.id.show_additional_headers_area).setOnClickListener(this);
+ findViewById(R.id.additional_headers_row).setOnClickListener(this);
mFromView.setOnClickListener(this);
+ mToView.setOnClickListener(this);
+ mCcView.setOnClickListener(this);
}
@Override
public void onClick(View view) {
switch (view.getId()) {
+ case R.id.additional_headers_row:
case R.id.show_additional_headers_area: {
onShowAdditionalHeaders();
break;
@@ -129,6 +137,11 @@ public class MessageHeader extends ScrollView implements OnClickListener {
onAddSenderToContacts();
break;
}
+ case R.id.to:
+ case R.id.cc: {
+ expand((TextView)view, ((TextView)view).getEllipsize() != null);
+ layoutChanged();
+ }
}
}
@@ -254,6 +267,8 @@ public class MessageHeader extends ScrollView implements OnClickListener {
mChip.getBackground().setAlpha(chipColorAlpha);
mChip2.setBackgroundColor(chipColor);
mChip2.getBackground().setAlpha(chipColorAlpha);
+ mChip3.setBackgroundColor(chipColor);
+ mChip3.getBackground().setAlpha(chipColorAlpha);
setVisibility(View.VISIBLE);
@@ -271,9 +286,27 @@ public class MessageHeader extends ScrollView implements OnClickListener {
int currentVisibility = mAdditionalHeadersView.getVisibility();
if (currentVisibility == View.VISIBLE) {
hideAdditionalHeaders();
+ expand(mToView, false);
+ expand(mCcView, false);
} else {
showAdditionalHeaders();
+ expand(mToView, true);
+ expand(mCcView, true);
}
+ layoutChanged();
+ }
+
+ /**
+ * Expand or collapse a TextView by removing or adding the 2 lines limitation
+ */
+ private void expand(TextView v, boolean expand) {
+ if (expand) {
+ v.setMaxLines(Integer.MAX_VALUE);
+ v.setEllipsize(null);
+ } else {
+ v.setMaxLines(2);
+ v.setEllipsize(android.text.TextUtils.TruncateAt.END);
+ }
}
private List getAdditionalHeaders(final Message message)
@@ -380,4 +413,18 @@ public class MessageHeader extends ScrollView implements OnClickListener {
out.writeInt((this.additionalHeadersVisible) ? 1 : 0);
}
}
+
+ public interface OnLayoutChangedListener {
+ void onLayoutChanged();
+ }
+
+ public void setOnLayoutChangedListener(OnLayoutChangedListener listener) {
+ mOnLayoutChangedListener = listener;
+ }
+
+ private void layoutChanged() {
+ if (mOnLayoutChangedListener != null) {
+ mOnLayoutChangedListener.onLayoutChanged();
+ }
+ }
}
diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java
index d992b50be..6ec7f50bb 100644
--- a/src/com/fsck/k9/view/MessageWebView.java
+++ b/src/com/fsck/k9/view/MessageWebView.java
@@ -72,6 +72,12 @@ public class MessageWebView extends WebView {
this.setScrollBarStyle(SCROLLBARS_INSIDE_OVERLAY);
this.setLongClickable(true);
+ if (K9.getK9Theme() == K9.THEME_DARK) {
+ // Black theme should get a black webview background
+ // we'll set the background of the messages on load
+ this.setBackgroundColor(0xff000000);
+ }
+
final WebSettings webSettings = this.getSettings();
webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
@@ -104,6 +110,19 @@ public class MessageWebView extends WebView {
}
+ public void setText(String text, String contentType) {
+ String content = text;
+ if (K9.getK9Theme() == K9.THEME_DARK) {
+ // It's a little wrong to just throw in the "
+ + content;
+ }
+ loadDataWithBaseURL("http://", content, contentType, "utf-8", null);
+ }
+
/*
* Emulate the shift key being pressed to trigger the text selection mode
* of a WebView.
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index b1e0980e9..54b65b07b 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -7,16 +7,26 @@ import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.database.Cursor;
import android.net.Uri;
+import android.os.AsyncTask;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.AttributeSet;
import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
-import android.view.View.OnClickListener;
+import android.view.View.*;
+import android.webkit.WebView;
+import android.webkit.WebView.HitTestResult;
import android.widget.Button;
import android.widget.LinearLayout;
+import android.widget.Toast;
+
import com.fsck.k9.Account;
import com.fsck.k9.K9;
import com.fsck.k9.R;
@@ -25,15 +35,51 @@ import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.controller.MessagingListener;
import com.fsck.k9.crypto.CryptoProvider;
import com.fsck.k9.crypto.PgpData;
+import com.fsck.k9.helper.ClipboardManager;
import com.fsck.k9.helper.Contacts;
import com.fsck.k9.helper.Utility;
import com.fsck.k9.mail.*;
+import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mail.store.LocalStore;
import com.fsck.k9.mail.store.LocalStore.LocalMessage;
+import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
import java.util.List;
-public class SingleMessageView extends LinearLayout implements OnClickListener {
+public class SingleMessageView extends LinearLayout implements OnClickListener,
+ MessageHeader.OnLayoutChangedListener, OnCreateContextMenuListener {
+ private static final int MENU_ITEM_LINK_VIEW = Menu.FIRST;
+ private static final int MENU_ITEM_LINK_SHARE = Menu.FIRST + 1;
+ private static final int MENU_ITEM_LINK_COPY = Menu.FIRST + 2;
+
+ private static final int MENU_ITEM_IMAGE_VIEW = Menu.FIRST;
+ private static final int MENU_ITEM_IMAGE_SAVE = Menu.FIRST + 1;
+ private static final int MENU_ITEM_IMAGE_COPY = Menu.FIRST + 2;
+
+ private static final int MENU_ITEM_PHONE_CALL = Menu.FIRST;
+ private static final int MENU_ITEM_PHONE_SAVE = Menu.FIRST + 1;
+ private static final int MENU_ITEM_PHONE_COPY = Menu.FIRST + 2;
+
+ private static final int MENU_ITEM_EMAIL_SEND = Menu.FIRST;
+ private static final int MENU_ITEM_EMAIL_SAVE = Menu.FIRST + 1;
+ private static final int MENU_ITEM_EMAIL_COPY = Menu.FIRST + 2;
+
+ private static final String[] ATTACHMENT_PROJECTION = new String[] {
+ AttachmentProviderColumns._ID,
+ AttachmentProviderColumns.DISPLAY_NAME
+ };
+ private static final int DISPLAY_NAME_INDEX = 1;
+
+
private boolean mScreenReaderEnabled;
private MessageCryptoView mCryptoView;
private MessageWebView mMessageContentView;
@@ -56,15 +102,20 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
private View mAttachmentsContainer;
private LinearLayout mInsideAttachmentsContainer;
private SavedState mSavedState;
+ private ClipboardManager mClipboardManager;
+
public void initialize(Activity activity) {
mMessageContentView = (MessageWebView) findViewById(R.id.message_content);
mAccessibleMessageContentView = (AccessibleWebView) findViewById(R.id.accessible_message_content);
mMessageContentView.configure();
+ activity.registerForContextMenu(mMessageContentView);
+ mMessageContentView.setOnCreateContextMenuListener(this);
mHeaderPlaceHolder = (LinearLayout) findViewById(R.id.message_view_header_container);
mHeaderContainer = (MessageHeader) findViewById(R.id.header_container);
+ mHeaderContainer.setOnLayoutChangedListener(this);
mAttachmentsContainer = findViewById(R.id.attachments_container);
mInsideAttachmentsContainer = (LinearLayout) findViewById(R.id.inside_attachments_container);
@@ -112,6 +163,210 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
mShowMessageAction.setOnClickListener(this);
mShowAttachmentsAction.setOnClickListener(this);
mShowPicturesAction.setOnClickListener(this);
+
+ mClipboardManager = ClipboardManager.getInstance(activity);
+ }
+
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+ super.onCreateContextMenu(menu);
+
+ WebView webview = (WebView) v;
+ WebView.HitTestResult result = webview.getHitTestResult();
+ int type = result.getType();
+ Context context = getContext();
+
+ switch (type) {
+ case HitTestResult.SRC_ANCHOR_TYPE: {
+ final String url = result.getExtra();
+ OnMenuItemClickListener listener = new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ switch (item.getItemId()) {
+ case MENU_ITEM_LINK_VIEW: {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ getContext().startActivity(intent);
+ break;
+ }
+ case MENU_ITEM_LINK_SHARE: {
+ Intent intent = new Intent(Intent.ACTION_SEND);
+ intent.setType("text/plain");
+ intent.putExtra(Intent.EXTRA_TEXT, url);
+ getContext().startActivity(intent);
+ break;
+ }
+ case MENU_ITEM_LINK_COPY: {
+ String label = getContext().getString(
+ R.string.webview_contextmenu_link_clipboard_label);
+ mClipboardManager.setText(label, url);
+ break;
+ }
+ }
+ return true;
+ }
+ };
+
+ menu.setHeaderTitle(url);
+
+ menu.add(Menu.NONE, MENU_ITEM_LINK_VIEW, 0,
+ context.getString(R.string.webview_contextmenu_link_view_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_LINK_SHARE, 1,
+ context.getString(R.string.webview_contextmenu_link_share_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_LINK_COPY, 2,
+ context.getString(R.string.webview_contextmenu_link_copy_action))
+ .setOnMenuItemClickListener(listener);
+
+ break;
+ }
+ case HitTestResult.IMAGE_TYPE:
+ case HitTestResult.SRC_IMAGE_ANCHOR_TYPE: {
+ final String url = result.getExtra();
+ final boolean externalImage = url.startsWith("http");
+ OnMenuItemClickListener listener = new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ switch (item.getItemId()) {
+ case MENU_ITEM_IMAGE_VIEW: {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ if (!externalImage) {
+ // Grant read permission if this points to our
+ // AttachmentProvider
+ intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ }
+ getContext().startActivity(intent);
+ break;
+ }
+ case MENU_ITEM_IMAGE_SAVE: {
+ new DownloadImageTask().execute(url);
+ break;
+ }
+ case MENU_ITEM_IMAGE_COPY: {
+ String label = getContext().getString(
+ R.string.webview_contextmenu_image_clipboard_label);
+ mClipboardManager.setText(label, url);
+ break;
+ }
+ }
+ return true;
+ }
+ };
+
+ menu.setHeaderTitle((externalImage) ?
+ url : context.getString(R.string.webview_contextmenu_image_title));
+
+ menu.add(Menu.NONE, MENU_ITEM_IMAGE_VIEW, 0,
+ context.getString(R.string.webview_contextmenu_image_view_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_IMAGE_SAVE, 1,
+ (externalImage) ?
+ context.getString(R.string.webview_contextmenu_image_download_action) :
+ context.getString(R.string.webview_contextmenu_image_save_action))
+ .setOnMenuItemClickListener(listener);
+
+ if (externalImage) {
+ menu.add(Menu.NONE, MENU_ITEM_IMAGE_COPY, 2,
+ context.getString(R.string.webview_contextmenu_image_copy_action))
+ .setOnMenuItemClickListener(listener);
+ }
+
+ break;
+ }
+ case HitTestResult.PHONE_TYPE: {
+ final String phoneNumber = result.getExtra();
+ OnMenuItemClickListener listener = new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ switch (item.getItemId()) {
+ case MENU_ITEM_PHONE_CALL: {
+ Uri uri = Uri.parse(WebView.SCHEME_TEL + phoneNumber);
+ Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+ getContext().startActivity(intent);
+ break;
+ }
+ case MENU_ITEM_PHONE_SAVE: {
+ Contacts contacts = Contacts.getInstance(getContext());
+ contacts.addPhoneContact(phoneNumber);
+ break;
+ }
+ case MENU_ITEM_PHONE_COPY: {
+ String label = getContext().getString(
+ R.string.webview_contextmenu_phone_clipboard_label);
+ mClipboardManager.setText(label, phoneNumber);
+ break;
+ }
+ }
+
+ return true;
+ }
+ };
+
+ menu.setHeaderTitle(phoneNumber);
+
+ menu.add(Menu.NONE, MENU_ITEM_PHONE_CALL, 0,
+ context.getString(R.string.webview_contextmenu_phone_call_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_PHONE_SAVE, 1,
+ context.getString(R.string.webview_contextmenu_phone_save_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_PHONE_COPY, 2,
+ context.getString(R.string.webview_contextmenu_phone_copy_action))
+ .setOnMenuItemClickListener(listener);
+
+ break;
+ }
+ case WebView.HitTestResult.EMAIL_TYPE: {
+ final String email = result.getExtra();
+ OnMenuItemClickListener listener = new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ switch (item.getItemId()) {
+ case MENU_ITEM_EMAIL_SEND: {
+ Uri uri = Uri.parse(WebView.SCHEME_MAILTO + email);
+ Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+ getContext().startActivity(intent);
+ break;
+ }
+ case MENU_ITEM_EMAIL_SAVE: {
+ Contacts contacts = Contacts.getInstance(getContext());
+ contacts.createContact(new Address(email));
+ break;
+ }
+ case MENU_ITEM_EMAIL_COPY: {
+ String label = getContext().getString(
+ R.string.webview_contextmenu_email_clipboard_label);
+ mClipboardManager.setText(label, email);
+ break;
+ }
+ }
+
+ return true;
+ }
+ };
+
+ menu.setHeaderTitle(email);
+
+ menu.add(Menu.NONE, MENU_ITEM_EMAIL_SEND, 0,
+ context.getString(R.string.webview_contextmenu_email_send_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_EMAIL_SAVE, 1,
+ context.getString(R.string.webview_contextmenu_email_save_action))
+ .setOnMenuItemClickListener(listener);
+
+ menu.add(Menu.NONE, MENU_ITEM_EMAIL_COPY, 2,
+ context.getString(R.string.webview_contextmenu_email_copy_action))
+ .setOnMenuItemClickListener(listener);
+
+ break;
+ }
+ }
}
@Override
@@ -345,7 +600,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
if (mScreenReaderEnabled) {
mAccessibleMessageContentView.loadDataWithBaseURL("http://", emailText, contentType, "utf-8", null);
} else {
- mMessageContentView.loadDataWithBaseURL("http://", emailText, contentType, "utf-8", null);
+ mMessageContentView.setText(emailText, contentType);
mMessageContentView.scrollTo(0, 0);
}
@@ -508,6 +763,12 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
mSavedState = savedState;
}
+ public void onLayoutChanged() {
+ if (mMessageContentView != null) {
+ mMessageContentView.invalidate();
+ }
+ }
+
static class SavedState extends BaseSavedState {
boolean attachmentViewVisible;
boolean hiddenAttachmentsVisible;
@@ -547,4 +808,117 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
out.writeInt((this.showPictures) ? 1 : 0);
}
}
+
+ class DownloadImageTask extends AsyncTask {
+ @Override
+ protected String doInBackground(String... params) {
+ String urlString = params[0];
+ try {
+ boolean externalImage = urlString.startsWith("http");
+
+ String filename = null;
+ String mimeType = null;
+ InputStream in = null;
+
+ try {
+ if (externalImage) {
+ URL url = new URL(urlString);
+ URLConnection conn = url.openConnection();
+ in = conn.getInputStream();
+
+ String path = url.getPath();
+
+ // Try to get the filename from the URL
+ int start = path.lastIndexOf("/");
+ if (start != -1 && start + 1 < path.length()) {
+ filename = URLDecoder.decode(path.substring(start + 1), "UTF-8");
+ } else {
+ // Use a dummy filename if necessary
+ filename = "saved_image";
+ }
+
+ // Get the MIME type if we couldn't find a file extension
+ if (filename.indexOf('.') == -1) {
+ mimeType = conn.getContentType();
+ }
+ } else {
+ ContentResolver contentResolver = getContext().getContentResolver();
+ Uri uri = Uri.parse(urlString);
+
+ // Get the filename from AttachmentProvider
+ Cursor cursor = contentResolver.query(uri, ATTACHMENT_PROJECTION, null, null, null);
+ if (cursor != null) {
+ try {
+ if (cursor.moveToNext()) {
+ filename = cursor.getString(DISPLAY_NAME_INDEX);
+ }
+ } finally {
+ cursor.close();
+ }
+ }
+
+ // Use a dummy filename if necessary
+ if (filename == null) {
+ filename = "saved_image";
+ }
+
+ // Get the MIME type if we couldn't find a file extension
+ if (filename.indexOf('.') == -1) {
+ mimeType = contentResolver.getType(uri);
+ }
+
+ in = contentResolver.openInputStream(uri);
+ }
+
+ // Do we still need an extension?
+ if (filename.indexOf('.') == -1) {
+ // Use JPEG as fallback
+ String extension = "jpeg";
+ if (mimeType != null) {
+ // Try to find an extension for the given MIME type
+ String ext = MimeUtility.getExtensionByMimeType(mimeType);
+ if (ext != null) {
+ extension = ext;
+ }
+ }
+ filename += "." + extension;
+ }
+
+ String sanitized = Utility.sanitizeFilename(filename);
+
+ File directory = new File(K9.getAttachmentDefaultPath());
+ File file = Utility.createUniqueFile(directory, sanitized);
+ FileOutputStream out = new FileOutputStream(file);
+ try {
+ IOUtils.copy(in, out);
+ out.flush();
+ } finally {
+ out.close();
+ }
+
+ return file.getName();
+
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ @Override
+ protected void onPostExecute(String filename) {
+ String text;
+ if (filename == null) {
+ text = getContext().getString(R.string.image_saving_failed);
+ } else {
+ text = getContext().getString(R.string.image_saved_as, filename);
+ }
+
+ Toast.makeText(getContext(), text, Toast.LENGTH_LONG).show();
+ }
+ }
}
diff --git a/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java b/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
new file mode 100644
index 000000000..8bf122395
--- /dev/null
+++ b/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
@@ -0,0 +1,39 @@
+package com.fsck.k9.mail.internet;
+
+import android.test.AndroidTestCase;
+
+public class MimeUtilityTest extends AndroidTestCase {
+
+ public void testGetHeaderParameter() {
+ String result;
+
+ /* Test edge cases */
+ result = MimeUtility.getHeaderParameter(";", null);
+ assertEquals(null, result);
+
+ result = MimeUtility.getHeaderParameter("name", "name");
+ assertEquals(null, result);
+
+ result = MimeUtility.getHeaderParameter("name=", "name");
+ assertEquals("", result);
+
+ result = MimeUtility.getHeaderParameter("name=\"", "name");
+ assertEquals("\"", result);
+
+ /* Test expected cases */
+ result = MimeUtility.getHeaderParameter("name=value", "name");
+ assertEquals("value", result);
+
+ result = MimeUtility.getHeaderParameter("name = value", "name");
+ assertEquals("value", result);
+
+ result = MimeUtility.getHeaderParameter("name=\"value\"", "name");
+ assertEquals("value", result);
+
+ result = MimeUtility.getHeaderParameter("name = \"value\"" , "name");
+ assertEquals("value", result);
+
+ result = MimeUtility.getHeaderParameter("name=\"\"", "name");
+ assertEquals("", result);
+ }
+}
diff --git a/tests/src/com/fsck/k9/mail/store/ImapResponseParserTest.java b/tests/src/com/fsck/k9/mail/store/ImapResponseParserTest.java
index 7353e23e7..f521b80b0 100644
--- a/tests/src/com/fsck/k9/mail/store/ImapResponseParserTest.java
+++ b/tests/src/com/fsck/k9/mail/store/ImapResponseParserTest.java
@@ -59,6 +59,36 @@ public class ImapResponseParserTest extends TestCase {
assertEquals("token2", respTextCode.get(1));
}
+ public void testImapListMethods() throws IOException {
+ ImapList list = new ImapList();
+ list.add("ONE");
+ list.add("TWO");
+ list.add("THREE");
+
+ assertTrue(list.containsKey("ONE"));
+ assertTrue(list.containsKey("TWO"));
+ assertFalse(list.containsKey("THREE"));
+ assertFalse(list.containsKey("nonexistent"));
+
+ assertEquals("TWO", list.getKeyedValue("ONE"));
+ assertEquals("THREE", list.getKeyedValue("TWO"));
+ assertNull(list.getKeyedValue("THREE"));
+ assertNull(list.getKeyedValue("nonexistent"));
+
+ assertEquals(0, list.getKeyIndex("ONE"));
+ assertEquals(1, list.getKeyIndex("TWO"));
+
+ try {
+ list.getKeyIndex("THREE");
+ fail("IllegalArgumentException should have been thrown");
+ } catch (IllegalArgumentException e) { /* do nothing */ }
+
+ try {
+ list.getKeyIndex("nonexistent");
+ fail("IllegalArgumentException should have been thrown");
+ } catch (IllegalArgumentException e) { /* do nothing */ }
+ }
+
private ImapResponseParser createParser(String response) {
ByteArrayInputStream in = new ByteArrayInputStream(response.getBytes());
PeekableInputStream pin = new PeekableInputStream(in);
diff --git a/tests/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/tests/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
new file mode 100644
index 000000000..496d6922e
--- /dev/null
+++ b/tests/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2012 The K-9 Dog Walkers
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.fsck.k9.mail.store.imap;
+
+import java.util.List;
+import android.test.MoreAsserts;
+import junit.framework.TestCase;
+
+public class ImapUtilityTest extends TestCase {
+ /**
+ * Test getting elements of an IMAP sequence set.
+ */
+ public void testGetImapSequenceValues() {
+ String[] expected;
+ List actual;
+
+ // Test valid sets
+ expected = new String[] {"1"};
+ actual = ImapUtility.getImapSequenceValues("1");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[] {"1", "3", "2"};
+ actual = ImapUtility.getImapSequenceValues("1,3,2");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[] {"4", "5", "6"};
+ actual = ImapUtility.getImapSequenceValues("4:6");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[] {"9", "8", "7"};
+ actual = ImapUtility.getImapSequenceValues("9:7");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[] {"1", "2", "3", "4", "9", "8", "7"};
+ actual = ImapUtility.getImapSequenceValues("1,2:4,9:7");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ // Test partially invalid sets
+ expected = new String[] { "1", "5" };
+ actual = ImapUtility.getImapSequenceValues("1,x,5");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[] { "1", "2", "3" };
+ actual = ImapUtility.getImapSequenceValues("a:d,1:3");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ // Test invalid sets
+ expected = new String[0];
+ actual = ImapUtility.getImapSequenceValues("");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapSequenceValues(null);
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapSequenceValues("a");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapSequenceValues("1:x");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+ }
+
+ /**
+ * Test getting elements of an IMAP range.
+ */
+ public void testGetImapRangeValues() {
+ String[] expected;
+ List actual;
+
+ // Test valid ranges
+ expected = new String[] {"1", "2", "3"};
+ actual = ImapUtility.getImapRangeValues("1:3");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[] {"16", "15", "14"};
+ actual = ImapUtility.getImapRangeValues("16:14");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ // Test in-valid ranges
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues("");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues(null);
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues("a");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues("6");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues("1:3,6");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues("1:x");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+
+ expected = new String[0];
+ actual = ImapUtility.getImapRangeValues("1:*");
+ MoreAsserts.assertEquals(expected, actual.toArray());
+ }
+}