wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Flag.X_GOT_ALL_HEADERS. Fixes #891

Browse source
This commit is contained in:
Marcel Wiegand 2015-12-13 02:17:38 +01:00
parent 8d451766b5
commit 51fe459dfc
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
k9mail-library/src/main/java/com/fsck/k9/mail/Flag.java
View file

@ -48,11 +48,4 @@ public enum Flag {
* Indicates that the copy of a message to the Sent folder has started.
*/
X_REMOTE_COPY_STARTED,
/**
* Indicates that all headers of the message have been stored in the
* database. If this is false, additional headers might be retrieved from
* the server (if the message is still there).
*/
X_GOT_ALL_HEADERS,
}

1
k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java
View file

@ -433,7 +433,6 @@ class StoreSchemaDefinition implements LockableDatabase.SchemaDefinition {
case X_DESTROYED:
case X_DOWNLOADED_FULL:
case X_DOWNLOADED_PARTIAL:
case X_GOT_ALL_HEADERS:
case X_REMOTE_COPY_STARTED:
case X_SEND_FAILED:
case X_SEND_IN_PROGRESS: {

13
k9mail/src/main/java/com/fsck/k9/view/MessageHeader.java
View file

@ -181,23 +181,12 @@ public class MessageHeader extends LinearLayout implements OnClickListener {
Integer messageToShow = null;
try {
// Retrieve additional headers
boolean allHeadersDownloaded = mMessage.isSet(Flag.X_GOT_ALL_HEADERS);
List<HeaderEntry> additionalHeaders = getAdditionalHeaders(mMessage);
if (!additionalHeaders.isEmpty()) {
// Show the additional headers that we have got.
populateAdditionalHeadersView(additionalHeaders);
mAdditionalHeadersView.setVisibility(View.VISIBLE);
}
if (!allHeadersDownloaded) {
/*
* Tell the user about the "save all headers" setting
*
* NOTE: This is only a temporary solution... in fact,
* the system should download headers on-demand when they
* have not been saved in their entirety initially.
*/
messageToShow = R.string.message_additional_headers_not_downloaded;
} else if (additionalHeaders.isEmpty()) {
} else {
// All headers have been downloaded, but there are no additional headers.
messageToShow = R.string.message_no_additional_headers_available;
}