From 857c72d6910abbdc6c660c6a68c596323e95f6b8 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 18:17:23 +0200 Subject: [PATCH 01/16] Fix typo --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 0de70b382..942d97049 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -172,7 +172,7 @@ Please submit bug reports, contribute new features and ask questions at Add Cc/Bcc Read receipt Will request read receipt - Will not not request read receipt + Will not request read receipt Add attachment Add attachment (Image) Add attachment (Video) From 945e539341f54485900133c4079844427d5ad167 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 18:24:22 +0200 Subject: [PATCH 02/16] Remove some unused strings --- res/values/strings.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 942d97049..bc0e7b274 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -347,16 +347,6 @@ Please submit bug reports, contribute new features and ask questions at Always Show a button in the notification that allows quick message deletion - Batch buttons - Configure message list batch buttons - Mark read/unread - Delete - Move to archive - No archive folders. - Move - Flag - Unselect - Quiet Time Disable ringing, buzzing and flashing at night Quiet Time starts @@ -762,12 +752,9 @@ Please submit bug reports, contribute new features and ask questions at Clear Account - Be sure to enable POP3 on the Yahoo mail settings page. Be sure to enable IMAP or POP3 on the au one mail settings page. Be sure to enable IMAP or POP3 on the Naver mail settings page. Be sure to enable IMAP or POP3 on the Hanmail(Daum) mail settings page. - Be sure to enable IMAP or POP3 on the Paran mail settings page. - Be sure to enable IMAP or POP3 on the Nate mail settings page. Unrecognized Certificate Accept Key From 4df53080d39934f8a66f668479359e1229a054d9 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 18:48:57 +0200 Subject: [PATCH 03/16] Ignore missing translations --- lint.xml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lint.xml diff --git a/lint.xml b/lint.xml new file mode 100644 index 000000000..db997a536 --- /dev/null +++ b/lint.xml @@ -0,0 +1,4 @@ + + + + From 19b808b93b807997a1339ecf8203318a8e9f4f6f Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 18:50:30 +0200 Subject: [PATCH 04/16] Don't use hardcoded package in namespace --- res/layout/color_picker_dialog.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/layout/color_picker_dialog.xml b/res/layout/color_picker_dialog.xml index f34f6c8ed..3a1f1a108 100644 --- a/res/layout/color_picker_dialog.xml +++ b/res/layout/color_picker_dialog.xml @@ -1,6 +1,6 @@ @@ -12,4 +12,4 @@ app:pointer_size="48" app:wheel_size="16" /> - \ No newline at end of file + From c53973910fa3547b8af53819b0f34920840e9f29 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 18:53:47 +0200 Subject: [PATCH 05/16] View class referenced from a layout should be public --- src/com/fsck/k9/activity/MessageCompose.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 8dad95547..d82e565b9 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -4230,7 +4230,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, * {@code \r\n} to {@code \n} and back again when setting and getting text. * */ - private static class EolConvertingEditText extends EditText { + public static class EolConvertingEditText extends EditText { public EolConvertingEditText(Context context, AttributeSet attrs) { super(context, attrs); From ab72aa0dd71032a68660a81d8fe4cea1b744acf2 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 19:17:50 +0200 Subject: [PATCH 06/16] Don't reuse IDs --- res/menu/message_list_option.xml | 8 ++++---- src/com/fsck/k9/activity/MessageList.java | 24 ++++++++++++----------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml index 09c850865..9e020ff88 100644 --- a/res/menu/message_list_option.xml +++ b/res/menu/message_list_option.xml @@ -111,22 +111,22 @@ android:title="@string/refile_action"> diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index ef706cbeb..9726f2a81 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -867,19 +867,23 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme mMessageViewFragment.onToggleRead(); return true; } - case R.id.archive: { + case R.id.archive: + case R.id.refile_archive: { mMessageViewFragment.onArchive(); return true; } - case R.id.spam: { + case R.id.spam: + case R.id.refile_spam: { mMessageViewFragment.onSpam(); return true; } - case R.id.move: { + case R.id.move: + case R.id.refile_move: { mMessageViewFragment.onMove(); return true; } - case R.id.copy: { + case R.id.copy: + case R.id.refile_copy: { mMessageViewFragment.onCopy(); return true; } @@ -1035,14 +1039,12 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme /* * Set visibility of copy, move, archive, spam in action bar and refile submenu */ - Menu refileSubmenu = menu.findItem(R.id.refile).getSubMenu(); - if (mMessageViewFragment.isCopyCapable()) { menu.findItem(R.id.copy).setVisible(K9.isMessageViewCopyActionVisible()); - refileSubmenu.findItem(R.id.copy).setVisible(true); + menu.findItem(R.id.refile_copy).setVisible(true); } else { menu.findItem(R.id.copy).setVisible(false); - refileSubmenu.findItem(R.id.copy).setVisible(false); + menu.findItem(R.id.refile_copy).setVisible(false); } if (mMessageViewFragment.isMoveCapable()) { @@ -1055,9 +1057,9 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme menu.findItem(R.id.spam).setVisible(canMessageBeMovedToSpam && K9.isMessageViewSpamActionVisible()); - refileSubmenu.findItem(R.id.move).setVisible(true); - refileSubmenu.findItem(R.id.archive).setVisible(canMessageBeArchived); - refileSubmenu.findItem(R.id.spam).setVisible(canMessageBeMovedToSpam); + menu.findItem(R.id.refile_move).setVisible(true); + menu.findItem(R.id.refile_archive).setVisible(canMessageBeArchived); + menu.findItem(R.id.refile_spam).setVisible(canMessageBeMovedToSpam); } else { menu.findItem(R.id.move).setVisible(false); menu.findItem(R.id.archive).setVisible(false); From 114d72da3c9bdd4ef729e64c64f561f272ea5771 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 19:31:10 +0200 Subject: [PATCH 07/16] Remove deprecated resource attributes --- res/layout/account_setup_basics.xml | 1 - res/layout/account_setup_incoming.xml | 1 - res/layout/account_setup_outgoing.xml | 1 - res/layout/message_compose.xml | 8 -------- 4 files changed, 11 deletions(-) diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml index 4d7129373..2c4028414 100644 --- a/res/layout/account_setup_basics.xml +++ b/res/layout/account_setup_basics.xml @@ -29,7 +29,6 @@ android:id="@+id/account_password" android:inputType="textPassword" android:hint="@string/account_setup_basics_password_hint" - android:password="true" android:singleLine="true" android:layout_height="wrap_content" android:layout_width="fill_parent" diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml index fa2b70122..94b584dab 100644 --- a/res/layout/account_setup_incoming.xml +++ b/res/layout/account_setup_incoming.xml @@ -37,7 +37,6 @@ android:textColor="?android:attr/textColorPrimary" /> @@ -265,8 +262,6 @@ android:layout_height="wrap_content" android:gravity="top" android:minLines="3" - android:autoText="true" - android:capitalize="sentences" android:inputType="textMultiLine|textAutoCorrect|textCapSentences" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -307,10 +302,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="top" - android:editable="false" android:minLines="0" - android:autoText="true" - android:capitalize="sentences" android:hint="@string/message_compose_signature_hint" android:inputType="textMultiLine|textAutoCorrect|textCapSentences" android:textAppearance="?android:attr/textAppearanceMedium" /> From 0526ddd2aaf2cb7742ac6482c0265090466867e4 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 19:52:37 +0200 Subject: [PATCH 08/16] Remove unused resources --- .../actionbar_indeterminate_progress.xml | 14 ------------- res/values/arrays.xml | 20 ------------------- res/values/dimensions.xml | 1 - 3 files changed, 35 deletions(-) delete mode 100644 res/layout/actionbar_indeterminate_progress.xml diff --git a/res/layout/actionbar_indeterminate_progress.xml b/res/layout/actionbar_indeterminate_progress.xml deleted file mode 100644 index c7e8dbbf5..000000000 --- a/res/layout/actionbar_indeterminate_progress.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index e87049e3b..45e0314e1 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -559,26 +559,6 @@ 22 - - @string/font_size_webview_smaller - @string/font_size_webview_small - @string/font_size_webview_normal - @string/font_size_webview_large - @string/font_size_webview_larger - - - - - 1 - 2 - 3 - 4 - 5 - - @string/idle_refresh_period_1min @string/idle_refresh_period_2min diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 57bab0d3d..7d703141c 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -1,5 +1,4 @@ 100sp - 1dp From 136bdbc4833bccbe745f8aa86a7bf721ec65b25f Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 19:56:08 +0200 Subject: [PATCH 09/16] Fix whitespace to get rid of ExtraText lint warnings --- res/drawable/btn_dialog.xml | 4 ++-- res/drawable/btn_edit.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/drawable/btn_dialog.xml b/res/drawable/btn_dialog.xml index ed4c28a32..d1d7e292e 100644 --- a/res/drawable/btn_dialog.xml +++ b/res/drawable/btn_dialog.xml @@ -15,9 +15,9 @@ --> - - diff --git a/res/drawable/btn_edit.xml b/res/drawable/btn_edit.xml index 1002498c6..40ef52bd2 100644 --- a/res/drawable/btn_edit.xml +++ b/res/drawable/btn_edit.xml @@ -15,9 +15,9 @@ --> - - From 8b93d37b393b41eb404058969f844ed75dd81470 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 20:00:14 +0200 Subject: [PATCH 10/16] Suppress warning about "inlined API" --- src/com/fsck/k9/activity/MessageCompose.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index d82e565b9..fa3875f04 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -1,6 +1,7 @@ package com.fsck.k9.activity; +import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.PendingIntent; @@ -2167,6 +2168,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, * @param mime_type * The MIME type we want our attachment to have. */ + @SuppressLint("InlinedApi") private void onAddAttachment2(final String mime_type) { if (mAccount.getCryptoProvider().isAvailable(this) || mAccount.getOpenPgpProvider() != null) { Toast.makeText(this, R.string.attachment_encryption_unsupported, Toast.LENGTH_LONG).show(); From 3da2ef7fbe4ec598cb978c5a034ad51587829617 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 7 Apr 2014 20:00:53 +0200 Subject: [PATCH 11/16] Fix PxUsage warning --- res/layout/account_setup_incoming.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml index 94b584dab..5f0f1bfe1 100644 --- a/res/layout/account_setup_incoming.xml +++ b/res/layout/account_setup_incoming.xml @@ -137,7 +137,7 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" - android:layout_marginTop="4px" /> + android:layout_marginTop="4dp" /> Date: Mon, 7 Apr 2014 20:09:22 +0200 Subject: [PATCH 12/16] Fix SpUsage lint warnings --- res/layout/message_compose.xml | 2 +- res/layout/unread_widget_layout.xml | 4 +++- res/values-land/styles.xml | 4 ++-- res/values/styles.xml | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml index 27db74db1..674004582 100644 --- a/res/layout/message_compose.xml +++ b/res/layout/message_compose.xml @@ -243,7 +243,7 @@