From fd52432de5ca6bc9fd01c936850e7cd981056892 Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Fri, 16 Dec 2011 19:58:38 -0800 Subject: [PATCH 1/7] K-9 does not require a touchscreen, but our minsdk version implies it does. That has the unfortunate side-effect of making K-9 not show up on Google TV devices. --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6792a8bb1..ffc9e98df 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -53,6 +53,7 @@ android:label="@string/delete_messages_label" android:description="@string/read_messages_desc"/> + Date: Sun, 25 Dec 2011 23:45:10 +0100 Subject: [PATCH 2/7] Removed unneeded semicolons --- src/com/fsck/k9/activity/setup/AccountSettings.java | 2 +- src/com/fsck/k9/helper/FileBrowserHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index 39e6cd4a6..db1e5ba87 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -727,7 +727,7 @@ public class AccountSettings extends K9PreferenceActivity { mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue())); if (mIsExpungeCapable) { mAccount.setExpungePolicy(mExpungePolicy.getValue()); - }; + } mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked()); mAccount.setSaveAllHeaders(mSaveAllHeaders.isChecked()); mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue())); diff --git a/src/com/fsck/k9/helper/FileBrowserHelper.java b/src/com/fsck/k9/helper/FileBrowserHelper.java index ad8d5bfb1..cf66f2629 100644 --- a/src/com/fsck/k9/helper/FileBrowserHelper.java +++ b/src/com/fsck/k9/helper/FileBrowserHelper.java @@ -92,7 +92,7 @@ public class FileBrowserHelper { } catch (ActivityNotFoundException e) { // Try the next intent in the list listIndex++; - }; + } } while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length)); if (listIndex == PICK_DIRECTORY_INTENTS.length) { From de30c712f96d6e28699139e6960e199216abc606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Sun, 25 Dec 2011 23:52:38 +0100 Subject: [PATCH 3/7] Removed duplicate import --- src/com/fsck/k9/view/MessageCryptoView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/fsck/k9/view/MessageCryptoView.java b/src/com/fsck/k9/view/MessageCryptoView.java index e0e8d0480..003787977 100644 --- a/src/com/fsck/k9/view/MessageCryptoView.java +++ b/src/com/fsck/k9/view/MessageCryptoView.java @@ -5,7 +5,6 @@ import android.content.Context; import android.util.AttributeSet; import android.util.Log; import android.view.View; -import android.widget.LinearLayout; import android.widget.*; import com.fsck.k9.K9; import com.fsck.k9.R; From 1949067979a99d9c525fbd8d8b9e9cdd4f2569c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Sun, 25 Dec 2011 23:53:19 +0100 Subject: [PATCH 4/7] Removed unnecessary return statement --- src/com/fsck/k9/view/MessageHeader.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java index 58ec60ba5..124335f74 100644 --- a/src/com/fsck/k9/view/MessageHeader.java +++ b/src/com/fsck/k9/view/MessageHeader.java @@ -111,7 +111,6 @@ public class MessageHeader extends LinearLayout { @Override public void onClick(View v) { onShowAdditionalHeaders(); - return; } }); From cea6f4468d154f3940b678ba9cdd6aaf6308e541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Mon, 26 Dec 2011 00:03:32 +0100 Subject: [PATCH 5/7] Removed unused private field --- src/com/fsck/k9/mail/store/WebDavStore.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java index d207ba39b..67da1b356 100644 --- a/src/com/fsck/k9/mail/store/WebDavStore.java +++ b/src/com/fsck/k9/mail/store/WebDavStore.java @@ -311,7 +311,6 @@ public class WebDavStore extends Store { private String mPath; /* Stores the path for the server */ private String mAuthPath; /* Stores the path off of the server to post data to for form based authentication */ private String mMailboxPath; /* Stores the user specified path to the mailbox */ - private URI mUri; /* Stores the Uniform Resource Indicator with all connection info */ private boolean mSecure; private WebDavHttpClient mHttpClient = null; From 39ef1ae9a4d69e3453343897d139f73895adfa82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Mon, 26 Dec 2011 00:16:49 +0100 Subject: [PATCH 6/7] Removed overrides merely calling super() --- src/com/fsck/k9/activity/EditIdentity.java | 5 ----- src/com/fsck/k9/activity/setup/AccountSettings.java | 5 ----- src/com/fsck/k9/activity/setup/AccountSetupComposition.java | 6 ------ src/com/fsck/k9/activity/setup/FolderSettings.java | 5 ----- 4 files changed, 21 deletions(-) diff --git a/src/com/fsck/k9/activity/EditIdentity.java b/src/com/fsck/k9/activity/EditIdentity.java index 931609739..bf9eeced8 100644 --- a/src/com/fsck/k9/activity/EditIdentity.java +++ b/src/com/fsck/k9/activity/EditIdentity.java @@ -90,11 +90,6 @@ public class EditIdentity extends K9Activity { } } - @Override - public void onResume() { - super.onResume(); - } - private void saveIdentity() { mIdentity.setDescription(mDescriptionView.getText().toString()); diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index db1e5ba87..152e86f73 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -698,11 +698,6 @@ public class AccountSettings extends K9PreferenceActivity { } } - @Override - public void onResume() { - super.onResume(); - } - private void saveSettings() { if (mAccountDefault.isChecked()) { Preferences.getPreferences(this).setDefaultAccount(mAccount); diff --git a/src/com/fsck/k9/activity/setup/AccountSetupComposition.java b/src/com/fsck/k9/activity/setup/AccountSetupComposition.java index 47815eac8..49f62907a 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupComposition.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupComposition.java @@ -99,12 +99,6 @@ public class AccountSetupComposition extends K9Activity { } } - @Override - public void onResume() { - super.onResume(); - //mAccount.refresh(Preferences.getPreferences(this)); - } - private void saveSettings() { mAccount.setEmail(mAccountEmail.getText().toString()); mAccount.setAlwaysBcc(mAccountAlwaysBcc.getText().toString()); diff --git a/src/com/fsck/k9/activity/setup/FolderSettings.java b/src/com/fsck/k9/activity/setup/FolderSettings.java index 1dabbf0c4..de0b1f072 100644 --- a/src/com/fsck/k9/activity/setup/FolderSettings.java +++ b/src/com/fsck/k9/activity/setup/FolderSettings.java @@ -123,11 +123,6 @@ public class FolderSettings extends K9PreferenceActivity { }); } - @Override - public void onResume() { - super.onResume(); - } - private void saveSettings() throws MessagingException { mFolder.setInTopGroup(mInTopGroup.isChecked()); mFolder.setIntegrate(mIntegrate.isChecked()); From 852dca41245439c56ec429b262bc5b5dcd014600 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 26 Dec 2011 02:30:59 +0100 Subject: [PATCH 7/7] Removed unused import --- src/com/fsck/k9/mail/store/ImapResponseParser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java index d65ae478a..cb0ba2c4f 100644 --- a/src/com/fsck/k9/mail/store/ImapResponseParser.java +++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java @@ -5,7 +5,6 @@ import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.filter.FixedLengthInputStream; import com.fsck.k9.mail.filter.PeekableInputStream; import java.io.IOException; -import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList;