Datasets:

tiginamaria

/

bug-localization

like 2

thundernest/k-9/5110/5106

thundernest

k-9

https://github.com/thundernest/k-9/issues/5106

https://github.com/thundernest/k-9/pull/5110

https://github.com/thundernest/k-9/pull/5110

fixes

Import functionality is almost broken

**Describe the bug** A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: ### 1 1. Export k9s_settings on older App version. 2. Remove older App version. 3. Install build v5.727. 4. Have firewall block App from internet. 5. Import all previously exported settings. 6. (Optional) Enable Internet access for App. 7. All Mail accounts have only an empty "Outbox" folder. ### 2 1. Export k9s_settings on older App version. 2. Remove older App version. 3. Install build v5.727. 4. Let App have internet access. 5. Import all previously exported settings. 6. Provide wrong password for any amount of mail accounts. 7. All Mail accounts, that were provided with a wrong password, have only an empty "Outbox" folder. 8. Remove faulty Mail account. 9. Re-import this faulty mail account, only. 10. The empty "Outbox" folder is now the default folder on top of all folders. 11. Every time you change to this mail account, the "Outbox" folder will _always_ be the first one opened on top. 12. There is no way to set the "Inbox" folder back to top. This is only a summary of all the issues. There are more very similar issues, that I do not want to repeat here. In short, the Import functionality is almost broken; if you just make 1 mistake, you have to uninstall and re-install the whole application. This is no way to treat imports. **Expected behavior** Importing works smoothly. **Environment (please complete the following information):** - K-9 Mail version: v5.727 - Android version: 11 - Device: POCO X3 - Account type: Generic IMAP **Additional context** The "stable" version always crashes, when I try to import settings. That's why I am using the newest "Pre-Release" version. **Logs** Please take some time to [retrieve logs](https://github.com/k9mail/k-9/wiki/LoggingErrors) and attach them here: No, I will not uninstall and re-install the App for the 7th time.

2b769f8db3d1c68c286792fb9f7fee6cace901aa

71e2d24fbbe8301bcaea363ff0b930d8ff3327d5

https://github.com/thundernest/k-9/compare/2b769f8db3d1c68c286792fb9f7fee6cace901aa...71e2d24fbbe8301bcaea363ff0b930d8ff3327d5

diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index 67c365a44..38fb82ca2 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -2356,6 +2356,8 @@ public class MessagingController { sendPendingMessages(account, listener); + refreshFolderListIfStale(account); + try { Account.FolderMode aDisplayMode = account.getFolderDisplayMode(); Account.FolderMode aSyncMode = account.getFolderSyncMode();

['app/core/src/main/java/com/fsck/k9/controller/MessagingController.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/5131/5004

thundernest

k-9

https://github.com/thundernest/k-9/issues/5004

https://github.com/thundernest/k-9/pull/5131

https://github.com/thundernest/k-9/pull/5131

fixes

Email address too long for line

**Describe the bug** A mail address that is too long to fit on the display won't be accepted as one address but two (or more) addresses. **To Reproduce** Try to send an email to an address that is too long for your display width, for example `[email protected]`. The app will now display the address in two lines, in my case like this: `abcdefghijklmnopqrstuvwxyz@outlook. com` The app will now see every line as single address and think you want to send mails to `abcdefghijklmnopqrstuvwxyz@outlook.` and `com`. **Expected behavior** The app should see the address as a single one, even after a new line. **Environment** - K-9 Mail version: 5.721 - Android version: 10 - Device: Samsung Galaxy A9

5655bf3c03147f2d145e750057e12cd1530eacfd

09ab26f763ca53f0dd146636cd72add74647ce3a

https://github.com/thundernest/k-9/compare/5655bf3c03147f2d145e750057e12cd1530eacfd...09ab26f763ca53f0dd146636cd72add74647ce3a

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java index 8e5452e08..72e46e091 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java @@ -204,6 +204,10 @@ public class RecipientSelectView extends TokenCompleteTextView<Recipient> implem @Override public void onFocusChanged(boolean hasFocus, int direction, Rect previous) { + if (!hasFocus) { + performCompletion(); + } + super.onFocusChanged(hasFocus, direction, previous); if (hasFocus) { displayKeyboard();

['app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/5146/4125

thundernest

k-9

https://github.com/thundernest/k-9/issues/4125

https://github.com/thundernest/k-9/pull/5146

https://github.com/thundernest/k-9/pull/5146

fixes

Not handling reject response correctly when multiple recipients

### Similar issues found #3616 ### Root Cause My mail server is enforcing a 'reject' rule on unknown recipient domain. So any email containing unknown domain will **not** be accepted. It works with other MUA I tested, and indeed the 450 error is raised and no mail is sent until the list of recipients is sanitized. In the case of K9-Mail, I end up with a **mangled header missing multiple fields** (From / Date) and with an 'unexpected end of header'. For Googlemail, the server respond waving RFC 5322 and refuse to accept the email. Others will discard and send a report to the recipient regarding the bad formatted email, and Outlook/Microsoft will accept it but it will be blank for the recipient. On K9-Mail side, the email will be stuck forever in the Outbox, trying to resend the botched email every now and then, never succeeding (as expected). ### Expected behavior Whenever a recipient is rejected, the MUA should handle it gracefully. Testing with Thunderbird and SOGo, they both raise the error and do not try further attempts to deliver the email until the 'bad' recipients have been removed from the list. K9-Mail should do the same and stop all attempt on receiving the reject from the mail server until the list of recipients has been sanitized. ### Actual behavior Mail server rejects the email, with and from=<> as per bouncing standards, however K9-Mail basically integrate that bad-formatted header and use it to try sending the email to the rest of the recipients. ### Steps to reproduce 0. Enforce reject rule on unknown recipient domains on your mail server (**before** any permit rule) 1. Prepare an email to multiple recipients with at least one 'bad' recipient (ex: unknown domain. Ex: [email protected]) 2. Send it from K9-Mail 3. Check your Outbox in K9-Mail and your logs on the mail server ### Environment K-9 Mail version: 5.500 Android version: 8.1.0 Account type (IMAP, POP3, WebDAV/Exchange): IMAP Please take some time to [retrieve logs](https://github.com/k9mail/k-9/wiki/LoggingErrors) and attach them here: Logs from the mail server: ``` Jul 23 09:44:35 myhost postfix/smtpd[26369]: connect from XXX.XXX.XXX.137.threembb.co.uk[XXX.XXX.XXX.137] Jul 23 09:44:35 myhost postfix/smtpd[26369]: Anonymous TLS connection established from XXX.XXX.XXX.137.threembb.co.uk[XXX.XXX.XXX.137]: TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits) Jul 23 09:44:35 myhost postfix/smtpd[26369]: CEC231003: client=XXX.XXX.XXX.137.threembb.co.uk[XXX.XXX.XXX.137], sasl_method=PLAIN, [email protected] Jul 23 09:44:35 myhost postfix/smtpd[26369]: CEC231003: reject: RCPT from XXX.XXX.XXX.137.threembb.co.uk[XXX.XXX.XXX.137]: 450 4.1.2 <[email protected]>: <b>Recipient address rejected: Domain not found</b>; from=<[email protected]> to=<[email protected]> proto=ESMTP helo=<[XXX.XXX.XXX.119]> Jul 23 09:44:36 myhost postfix/cleanup[26374]: CEC231003: message-id=<> Jul 23 09:44:36 myhost opendkim[32642]: <b>CEC231003: can't determine message sender; accepting</b> Jul 23 09:44:36 myhost opendmarc[619]: CEC231003: RFC5322 requirement error: missing From field; accepting Jul 23 09:44:36 myhost postfix/qmgr[26269]: CEC231003: from=<[email protected]>, size=213, nrcpt=2 (queue active) Jul 23 09:44:36 myhost postfix/smtp[26375]: Untrusted TLS connection established to gmail-smtp-in.l.google.com[2a00:1450:400c:c0a::1b]:25: TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits) Jul 23 09:44:36 myhost postfix/smtpd[26369]: disconnect from XXX.XXX.XXX.137.threembb.co.uk[XXX.XXX.XXX.137] ehlo=2 starttls=1 auth=1 mail=1 rcpt=2/3 data=1 quit=1 commands=9/10 Jul 23 09:44:36 myhost postfix/smtp[26375]: CEC231003: to=<[email protected]>, relay=gmail-smtp-in.l.google.com[2a00:1450:400c:c0a::1b]:25, delay=0.99, delays=0.4/0.01/0.16/0.43, dsn=5.7.1, status=bounced (host gmail-smtp-in.l.google.com[2a00:1450:400c:c0a::1b] said: 550-5.7.1 [2a01:4f8:10a:2493:b827:a8ff:fe4b:b71c 11] Our system has 550-5.7.1 detected that this message is not RFC 5322 compliant: 550-5.7.1 'From' header is missing. 550-5.7.1 To reduce the amount of spam sent to Gmail, this message has been 550-5.7.1 blocked. Please visit 550-5.7.1 https://support.google.com/mail/?p=RfcMessageNonCompliant 550 5.7.1 and review RFC 5322 specifications for more information. y4si40902182wrr.356 - gsmtp (in reply to end of DATA command)) ```

3457f69c562f47ca1fe5daebfbdb5a02b7c856c4

987325d226dc225c8f9158e4534a3120c938b0e5

https://github.com/thundernest/k-9/compare/3457f69c562f47ca1fe5daebfbdb5a02b7c856c4...987325d226dc225c8f9158e4534a3120c938b0e5

diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java index aeaff52f6..001919834 100644 --- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java +++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java @@ -413,7 +413,6 @@ public class SmtpTransport extends Transport { pipelinedCommands.add(String.format("RCPT TO:<%s>", address)); } - pipelinedCommands.add("DATA"); executePipelinedCommands(pipelinedCommands); readPipelinedResponse(pipelinedCommands); } else { @@ -422,10 +421,10 @@ public class SmtpTransport extends Transport { for (String address : addresses) { executeCommand("RCPT TO:<%s>", address); } - - executeCommand("DATA"); } + executeCommand("DATA"); + EOLConvertingOutputStream msgOut = new EOLConvertingOutputStream( new LineWrapOutputStream(new SmtpDataStuffing(outputStream), 1000)); @@ -618,35 +617,23 @@ public class SmtpTransport extends Transport { private void readPipelinedResponse(Queue<String> pipelinedCommands) throws IOException, MessagingException { String responseLine; List<String> results = new ArrayList<>(); - NegativeSmtpReplyException firstNegativeResponse = null; - boolean dataCommandOk = true; - for (String command : pipelinedCommands) { + MessagingException firstException = null; + for (int i = 0, size = pipelinedCommands.size(); i < size; i++) { results.clear(); responseLine = readCommandResponseLine(results); try { responseLineToCommandResponse(responseLine, results); } catch (MessagingException exception) { - if (command.equals("DATA")) { - dataCommandOk = false; - } - if (firstNegativeResponse == null) { - firstNegativeResponse = (NegativeSmtpReplyException) exception; + if (firstException == null) { + firstException = exception; } } } - if (firstNegativeResponse != null) { - try { - if (dataCommandOk) { - executeCommand("."); - } - throw firstNegativeResponse; - } catch (NegativeSmtpReplyException e) { - throw firstNegativeResponse; - } + if (firstException != null) { + throw firstException; } - } private CommandResponse responseLineToCommandResponse(String line, List<String> results) throws MessagingException { diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java index 06aa6f9e7..33a4025c4 100644 --- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java +++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java @@ -692,9 +692,9 @@ public class SmtpTransportTest { MockSmtpServer server = createServerAndSetupForPlainAuthentication("PIPELINING"); server.expect("MAIL FROM:<user@localhost>"); server.expect("RCPT TO:<user2@localhost>"); - server.expect("DATA"); server.output("250 OK"); server.output("250 OK"); + server.expect("DATA"); server.output("354 End data with <CR><LF>.<CR><LF>"); server.expect("[message data]"); server.expect("."); @@ -740,12 +740,8 @@ public class SmtpTransportTest { MockSmtpServer server = createServerAndSetupForPlainAuthentication("PIPELINING"); server.expect("MAIL FROM:<user@localhost>"); server.expect("RCPT TO:<user2@localhost>"); - server.expect("DATA"); server.output("250 OK"); server.output("550 remote mail to <user2@localhost> not allowed"); - server.output("354 End data with <CR><LF>.<CR><LF>"); - server.expect("."); - server.output("554 no valid recipients"); server.expect("QUIT"); server.output("221 BYE"); server.closeConnection(); @@ -770,10 +766,8 @@ public class SmtpTransportTest { MockSmtpServer server = createServerAndSetupForPlainAuthentication("PIPELINING"); server.expect("MAIL FROM:<user@localhost>"); server.expect("RCPT TO:<user2@localhost>"); - server.expect("DATA"); server.output("250 OK"); server.output("550 remote mail to <user2@localhost> not allowed"); - server.output("554 no valid recipients given"); server.expect("QUIT"); server.output("221 BYE"); server.closeConnection(); @@ -798,13 +792,9 @@ public class SmtpTransportTest { server.expect("MAIL FROM:<user@localhost>"); server.expect("RCPT TO:<user2@localhost>"); server.expect("RCPT TO:<user3@localhost>"); - server.expect("DATA"); server.output("250 OK"); server.output("550 remote mail to <user2@localhost> not allowed"); server.output("550 remote mail to <user3@localhost> not allowed"); - server.output("354 End data with <CR><LF>.<CR><LF>"); - server.expect("."); - server.output("554 no valid recipients given"); server.expect("QUIT"); server.output("221 BYE"); server.closeConnection(); @@ -829,13 +819,9 @@ public class SmtpTransportTest { server.expect("MAIL FROM:<user@localhost>"); server.expect("RCPT TO:<user2@localhost>"); server.expect("RCPT TO:<user3@localhost>"); - server.expect("DATA"); server.output("250 OK"); server.output("250 OK"); server.output("550 remote mail to <user3@localhost> not allowed"); - server.output("354 End data with <CR><LF>.<CR><LF>"); - server.expect("."); - server.output("250 OK"); server.expect("QUIT"); server.output("221 BYE"); server.closeConnection();

['mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java', 'mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/5216/5204

thundernest

k-9

https://github.com/thundernest/k-9/issues/5204

https://github.com/thundernest/k-9/pull/5216

https://github.com/thundernest/k-9/pull/5216

fixes

Crash when sending to address with an umlaut

I haven't done any variation testing, as I just finally found out. What I had was: A contact which I accidentially typed an `ü` instead of `ue`, used the contact suggestion feature for recepient. As soon as I hit send, Android's "Application has stopped working" window popped up, after a restart it's as if nothing had happened. Replacing the character in my contacts helped, but It took me probably a month to figure out what the issue was.

cc2413a180af45b76fa12d4440111d34a1e92c94

12213b53165ff051552483ff32caa4eddef91b14

https://github.com/thundernest/k-9/compare/cc2413a180af45b76fa12d4440111d34a1e92c94...12213b53165ff051552483ff32caa4eddef91b14

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java index e2cf5893e..d9ca0307c 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java @@ -28,6 +28,7 @@ import com.fsck.k9.ui.R; import com.fsck.k9.mail.Address; import com.fsck.k9.view.RecipientSelectView.Recipient; import com.fsck.k9.view.RecipientSelectView.RecipientCryptoStatus; +import org.apache.james.mime4j.util.CharsetUtil; import timber.log.Timber; import static java.lang.String.CASE_INSENSITIVE_ORDER; @@ -240,13 +241,14 @@ public class RecipientLoader extends AsyncTaskLoader<List<Recipient>> { Address[] addresses = Address.parseUnencoded(uid); for (Address address : addresses) { - if (recipientMap.containsKey(address.getAddress())) { + String emailAddress = address.getAddress(); + if (!isSupportedEmailAddress(emailAddress) || recipientMap.containsKey(emailAddress)) { continue; } Recipient recipient = new Recipient(address); recipients.add(recipient); - recipientMap.put(address.getAddress(), recipient); + recipientMap.put(emailAddress, recipient); } } @@ -256,10 +258,12 @@ public class RecipientLoader extends AsyncTaskLoader<List<Recipient>> { private void fillContactDataFromAddresses(Address[] addresses, List<Recipient> recipients, Map<String, Recipient> recipientMap) { for (Address address : addresses) { - // TODO actually query contacts - not sure if this is possible in a single query tho :( - Recipient recipient = new Recipient(address); - recipients.add(recipient); - recipientMap.put(address.getAddress(), recipient); + if (isSupportedEmailAddress(address.getAddress())) { + // TODO actually query contacts - not sure if this is possible in a single query tho :( + Recipient recipient = new Recipient(address); + recipients.add(recipient); + recipientMap.put(address.getAddress(), recipient); + } } } @@ -438,7 +442,7 @@ public class RecipientLoader extends AsyncTaskLoader<List<Recipient>> { String email = cursor.getString(INDEX_EMAIL); // already exists? just skip then - if (email == null || recipientMap.containsKey(email)) { + if (email == null || !isSupportedEmailAddress(email) || recipientMap.containsKey(email)) { // TODO We should probably merging contacts with the same email address continue; } @@ -583,4 +587,7 @@ public class RecipientLoader extends AsyncTaskLoader<List<Recipient>> { } } + private boolean isSupportedEmailAddress(String address) { + return CharsetUtil.isASCII(address); + } }

['app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientLoader.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2003/1965

thundernest

k-9

https://github.com/thundernest/k-9/issues/1965

https://github.com/thundernest/k-9/pull/2003

https://github.com/thundernest/k-9/pull/2003

fixes

CC/BCC Disappear if you tap subject first

### Expected behavior While composing a new email, if I type the subject first, and compose the email, THEN go back and fill out the addresses of BCC and CC. ### Actual behavior While composing a new email, if I type the subject first, the BCC and CC address fields disappear (have them configured to show by default). No way to get them back because the BCC/CC icon is missing (see previous issue) ### Steps to reproduce 1. Tap to compose a new email 2. Tap and type a subject 3. BCC/CC address fields disappear ### Environment K-9 Mail version: 5.201 Android version: 6.0 Account type (IMAP, POP3, WebDAV/Exchange):IMAP

6beb9902dade44b5f6dce8e8e8a2638e7be9e6ef

963645cad626c3ea2f732ebf66390b072aa444f5

https://github.com/thundernest/k-9/compare/6beb9902dade44b5f6dce8e8e8a2638e7be9e6ef...963645cad626c3ea2f732ebf66390b072aa444f5

diff --git a/k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java b/k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java index cf805041d..be62c922a 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java @@ -541,7 +541,9 @@ public class RecipientPresenter implements PermissionPingCallback { } public void onNonRecipientFieldFocused() { - hideEmptyExtendedRecipientFields(); + if (!account.isAlwaysShowCcBcc()) { + hideEmptyExtendedRecipientFields(); + } } public void onClickCryptoStatus() {

['k9mail/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/5262/5261

thundernest

k-9

https://github.com/thundernest/k-9/issues/5261

https://github.com/thundernest/k-9/pull/5262

https://github.com/thundernest/k-9/pull/5262

fixes

Crash when clicking compose button in message list widget

**Describe the bug** Clicking the envelope icon in the message list widget crashes the app. **To Reproduce** Steps to reproduce the behavior: 1. Set up an account 2. Drag the message list widget to a home screen 3. Click the envelope icon (compose message) in the upper right of the home screen widget 4. Observe app crash **Environment (please complete the following information):** - K-9 Mail version: 5.734-SNAPSHOT **Logs** ``` Caused by: java.lang.NullPointerException: Parameter specified as non-null is null: method kotlin.jvm.internal.Intrinsics.checkNotNullParameter, parameter accountUuid at com.fsck.k9.Preferences.getAccount(Unknown Source:2) at com.fsck.k9.activity.MessageCompose.onCreate(MessageCompose.java:284) ```

f58860f8bbe3a59e180cc87dc410e16b295592f7

034e1fbd790dc4af6f60bd980f59489e375a31fe

https://github.com/thundernest/k-9/compare/f58860f8bbe3a59e180cc87dc410e16b295592f7...034e1fbd790dc4af6f60bd980f59489e375a31fe

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java index 0601958fd..c2cb3fd28 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java @@ -281,7 +281,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, relatedMessageReference.getAccountUuid() : intent.getStringExtra(EXTRA_ACCOUNT); - account = preferences.getAccount(accountUuid); + if (accountUuid != null) { + account = preferences.getAccount(accountUuid); + } if (account == null) { account = preferences.getDefaultAccount();

['app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/1890/1879

thundernest

k-9

https://github.com/thundernest/k-9/issues/1879

https://github.com/thundernest/k-9/pull/1890

https://github.com/thundernest/k-9/pull/1890

fixes

Crash: OOM during migration

Via Play Developer Console App version: 5.200 ``` java.lang.OutOfMemoryError: Failed to allocate a 2060 byte allocation with 1974 free bytes and 1974B until OOM at org.apache.james.mime4j.stream.MimeEntity.advanceToBoundary(MimeEntity.java:387) at org.apache.james.mime4j.stream.MimeEntity.advance(MimeEntity.java:331) at org.apache.james.mime4j.stream.MimeTokenStream.next(MimeTokenStream.java:360) at org.apache.james.mime4j.parser.MimeStreamParser.parse(MimeStreamParser.java:176) at com.fsck.k9.mail.message.MessageHeaderParser.parse(MessageHeaderParser.java:24) at com.fsck.k9.mailstore.LocalMessage.populateFromGetMessageCursor(LocalMessage.java:127) at com.fsck.k9.mailstore.LocalStore$13.doDbWork(LocalStore.java:638) at com.fsck.k9.mailstore.LocalStore$13.doDbWork(LocalStore.java:615) at com.fsck.k9.mailstore.LockableDatabase.execute(LockableDatabase.java:275) at com.fsck.k9.mailstore.LocalStore.getMessages(LocalStore.java:615) at com.fsck.k9.mailstore.LocalFolder$10.doDbWork(LocalFolder.java:880) at com.fsck.k9.mailstore.LocalFolder$10.doDbWork(LocalFolder.java:875) at com.fsck.k9.mailstore.LockableDatabase.execute(LockableDatabase.java:275) at com.fsck.k9.mailstore.LocalFolder.getMessages(LocalFolder.java:875) at com.fsck.k9.mailstore.migrations.MigrationTo55.createFtsSearchTable(MigrationTo55.java:36) at com.fsck.k9.mailstore.migrations.Migrations.upgradeDatabase(Migrations.java:66) at com.fsck.k9.mailstore.StoreSchemaDefinition.upgradeDatabase(StoreSchemaDefinition.java:60) at com.fsck.k9.mailstore.StoreSchemaDefinition.doDbUpgrade(StoreSchemaDefinition.java:36) at com.fsck.k9.mailstore.LockableDatabase.openOrCreateDataspace(LockableDatabase.java:381) at com.fsck.k9.mailstore.LockableDatabase.open(LockableDatabase.java:354) at com.fsck.k9.mailstore.LocalStore.<init>(LocalStore.java:210) at com.fsck.k9.mailstore.LocalStore.getInstance(LocalStore.java:235) at com.fsck.k9.Account.getLocalStore(Account.java:1278) at com.fsck.k9.controller.MessagingController.setupPushing(MessagingController.java:4322) at com.fsck.k9.service.MailService.setupPushers(MailService.java:349) at com.fsck.k9.service.MailService.reschedulePushers(MailService.java:338) at com.fsck.k9.service.MailService.access$100(MailService.java:24) at com.fsck.k9.service.MailService$1.run(MailService.java:194) at com.fsck.k9.service.CoreService$1.run(CoreService.java:315) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1112) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:587) at java.lang.Thread.run(Thread.java:818) ```

50d81f7034e60e50cbd67007144bf7e23137aa87

b0574804813c978d9826380667cf01b8e50429de

https://github.com/thundernest/k-9/compare/50d81f7034e60e50cbd67007144bf7e23137aa87...b0574804813c978d9826380667cf01b8e50429de

diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java index e9458479a..9cd8f2319 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java @@ -896,6 +896,42 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable { } } + public List<String> getAllMessageUids() throws MessagingException { + try { + return localStore.database.execute(false, new DbCallback<List<String>>() { + @Override + public List<String> doDbWork(final SQLiteDatabase db) throws WrappedException, UnavailableStorageException { + Cursor cursor = null; + ArrayList<String> result = new ArrayList<>(); + + try { + open(OPEN_MODE_RO); + + cursor = db.rawQuery( + "SELECT uid " + + "FROM messages " + + "WHERE empty = 0 AND deleted = 0 AND " + + "folder_id = ? ORDER BY date DESC", + new String[] { Long.toString(mFolderId) }); + + while (cursor.moveToNext()) { + String uid = cursor.getString(0); + result.add(uid); + } + } catch (MessagingException e) { + throw new WrappedException(e); + } finally { + Utility.closeQuietly(cursor); + } + + return result; + } + }); + } catch (WrappedException e) { + throw(MessagingException) e.getCause(); + } + } + public List<LocalMessage> getMessagesByUids(@NonNull List<String> uids) throws MessagingException { open(OPEN_MODE_RW); List<LocalMessage> messages = new ArrayList<>(); diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo55.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo55.java index 4f8f7e5dc..e9fb197ab 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo55.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo55.java @@ -1,9 +1,7 @@ package com.fsck.k9.mailstore.migrations; -import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import android.content.ContentValues; @@ -20,8 +18,8 @@ import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.message.extractors.MessageFulltextCreator; -public class MigrationTo55 { - public static void createFtsSearchTable(SQLiteDatabase db, MigrationsHelper migrationsHelper) { +class MigrationTo55 { + static void createFtsSearchTable(SQLiteDatabase db, MigrationsHelper migrationsHelper) { db.execSQL("CREATE VIRTUAL TABLE messages_fulltext USING fts4 (fulltext)"); LocalStore localStore = migrationsHelper.getLocalStore(); @@ -33,13 +31,11 @@ public class MigrationTo55 { FetchProfile fp = new FetchProfile(); fp.add(FetchProfile.Item.BODY); for (LocalFolder folder : folders) { - Iterator<LocalMessage> localMessages = new ArrayList<>(folder.getMessages(null, false)).iterator(); - while (localMessages.hasNext()) { - LocalMessage localMessage = localMessages.next(); - // The LocalMessage objects are heavy once they have been loaded, so we free them asap - localMessages.remove(); - + List<String> messageUids = folder.getAllMessageUids(); + for (String messageUid : messageUids) { + LocalMessage localMessage = folder.getMessage(messageUid); folder.fetch(Collections.singletonList(localMessage), fp, null); + String fulltext = fulltextCreator.createFulltext(localMessage); if (!TextUtils.isEmpty(fulltext)) { Log.d(K9.LOG_TAG, "fulltext for msg id " + localMessage.getId() + " is " + fulltext.length() + " chars long");

['k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java', 'k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo55.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/1891/1878

thundernest

k-9

https://github.com/thundernest/k-9/issues/1878

https://github.com/thundernest/k-9/pull/1891

https://github.com/thundernest/k-9/pull/1891

fixes

Crash: NPE in MessageCryptoHelper.addCryptoResultAnnotationToMessage()

Via Play Developer Console App version: 5.200 ``` java.lang.RuntimeException: Failure delivering result ResultInfo{who=null, request=65916, result=0, data=null} to activity {com.fsck.k9/com.fsck.k9.activity.MessageList}: java.lang.NullPointerException: Attempt to read from field 'com.fsck.k9.mail.Part com.fsck.k9.ui.crypto.MessageCryptoHelper$CryptoPart.part' on a null object reference at android.app.ActivityThread.deliverResults(ActivityThread.java:3733) at android.app.ActivityThread.handleSendResult(ActivityThread.java:3776) at android.app.ActivityThread.-wrap16(ActivityThread.java) at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1412) at android.os.Handler.dispatchMessage(Handler.java:102) at android.os.Looper.loop(Looper.java:148) at android.app.ActivityThread.main(ActivityThread.java:5461) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:726) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:616) Caused by: java.lang.NullPointerException: Attempt to read from field 'com.fsck.k9.mail.Part com.fsck.k9.ui.crypto.MessageCryptoHelper$CryptoPart.part' on a null object reference at com.fsck.k9.ui.crypto.MessageCryptoHelper.addCryptoResultAnnotationToMessage(MessageCryptoHelper.java:575) at com.fsck.k9.ui.crypto.MessageCryptoHelper.onCryptoOperationCanceled(MessageCryptoHelper.java:558) at com.fsck.k9.ui.crypto.MessageCryptoHelper.onActivityResult(MessageCryptoHelper.java:536) at com.fsck.k9.activity.MessageLoaderHelper.onActivityResult(MessageLoaderHelper.java:168) at com.fsck.k9.ui.messageview.MessageViewFragment.onPendingIntentResult(MessageViewFragment.java:393) at com.fsck.k9.activity.MessageList.onActivityResult(MessageList.java:1600) at android.app.Activity.dispatchActivityResult(Activity.java:6456) at android.app.ActivityThread.deliverResults(ActivityThread.java:3729) ... 9 more ```

50d81f7034e60e50cbd67007144bf7e23137aa87

97e9e3267f35a67eeb1ff6542224825dad6f9aba

https://github.com/thundernest/k-9/compare/50d81f7034e60e50cbd67007144bf7e23137aa87...97e9e3267f35a67eeb1ff6542224825dad6f9aba

diff --git a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java index 28387c9f7..2600ddcf0 100644 --- a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java @@ -58,13 +58,14 @@ import org.openintents.openpgp.util.OpenPgpUtils; public class MessageCryptoHelper { private static final int INVALID_OPENPGP_RESULT_CODE = -1; private static final MimeBodyPart NO_REPLACEMENT_PART = null; - public static final int REQUEST_CODE_USER_INTERACTION = 124; - public static final int PROGRESS_SIZE_THRESHOLD = 4096; + private static final int REQUEST_CODE_USER_INTERACTION = 124; + private static final int PROGRESS_SIZE_THRESHOLD = 4096; private final Context context; private final String openPgpProviderPackage; private final Object callbackLock = new Object(); + private final Deque<CryptoPart> partsToDecryptOrVerify = new ArrayDeque<>(); @Nullable private MessageCryptoCallback callback; @@ -76,7 +77,6 @@ public class MessageCryptoHelper { private MessageCryptoAnnotations messageAnnotations; - private Deque<CryptoPart> partsToDecryptOrVerify = new ArrayDeque<>(); private CryptoPart currentCryptoPart; private Intent currentCryptoResult; private Intent userInteractionResultIntent; @@ -554,8 +554,12 @@ public class MessageCryptoHelper { } private void onCryptoOperationCanceled() { - CryptoResultAnnotation errorPart = CryptoResultAnnotation.createOpenPgpCanceledAnnotation(); - addCryptoResultAnnotationToMessage(errorPart); + // there are weird states that get us here when we're not actually processing any part. just skip in that case + // see https://github.com/k9mail/k-9/issues/1878 + if (currentCryptoPart != null) { + CryptoResultAnnotation errorPart = CryptoResultAnnotation.createOpenPgpCanceledAnnotation(); + addCryptoResultAnnotationToMessage(errorPart); + } onCryptoFinished(); } @@ -579,8 +583,17 @@ public class MessageCryptoHelper { } private void onCryptoFinished() { - currentCryptoPart = null; - partsToDecryptOrVerify.removeFirst(); + boolean currentPartIsFirstInQueue = partsToDecryptOrVerify.peekFirst() == currentCryptoPart; + if (!currentPartIsFirstInQueue) { + throw new IllegalStateException( + "Trying to remove part from queue that is not the currently processed one!"); + } + if (currentCryptoPart != null) { + partsToDecryptOrVerify.removeFirst(); + currentCryptoPart = null; + } else { + Log.e(K9.LOG_TAG, "Got to onCryptoFinished() with no part in processing!", new Throwable()); + } decryptOrVerifyNextPart(); } @@ -594,7 +607,7 @@ public class MessageCryptoHelper { } private void cleanupAfterProcessingFinished() { - partsToDecryptOrVerify = null; + partsToDecryptOrVerify.clear(); openPgpApi = null; if (openPgpServiceConnection != null) { openPgpServiceConnection.unbindFromService(); @@ -613,11 +626,13 @@ public class MessageCryptoHelper { throw new AssertionError("Callback may only be reattached for the same message!"); } synchronized (callbackLock) { - if (queuedResult != null) { - Log.d(K9.LOG_TAG, "Returning cached result to reattached callback"); - } this.callback = callback; - deliverResult(); + + boolean hasCachedResult = queuedResult != null || queuedPendingIntent != null; + if (hasCachedResult) { + Log.d(K9.LOG_TAG, "Returning cached result or pending intent to reattached callback"); + deliverResult(); + } } } @@ -663,6 +678,8 @@ public class MessageCryptoHelper { callback.startPendingIntentForCryptoHelper( queuedPendingIntent.getIntentSender(), REQUEST_CODE_USER_INTERACTION, null, 0, 0, 0); queuedPendingIntent = null; + } else { + throw new IllegalStateException("deliverResult() called with no result!"); } }

['k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/5546/5545

thundernest

k-9

https://github.com/thundernest/k-9/issues/5545

https://github.com/thundernest/k-9/pull/5546

https://github.com/thundernest/k-9/pull/5546

fixes

v5.802 doesn't retract android notification on delete of unread message

**Describe the bug** Separate IMAP client deletes unread message, v5.802 does not retract New Message notification previously posted when IMAP PUSH saw new msg arrive **To Reproduce** 1. send message to an account watched via IMAP PUSH by K-9 v5.802 2. K-9 posts a notification immediately (cool) 3. via another IMAP client (desktop, even K-9 v5.600 on another android), delete the message before marking it read 4. Android notification previously posted by K-9 v5.802 is not retracted and stays visible (note that v5.600 properly retracts in such a case) **Expected behavior** A message never marked read but deleted by another client should retract K-9's previously posted new-message notification. **Environment:** - K-9 Mail version: v5.802 - Android version: 8.0 // old, I know - Device: LG V20 // old, I know - Account type: IMAP (gmail) **Additional context** Note as mentioned above, v5.600 (K-9) does retract notifications in such cases A work-around that the end-user may practice is as follows: Whichever separate non-K9(v5.802) IMAP client is being used (desktop client of some form on another machine, K-9 v5.600 itself on another Android device), if you FIRST mark the newest message read, THEN delete that newest message, K-9 v5.802 DOES properly retract the previously posted new-msg android-notification. So I'm wondering if K-9 v5.802 could be changed to treat a message deletion (for a message just received and for which the android system notification was posted, and which is still an unread message) as experiencing both an "is read" and "is deleted" state change? I realize, having briefly scanned the issues list here that there are many challenges surrounding android notifications, and that this may not be an easy thing to track down and solve. I hope I've provided enough info. In summary: message arrives, remains new/unread, is deleted from another IMAP client, K-9 v5.802 leaves the android notif up (while 5.600 removes the notif under the same conditions). conversely: message arrives, remains new/unrerad, is first marked read from another IMAP client, then deleted from another IMAP client, K-9 v5.802 tears down the android notif previously posted for the new message.

11c85745d0369db1b2d7e3a7bffbbf2ee6fbdc61

04d68624ada65bc96ee8b5102f02d9022c7fdbe7

https://github.com/thundernest/k-9/compare/11c85745d0369db1b2d7e3a7bffbbf2ee6fbdc61...04d68624ada65bc96ee8b5102f02d9022c7fdbe7

diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index d84f5ec96..716322605 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -2775,6 +2775,11 @@ public class MessagingController { for (MessagingListener messagingListener : getListeners(listener)) { messagingListener.synchronizeMailboxRemovedMessage(account, folderServerId, messageServerId); } + + String accountUuid = account.getUuid(); + long folderId = getFolderIdOrThrow(account, folderServerId); + MessageReference messageReference = new MessageReference(accountUuid, folderId, messageServerId, null); + notificationController.removeNewMailNotification(account, messageReference); } @Override

['app/core/src/main/java/com/fsck/k9/controller/MessagingController.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/3315/3138

thundernest

k-9

https://github.com/thundernest/k-9/issues/3138

https://github.com/thundernest/k-9/pull/3315

https://github.com/thundernest/k-9/pull/3315

fixes

twitter background image - td element

the background images (for previewing videos in the twitter e-mails) aren't displayed for some reason. [twitter.zip](https://github.com/k9mail/k-9/files/1667936/twitter.zip) Could you pls take a look? :) Regards, Djfe

fd07e1a2264988f5c67f21cd92a88874dd11800c

9cad669af8bc0a4c64e4b896beed6b21b15053b7

https://github.com/thundernest/k-9/compare/fd07e1a2264988f5c67f21cd92a88874dd11800c...9cad669af8bc0a4c64e4b896beed6b21b15053b7

diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java index 1707f7c9e..ad11115fc 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java +++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java @@ -17,13 +17,13 @@ public class HtmlSanitizer { .addAttributes("font", "color", "face", "size") .addAttributes("table", "align", "background", "bgcolor", "border", "cellpadding", "cellspacing", "width") - .addAttributes("tr", "align", "bgcolor", "valign") + .addAttributes("tr", "align", "background", "bgcolor", "valign") .addAttributes("th", - "align", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", "sorted", - "valign", "width") + "align", "background", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", + "sorted", "valign", "width") .addAttributes("td", - "align", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", "valign", - "width") + "align", "background", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", + "valign", "width") .addAttributes("map", "name") .addAttributes("area", "shape", "coords", "href", "alt") .addProtocols("area", "href", "http", "https")

['k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2025/1908

thundernest

k-9

https://github.com/thundernest/k-9/issues/1908

https://github.com/thundernest/k-9/pull/2025

https://github.com/thundernest/k-9/pull/2025

fixes

Cannot zoom HTML messages properly if at all

### Expected behavior HTML mail should pinch zoom as it always has ### Actual behavior In 5.201 I tried zooming a few HTML emails. Nether would pinch zoom (though double tapping made them a tiny bit bigger). At least once this led to a crash of the app. I reverted to 5.010 and zoom works just fine with the same mail - in fact, it never had any such issue so I'm not upgrading until this is fixed. ### Steps to reproduce Open html email e.g. from Xbox.com Pinch zoom Either nothing happens, it moves a tiny bit, or it ends up crashing. ### Environment K-9 Mail version: 5.201 is broken for this. Works fine in 5.010 Android version: 7.0 on Nexus 6 IMAP

217c61430d55949316a645d23f24717f7bc098bb

c7c0ad0b7b77db1960dcf8956e54e549d9599644

https://github.com/thundernest/k-9/compare/217c61430d55949316a645d23f24717f7bc098bb...c7c0ad0b7b77db1960dcf8956e54e549d9599644

diff --git a/k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java b/k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java index 5897c3b22..d97ec9ced 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java +++ b/k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java @@ -100,25 +100,14 @@ public class NonLockingScrollView extends ScrollView { @Override protected void onFinishInflate() { super.onFinishInflate(); - excludeChildrenFromInterceptions(this); + setupDelegationOfTouchAndHierarchyChangeEvents(); } - - /** - * Traverses the view tree for {@link WebView}s so they can be excluded from touch - * interceptions and receive all events. - */ - private void excludeChildrenFromInterceptions(View node) { - // If additional types of children should be excluded (e.g. horizontal scrolling banners), - // this needs to be modified accordingly. - if (node instanceof WebView) { - mChildrenNeedingAllTouches.add(node); - } else if (node instanceof ViewGroup) { - ViewGroup viewGroup = (ViewGroup) node; - final int childCount = viewGroup.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View child = viewGroup.getChildAt(i); - excludeChildrenFromInterceptions(child); - } + + private void setupDelegationOfTouchAndHierarchyChangeEvents() { + OnHierarchyChangeListener listener = new HierarchyTreeChangeListener(); + setOnHierarchyChangeListener(listener); + for (int i = 0, childCount = getChildCount(); i < childCount; i++) { + listener.onChildViewAdded(this, getChildAt(i)); } } @@ -167,4 +156,32 @@ public class NonLockingScrollView extends ScrollView { super.requestChildFocus(child, focused); } } + + class HierarchyTreeChangeListener implements OnHierarchyChangeListener { + @Override + public void onChildViewAdded(View parent, View child) { + if (child instanceof WebView) { + mChildrenNeedingAllTouches.add(child); + } else if (child instanceof ViewGroup) { + ViewGroup childGroup = (ViewGroup) child; + childGroup.setOnHierarchyChangeListener(this); + for (int i = 0, childCount = childGroup.getChildCount(); i < childCount; i++) { + onChildViewAdded(childGroup, childGroup.getChildAt(i)); + } + } + } + + @Override + public void onChildViewRemoved(View parent, View child) { + if (child instanceof WebView) { + mChildrenNeedingAllTouches.remove(child); + } else if (child instanceof ViewGroup) { + ViewGroup childGroup = (ViewGroup) child; + for (int i = 0, childCount = childGroup.getChildCount(); i < childCount; i++) { + onChildViewRemoved(childGroup, childGroup.getChildAt(i)); + } + childGroup.setOnHierarchyChangeListener(null); + } + } + } }

['k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2037/1950

thundernest

k-9

https://github.com/thundernest/k-9/issues/1950

https://github.com/thundernest/k-9/pull/2037

https://github.com/thundernest/k-9/pull/2037

fixes

Contact auto selecting first item

If there are "[email protected]" and "[email protected]" in my Contacts and i type "[email protected]" then app selects first entry from contacts and i cannot send email to "[email protected]". Previous versions allowed me type address and select one from suggestions if i want. Work around is to end the address with a comma & a space so new address object is created. K-9 Mail version: 5.201

92196c012823b626d92e13349d160e8516e4abc2

bb514f7140052ea9a0b85cb4ba34c275419c7013

https://github.com/thundernest/k-9/compare/92196c012823b626d92e13349d160e8516e4abc2...bb514f7140052ea9a0b85cb4ba34c275419c7013

diff --git a/k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java b/k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java index 28ca83b25..bae224116 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java +++ b/k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java @@ -229,14 +229,9 @@ public class RecipientSelectView extends TokenCompleteTextView<Recipient> implem @Override public void performCompletion() { if (getListSelection() == ListView.INVALID_POSITION && enoughToFilter()) { - Object bestGuess; - if (getAdapter().getCount() > 0) { - bestGuess = getAdapter().getItem(0); - } else { - bestGuess = defaultObject(currentCompletionText()); - } - if (bestGuess != null) { - replaceText(convertSelectionToString(bestGuess)); + Object recipientText = defaultObject(currentCompletionText()); + if (recipientText != null) { + replaceText(convertSelectionToString(recipientText)); } } else { super.performCompletion();

['k9mail/src/main/java/com/fsck/k9/view/RecipientSelectView.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4931/4914

thundernest

k-9

https://github.com/thundernest/k-9/issues/4914

https://github.com/thundernest/k-9/pull/4931

https://github.com/thundernest/k-9/pull/4931

fixes

Wrong OpenPGP key used when sending signed-only email

I have recently noticed that if I set the sending of an email with the openpgp signature only option, I don't have the possibility to choose which identity to use. k9 v5.718 uses the first signature key available in openkeychain although it is not even that of the email from which I send. then an email is sent with the address xxx @ xxx signed by a yyyu @ yyy identity how to choose which signature key to use? I have no choices

22cdb8c41fc58c865c853c6d7efc6db61724fbf0

d718b33ef62c5b728a85ea563561f210aa1acfb3

https://github.com/thundernest/k-9/compare/22cdb8c41fc58c865c853c6d7efc6db61724fbf0...d718b33ef62c5b728a85ea563561f210aa1acfb3

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java index a9e1ace70..66b261bed 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java @@ -364,6 +364,7 @@ public class RecipientPresenter { public void onSwitchIdentity(Identity identity) { // TODO decide what actually to do on identity switch? + asyncUpdateCryptoStatus(); /* if (mIdentityChanged) { mBccWrapper.setVisibility(View.VISIBLE);

['app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4921/4918

thundernest

k-9

https://github.com/thundernest/k-9/issues/4918

https://github.com/thundernest/k-9/pull/4921

https://github.com/thundernest/k-9/pull/4921

fixes

Umlauts in encrypted headings

When I sent a mail with the heading "Test verschlüsselt", it after receiving it read "?ISO-8859-1?Q?Test_verschl=FCsselt_?=".

753e03aa22a1f1d97e426f719de0844874ce7521

bdbd8d98b2592d5dbf1e236ddeb81fd0dccb2444

https://github.com/thundernest/k-9/compare/753e03aa22a1f1d97e426f719de0844874ce7521...bdbd8d98b2592d5dbf1e236ddeb81fd0dccb2444

diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java index 3d902654e..4499e955b 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java +++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java @@ -107,7 +107,7 @@ public class MessageViewInfoExtractor { boolean hasProtectedSubject = "v1".equalsIgnoreCase(protectedHeadersParam) && protectedSubjectHeader.length > 0; if (hasProtectedSubject) { - return protectedSubjectHeader[0]; + return MimeUtility.unfoldAndDecode(protectedSubjectHeader[0]); } return null;

['app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4795/4790

thundernest

k-9

https://github.com/thundernest/k-9/issues/4790

https://github.com/thundernest/k-9/pull/4795

https://github.com/thundernest/k-9/pull/4795

fixes

Crash when attachment file is changed while TC document picker dialog is open

### Expected behavior error message "File not found" or Folder rescan when switching back to file picker (TC issue) ### Actual behavior short glimpse of mail editor with attached file, then app crash ### Steps to reproduce 1. Compose mail 2. open file attachment dialog 3. select "Total Commander" 5. navigate to folder X 6. Switch to some file browser and rename file Y in folder X 7. Switch back to K-9, select file Y (under old filename), attach - with "TotalCmd (file://url)" - nothing is attached - same with Picasa - stock album or "Simple Gallery" manage to attach the image anyway, but under a generic number ### Environment K-9 Mail version: 5.6 Android version: 7.1.1 Account type (IMAP, POP3, WebDAV/Exchange): IMAP Please take some time to [retrieve logs](https://github.com/k9mail/k-9/wiki/LoggingErrors) and attach them here: [k9-log.txt](https://github.com/k9mail/k-9/files/4688569/k9-log.txt)

b9eba6971fa86b95a4855caddbfa7144e5c23884

a2287ce31cee3b6d229c782cc6cb00f6be0470d8

https://github.com/thundernest/k-9/compare/b9eba6971fa86b95a4855caddbfa7144e5c23884...a2287ce31cee3b6d229c782cc6cb00f6be0470d8

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java index 1da4ce6e5..5c699dcf8 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java @@ -60,6 +60,13 @@ public class AttachmentContentLoader extends AsyncTaskLoader<Attachment> { SafeContentResolver safeContentResolver = SafeContentResolver.newInstance(context); InputStream in = safeContentResolver.openInputStream(sourceAttachment.uri); + if (in == null) { + Timber.w("Error opening attachment for reading: %s", sourceAttachment.uri); + + cachedResultAttachment = sourceAttachment.deriveWithLoadCancelled(); + return cachedResultAttachment; + } + try { FileOutputStream out = new FileOutputStream(file); try {

['app/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4743/4742

thundernest

k-9

https://github.com/thundernest/k-9/issues/4742

https://github.com/thundernest/k-9/pull/4743

https://github.com/thundernest/k-9/pull/4743

fixes

when replying to a message, original message is not quoted

### Expected behavior upon selecting "reply" or "reply all", i expect the original email to be quoted in the compose message interface. (this was also the previous behavior before i updated to 5.711) ### Actual behavior the compose message interface is empty and looks like crafting a new message. ### Steps to reproduce 1. receive an email 2. reply to that email ### Environment K-9 Mail version: 5.711 Android version: 10 Account type: imap

5a4a269926116a4f373699510bf868a848cdb8d8

e830656d80c62f9d667a83aafde11cd1dc2d157c

https://github.com/thundernest/k-9/compare/5a4a269926116a4f373699510bf868a848cdb8d8...e830656d80c62f9d667a83aafde11cd1dc2d157c

diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index bae37949f..ef0f6eb1a 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -671,12 +671,6 @@ public class MessagingController { notificationController.showAuthenticationErrorNotification(account, incoming); } - private static void closeFolder(LocalFolder f) { - if (f != null) { - f.close(); - } - } - private void queuePendingCommand(Account account, PendingCommand command) { try { LocalStore localStore = localStoreProvider.getInstance(account); @@ -756,74 +750,70 @@ public class MessagingController { LocalStore localStore = localStoreProvider.getInstance(account); long folderId = command.folderId; LocalFolder localFolder = localStore.getFolder(folderId); - try { - localFolder.open(); - - String folderServerId = localFolder.getServerId(); - String uid = command.uid; + localFolder.open(); - LocalMessage localMessage = localFolder.getMessage(uid); - if (localMessage == null) { - return; - } + String folderServerId = localFolder.getServerId(); + String uid = command.uid; - if (!localMessage.getUid().startsWith(K9.LOCAL_UID_PREFIX)) { - //FIXME: This should never happen. Throw in debug builds. - return; - } + LocalMessage localMessage = localFolder.getMessage(uid); + if (localMessage == null) { + return; + } - Backend backend = getBackend(account); + if (!localMessage.getUid().startsWith(K9.LOCAL_UID_PREFIX)) { + //FIXME: This should never happen. Throw in debug builds. + return; + } - if (localMessage.isSet(Flag.X_REMOTE_COPY_STARTED)) { - Timber.w("Local message with uid %s has flag %s already set, checking for remote message with " + - "same message id", localMessage.getUid(), X_REMOTE_COPY_STARTED); + Backend backend = getBackend(account); - String messageServerId = backend.findByMessageId(folderServerId, localMessage.getMessageId()); - if (messageServerId != null) { - Timber.w("Local message has flag %s already set, and there is a remote message with uid %s, " + - "assuming message was already copied and aborting this copy", - X_REMOTE_COPY_STARTED, messageServerId); + if (localMessage.isSet(Flag.X_REMOTE_COPY_STARTED)) { + Timber.w("Local message with uid %s has flag %s already set, checking for remote message with " + + "same message id", localMessage.getUid(), X_REMOTE_COPY_STARTED); - String oldUid = localMessage.getUid(); - localMessage.setUid(messageServerId); - localFolder.changeUid(localMessage); + String messageServerId = backend.findByMessageId(folderServerId, localMessage.getMessageId()); + if (messageServerId != null) { + Timber.w("Local message has flag %s already set, and there is a remote message with uid %s, " + + "assuming message was already copied and aborting this copy", + X_REMOTE_COPY_STARTED, messageServerId); - for (MessagingListener l : getListeners()) { - l.messageUidChanged(account, folderId, oldUid, localMessage.getUid()); - } + String oldUid = localMessage.getUid(); + localMessage.setUid(messageServerId); + localFolder.changeUid(localMessage); - return; - } else { - Timber.w("No remote message with message-id found, proceeding with append"); + for (MessagingListener l : getListeners()) { + l.messageUidChanged(account, folderId, oldUid, localMessage.getUid()); } + + return; + } else { + Timber.w("No remote message with message-id found, proceeding with append"); } + } - /* - * If the message does not exist remotely we just upload it and then - * update our local copy with the new uid. - */ - FetchProfile fp = new FetchProfile(); - fp.add(FetchProfile.Item.BODY); - localFolder.fetch(Collections.singletonList(localMessage), fp, null); - String oldUid = localMessage.getUid(); - localMessage.setFlag(Flag.X_REMOTE_COPY_STARTED, true); + /* + * If the message does not exist remotely we just upload it and then + * update our local copy with the new uid. + */ + FetchProfile fp = new FetchProfile(); + fp.add(FetchProfile.Item.BODY); + localFolder.fetch(Collections.singletonList(localMessage), fp, null); + String oldUid = localMessage.getUid(); + localMessage.setFlag(Flag.X_REMOTE_COPY_STARTED, true); - String messageServerId = backend.uploadMessage(folderServerId, localMessage); + String messageServerId = backend.uploadMessage(folderServerId, localMessage); - if (messageServerId == null) { - // We didn't get the server UID of the uploaded message. Remove the local message now. The uploaded - // version will be downloaded during the next sync. - localFolder.destroyMessages(Collections.singletonList(localMessage)); - } else { - localMessage.setUid(messageServerId); - localFolder.changeUid(localMessage); + if (messageServerId == null) { + // We didn't get the server UID of the uploaded message. Remove the local message now. The uploaded + // version will be downloaded during the next sync. + localFolder.destroyMessages(Collections.singletonList(localMessage)); + } else { + localMessage.setUid(messageServerId); + localFolder.changeUid(localMessage); - for (MessagingListener l : getListeners()) { - l.messageUidChanged(account, folderId, oldUid, localMessage.getUid()); - } + for (MessagingListener l : getListeners()) { + l.messageUidChanged(account, folderId, oldUid, localMessage.getUid()); } - } finally { - localFolder.close(); } } @@ -1012,26 +1002,21 @@ public class MessagingController { LocalStore localStore = localStoreProvider.getInstance(account); LocalFolder localFolder = localStore.getFolder(command.folderId); - String folderServerId; - try { - localFolder.open(); - folderServerId = localFolder.getServerId(); + localFolder.open(); + String folderServerId = localFolder.getServerId(); - Timber.i("Marking all messages in %s:%s as read", account, folderServerId); + Timber.i("Marking all messages in %s:%s as read", account, folderServerId); - // TODO: Make this one database UPDATE operation - List<LocalMessage> messages = localFolder.getMessages(null, false); - for (Message message : messages) { - if (!message.isSet(Flag.SEEN)) { - message.setFlag(Flag.SEEN, true); - } + // TODO: Make this one database UPDATE operation + List<LocalMessage> messages = localFolder.getMessages(null, false); + for (Message message : messages) { + if (!message.isSet(Flag.SEEN)) { + message.setFlag(Flag.SEEN, true); } + } - for (MessagingListener l : getListeners()) { - l.folderStatusChanged(account, folderServerId); - } - } finally { - localFolder.close(); + for (MessagingListener l : getListeners()) { + l.folderStatusChanged(account, folderServerId); } Backend backend = getBackend(account); @@ -1137,10 +1122,9 @@ public class MessagingController { public void setFlag(Account account, long folderId, List<LocalMessage> messages, Flag flag, boolean newState) { // TODO: Put this into the background, but right now some callers depend on the message // objects being modified right after this method returns. - LocalFolder localFolder = null; try { LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(folderId); + LocalFolder localFolder = localStore.getFolder(folderId); localFolder.open(); // Update the messages in the local store @@ -1163,8 +1147,6 @@ public class MessagingController { processPendingCommands(account); } catch (MessagingException me) { throw new RuntimeException(me); - } finally { - closeFolder(localFolder); } } @@ -1172,10 +1154,9 @@ public class MessagingController { * Set or remove a flag for a message referenced by message UID. */ public void setFlag(Account account, long folderId, String uid, Flag flag, boolean newState) { - LocalFolder localFolder = null; try { LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(folderId); + LocalFolder localFolder = localStore.getFolder(folderId); localFolder.open(); LocalMessage message = localFolder.getMessage(uid); @@ -1184,8 +1165,6 @@ public class MessagingController { } } catch (MessagingException me) { throw new RuntimeException(me); - } finally { - closeFolder(localFolder); } } @@ -1214,10 +1193,9 @@ public class MessagingController { private void loadMessageRemoteSynchronous(Account account, long folderId, String uid, MessagingListener listener, boolean loadPartialFromSearch) { - LocalFolder localFolder = null; try { LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(folderId); + LocalFolder localFolder = localStore.getFolder(folderId); localFolder.open(); String folderServerId = localFolder.getServerId(); @@ -1265,8 +1243,6 @@ public class MessagingController { } notifyUserIfCertificateProblem(account, e, true); Timber.e(e, "Error while loading remote message"); - } finally { - closeFolder(localFolder); } } @@ -1284,7 +1260,6 @@ public class MessagingController { FetchProfile fp = new FetchProfile(); fp.add(FetchProfile.Item.BODY); localFolder.fetch(Collections.singletonList(message), fp, null); - localFolder.close(); notificationController.removeNewMailNotification(account, message.makeMessageReference()); markMessageAsReadOnView(account, message); @@ -1306,7 +1281,6 @@ public class MessagingController { FetchProfile fp = new FetchProfile(); fp.add(FetchProfile.Item.ENVELOPE); localFolder.fetch(Collections.singletonList(message), fp, null); - localFolder.close(); return message; } @@ -1328,12 +1302,11 @@ public class MessagingController { put("loadAttachment", listener, new Runnable() { @Override public void run() { - LocalFolder localFolder = null; try { String folderServerId = message.getFolder().getServerId(); LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(folderServerId); + LocalFolder localFolder = localStore.getFolder(folderServerId); ProgressBodyFactory bodyFactory = new ProgressBodyFactory(new ProgressListener() { @Override @@ -1359,8 +1332,6 @@ public class MessagingController { l.loadAttachmentFailed(account, message, part, me.getMessage()); } notifyUserIfCertificateProblem(account, me, true); - } finally { - closeFolder(localFolder); } } }); @@ -1385,7 +1356,6 @@ public class MessagingController { if (plaintextSubject != null) { localMessage.setCachedDecryptedSubject(plaintextSubject); } - localFolder.close(); OutboxStateRepository outboxStateRepository = localStore.getOutboxStateRepository(); outboxStateRepository.initializeOutboxState(messageId); @@ -1454,9 +1424,8 @@ public class MessagingController { } private boolean messagesPendingSend(final Account account) { - LocalFolder localFolder = null; try { - localFolder = localStoreProvider.getInstance(account).getFolder(account.getOutboxFolderId()); + LocalFolder localFolder = localStoreProvider.getInstance(account).getFolder(account.getOutboxFolderId()); if (!localFolder.exists()) { return false; } @@ -1468,8 +1437,6 @@ public class MessagingController { } } catch (Exception e) { Timber.e(e, "Exception while checking for unsent messages"); - } finally { - closeFolder(localFolder); } return false; } @@ -1479,13 +1446,12 @@ public class MessagingController { */ @VisibleForTesting protected void sendPendingMessagesSynchronous(final Account account) { - LocalFolder localFolder = null; Exception lastFailure = null; boolean wasPermanentFailure = false; try { LocalStore localStore = localStoreProvider.getInstance(account); OutboxStateRepository outboxStateRepository = localStore.getOutboxStateRepository(); - localFolder = localStore.getFolder(account.getOutboxFolderId()); + LocalFolder localFolder = localStore.getFolder(account.getOutboxFolderId()); if (!localFolder.exists()) { Timber.v("Outbox does not exist"); return; @@ -1614,7 +1580,6 @@ public class MessagingController { if (lastFailure == null) { notificationController.clearSendFailedNotification(account); } - closeFolder(localFolder); } } @@ -1885,7 +1850,6 @@ public class MessagingController { } public void deleteDraft(final Account account, long id) { - LocalFolder localFolder = null; try { Long folderId = account.getDraftsFolderId(); if (folderId == null) { @@ -1894,7 +1858,7 @@ public class MessagingController { } LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(folderId); + LocalFolder localFolder = localStore.getFolder(folderId); localFolder.open(); String uid = localFolder.getMessageUidById(id); if (uid != null) { @@ -1903,8 +1867,6 @@ public class MessagingController { } } catch (MessagingException me) { Timber.e(me, "Error deleting draft"); - } finally { - closeFolder(localFolder); } } @@ -2007,8 +1969,6 @@ public class MessagingController { private void deleteMessagesSynchronous(final Account account, final String folder, final List<LocalMessage> messages, MessagingListener listener) { - LocalFolder localFolder = null; - LocalFolder localTrashFolder = null; try { List<LocalMessage> localOnlyMessages = new ArrayList<>(); List<LocalMessage> syncedMessages = new ArrayList<>(); @@ -2026,12 +1986,13 @@ public class MessagingController { Backend backend = getBackend(account); LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(folder); + LocalFolder localFolder = localStore.getFolder(folder); localFolder.open(); long folderId = localFolder.getDatabaseId(); Map<String, String> uidMap = null; Long trashFolderId = account.getTrashFolderId(); + LocalFolder localTrashFolder = null; if (!account.hasTrashFolder() || folderId == trashFolderId || (backend.getSupportsTrashFolder() && !backend.isDeleteMoveToTrash())) { Timber.d("Not moving deleted messages to local Trash folder. Removing local copies."); @@ -2097,9 +2058,6 @@ public class MessagingController { throw new UnavailableAccountException(e); } catch (MessagingException me) { throw new RuntimeException("Error deleting message from local store.", me); - } finally { - closeFolder(localFolder); - closeFolder(localTrashFolder); } } @@ -2139,7 +2097,6 @@ public class MessagingController { putBackground("emptyTrash", listener, new Runnable() { @Override public void run() { - LocalFolder localFolder = null; try { Long trashFolderId = account.getTrashFolderId(); if (trashFolderId == null) { @@ -2148,7 +2105,7 @@ public class MessagingController { } LocalStore localStore = localStoreProvider.getInstance(account); - localFolder = localStore.getFolder(trashFolderId); + LocalFolder localFolder = localStore.getFolder(trashFolderId); localFolder.open(); String trashFolderServerId = localFolder.getServerId(); @@ -2174,8 +2131,6 @@ public class MessagingController { throw new UnavailableAccountException(e); } catch (Exception e) { Timber.e(e, "emptyTrash failed"); - } finally { - closeFolder(localFolder); } } }); @@ -2189,9 +2144,8 @@ public class MessagingController { @VisibleForTesting protected void clearFolderSynchronous(Account account, long folderId) { - LocalFolder localFolder = null; try { - localFolder = localStoreProvider.getInstance(account).getFolder(folderId); + LocalFolder localFolder = localStoreProvider.getInstance(account).getFolder(folderId); localFolder.open(); localFolder.clearAllMessages(); } catch (UnavailableStorageException e) { @@ -2199,8 +2153,6 @@ public class MessagingController { throw new UnavailableAccountException(e); } catch (Exception e) { Timber.e(e, "clearFolder failed"); - } finally { - closeFolder(localFolder); } } diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java b/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java index f3c797d1e..413f2f80b 100644 --- a/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java +++ b/app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java @@ -60,7 +60,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -324,10 +323,6 @@ public class LocalFolder { boolean integrate = isIntegrate; } - public void close() { - databaseId = -1; - } - public int getMessageCount() throws MessagingException { try { return this.localStore.getDatabase().execute(false, new DbCallback<Integer>() { diff --git a/app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java b/app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java index f7d1df7d1..9aede2d19 100644 --- a/app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java +++ b/app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java @@ -196,7 +196,6 @@ public class RawMessageProvider extends ContentProvider { FetchProfile fetchProfile = new FetchProfile(); fetchProfile.add(FetchProfile.Item.BODY); localFolder.fetch(Collections.singletonList(message), fetchProfile, null); - localFolder.close(); return message; } catch (MessagingException e) { diff --git a/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java b/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java index d281594b4..895ca05ac 100644 --- a/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java +++ b/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java @@ -170,13 +170,6 @@ public class MessagingControllerTest extends K9RobolectricTest { verify(localFolder).clearAllMessages(); } - @Test - public void clearFolderSynchronous_shouldCloseTheFolder() throws MessagingException { - controller.clearFolderSynchronous(account, FOLDER_ID); - - verify(localFolder, atLeastOnce()).close(); - } - @Test(expected = UnavailableAccountException.class) public void clearFolderSynchronous_whenStorageUnavailable_shouldThrowUnavailableAccountException() throws MessagingException { doThrow(new UnavailableStorageException("Test")).when(localFolder).open(); @@ -184,18 +177,6 @@ public class MessagingControllerTest extends K9RobolectricTest { controller.clearFolderSynchronous(account, FOLDER_ID); } - @Test() - public void clearFolderSynchronous_whenExceptionThrown_shouldStillCloseFolder() throws MessagingException { - doThrow(new RuntimeException("Test")).when(localFolder).open(); - - try { - controller.clearFolderSynchronous(account, FOLDER_ID); - } catch (Exception ignored){ - } - - verify(localFolder, atLeastOnce()).close(); - } - @Test public void refreshRemoteSynchronous_shouldCallBackend() throws MessagingException { controller.refreshFolderListSynchronous(account);

['app/core/src/main/java/com/fsck/k9/controller/MessagingController.java', 'app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java', 'app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java', 'app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java']

{'.java': 4}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4702/4100

thundernest

k-9

https://github.com/thundernest/k-9/issues/4100

https://github.com/thundernest/k-9/pull/4702

https://github.com/thundernest/k-9/pull/4702

fixes

Remove placeholder in database when message deletion on server is finished

The "Clear messages (Dangerous!)" option in mailbox action popup menu suggests that ALL messages are deleted (either for privacy or to recreate corrupted mail-queue). However the placeholders are not deleted - exposing potentially sensitive information about deleted conversations. I dont know if the clear() method here is used only by "Remove messages (dangerous!)" sub-menu so I decided to open an issue rather than simply removing "deleted = 0" from here: https://github.com/k9mail/k-9/blob/c053964fefe1c758251aeab902563f8ec7dc454c/app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java#L327

447dbe1bf0c977e6bab0d03659a5807586ad2da4

d33643ba99aa50b2d5de5c37e2afe327e910a9ed

https://github.com/thundernest/k-9/compare/447dbe1bf0c977e6bab0d03659a5807586ad2da4...d33643ba99aa50b2d5de5c37e2afe327e910a9ed

diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index 13a25745f..1c6dfe0a9 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -40,6 +40,7 @@ import com.fsck.k9.K9.Intents; import com.fsck.k9.Preferences; import com.fsck.k9.backend.BackendManager; import com.fsck.k9.backend.api.Backend; +import com.fsck.k9.backend.api.BuildConfig; import com.fsck.k9.backend.api.SyncConfig; import com.fsck.k9.backend.api.SyncListener; import com.fsck.k9.cache.EmailProviderCache; @@ -881,10 +882,13 @@ public class MessagingController { throw new RuntimeException("Unsupported messaging operation"); } - if (operation != MoveOrCopyFlavor.COPY && backend.getSupportsExpunge() - && account.getExpungePolicy() == Expunge.EXPUNGE_IMMEDIATELY) { - Timber.i("processingPendingMoveOrCopy expunging folder %s:%s", account.getDescription(), srcFolderServerId); - backend.expungeMessages(srcFolderServerId, uids); + if (operation != MoveOrCopyFlavor.COPY) { + if (backend.getSupportsExpunge() && account.getExpungePolicy() == Expunge.EXPUNGE_IMMEDIATELY) { + Timber.i("processingPendingMoveOrCopy expunging folder %s:%s", account.getDescription(), srcFolderServerId); + backend.expungeMessages(srcFolderServerId, uids); + } + + destroyPlaceholderMessages(localSourceFolder, uids); } // TODO: Change Backend interface to ensure we never receive null for remoteUidMap @@ -917,6 +921,26 @@ public class MessagingController { } } + private void destroyPlaceholderMessages(LocalFolder localFolder, List<String> uids) throws MessagingException { + for (String uid : uids) { + LocalMessage placeholderMessage = localFolder.getMessage(uid); + if (placeholderMessage == null) { + continue; + } + + if (placeholderMessage.isSet(Flag.DELETED)) { + placeholderMessage.destroy(); + } else { + Timber.w("Expected local message %s in folder %s to be a placeholder, but DELETE flag wasn't set", + uid, localFolder.getServerId()); + + if (BuildConfig.DEBUG) { + throw new AssertionError("Placeholder message must have the DELETED flag set"); + } + } + } + } + private void queueSetFlag(Account account, long folderId, boolean newState, Flag flag, List<String> uids) { putBackground("queueSetFlag", null, () -> { PendingCommand command = PendingSetFlag.create(folderId, newState, flag, uids);

['app/core/src/main/java/com/fsck/k9/controller/MessagingController.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4686/4678

thundernest

k-9

https://github.com/thundernest/k-9/issues/4678

https://github.com/thundernest/k-9/pull/4686

https://github.com/thundernest/k-9/pull/4686

fixes

POP3: trash folder remains empty

Hi, When i delete a mail, the trash folder remains empty [log.txt](https://github.com/k9mail/k-9/files/4505545/log.txt) ### Expected behavior Deleted mail should be found in the trash folder ### Actual behavior No mail is found in the trash folder ### Steps to reproduce 1. delete a mail 2. go to the trash folder 3. see if the deleted mail is in the folder ### Environment K-9 Mail version: 5.708 Android version: 10 Account type (IMAP, POP3, WebDAV/Exchange): pop3

2530dea98acd8df04bbcac37c6451fe27df111db

d1c3cca21373ba79eed444c654660097668f9d46

https://github.com/thundernest/k-9/compare/2530dea98acd8df04bbcac37c6451fe27df111db...d1c3cca21373ba79eed444c654660097668f9d46

diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index 337b8c54a..785bd60e5 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -2034,7 +2034,7 @@ public class MessagingController { localFolder = localStore.getFolder(folder); Map<String, String> uidMap = null; if (folder.equals(account.getTrashFolder()) || !account.hasTrashFolder() || - !backend.isDeleteMoveToTrash()) { + (backend.getSupportsTrashFolder() && !backend.isDeleteMoveToTrash())) { Timber.d("Not moving deleted messages to local Trash folder. Removing local copies."); if (!localOnlyMessages.isEmpty()) {

['app/core/src/main/java/com/fsck/k9/controller/MessagingController.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/4683/2705

thundernest

k-9

https://github.com/thundernest/k-9/issues/2705

https://github.com/thundernest/k-9/pull/4683

https://github.com/thundernest/k-9/pull/4683

fixes

Deleted mail from inbox is doubled in trash directory

Please search to check for an existing issue (including closed issues, for which the fix may not have yet been released) before opening a new issue: https://github.com/k9mail/k-9/issues?q=is%3Aissue ### Expected behavior When deleting one or more mails from inbox, I expect every deleted mail one time in trash directory. ### Actual behavior When deleting one or more mails from inbox, every deleted mail exist in trash two times. ### Steps to reproduce 1. Wait for incomaing mail (or send a test mail) 2. Delete a mail from inbox using symbol 'trash can' on left bottom. 3. Change to 'trash' directory. In first moment the deleted mail appears only one time. After short time the deleted mail appears a second time in trash directory. After manually syncing the doubled mail disappears - the mail is only shown one time. ### Environment K-9 Mail version: 5.207 I use the same email account with thunderbird on my desktop pc. These problems do not occur using thunderbird on pc. Android version: 7.0.0 Account type (IMAP, POP3, WebDAV/Exchange): It is an IMAP Account.

2530dea98acd8df04bbcac37c6451fe27df111db

2dccbb7c480a0e6435580533b6f0caefc177e7aa

https://github.com/thundernest/k-9/compare/2530dea98acd8df04bbcac37c6451fe27df111db...2dccbb7c480a0e6435580533b6f0caefc177e7aa

diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java index 337b8c54a..1e49338d9 100644 --- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -89,6 +89,7 @@ import timber.log.Timber; import static com.fsck.k9.K9.MAX_SEND_ATTEMPTS; import static com.fsck.k9.helper.ExceptionHelper.getRootCauseMessage; +import static com.fsck.k9.helper.Preconditions.checkNotNull; import static com.fsck.k9.mail.Flag.X_REMOTE_COPY_STARTED; import static com.fsck.k9.search.LocalSearchExtensions.getAccountsFromLocalSearch; @@ -843,10 +844,10 @@ public class MessagingController { @VisibleForTesting void processPendingMoveOrCopy(Account account, String srcFolder, String destFolder, List<String> uids, MoveOrCopyFlavor operation, Map<String, String> newUidMap) throws MessagingException { - LocalFolder localDestFolder; + checkNotNull(newUidMap); LocalStore localStore = localStoreProvider.getInstance(account); - localDestFolder = localStore.getFolder(destFolder); + LocalFolder localDestFolder = localStore.getFolder(destFolder); Backend backend = getBackend(account); @@ -871,28 +872,32 @@ public class MessagingController { backend.expungeMessages(srcFolder, uids); } - /* - * This next part is used to bring the local UIDs of the local destination folder - * upto speed with the remote UIDs of remote destination folder. - */ - if (newUidMap != null && remoteUidMap != null && !remoteUidMap.isEmpty()) { - Timber.i("processingPendingMoveOrCopy: changing local uids of %d messages", remoteUidMap.size()); - for (Entry<String, String> entry : remoteUidMap.entrySet()) { - String remoteSrcUid = entry.getKey(); - String newUid = entry.getValue(); - String localDestUid = newUidMap.get(remoteSrcUid); - if (localDestUid == null) { - continue; - } + // TODO: Change Backend interface to ensure we never receive null for remoteUidMap + if (remoteUidMap == null) { + remoteUidMap = Collections.emptyMap(); + } - Message localDestMessage = localDestFolder.getMessage(localDestUid); - if (localDestMessage != null) { - localDestMessage.setUid(newUid); - localDestFolder.changeUid((LocalMessage) localDestMessage); - for (MessagingListener l : getListeners()) { - l.messageUidChanged(account, destFolder, localDestUid, newUid); - } + // Update local messages (that currently have local UIDs) with new server IDs + for (String uid : uids) { + String localUid = newUidMap.get(uid); + String newUid = remoteUidMap.get(uid); + + LocalMessage localMessage = localDestFolder.getMessage(localUid); + if (localMessage == null) { + // Local message no longer exists + continue; + } + + if (newUid != null) { + // Update local message with new server ID + localMessage.setUid(newUid); + localDestFolder.changeUid(localMessage); + for (MessagingListener l : getListeners()) { + l.messageUidChanged(account, destFolder, localUid, newUid); } + } else { + // New server ID wasn't provided. Remove local message. + localMessage.destroy(); } } }

['app/core/src/main/java/com/fsck/k9/controller/MessagingController.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2862/2856

thundernest

k-9

https://github.com/thundernest/k-9/issues/2856

https://github.com/thundernest/k-9/pull/2862

https://github.com/thundernest/k-9/pull/2862

fixes

5.301 plain-text body rendering issues

It appears that somewhere between 5.208 and 5.301 some issues were introduced in the rendering the body of (single-part) plain-text messages. For instance, a message that ends with: Davide ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Bacula-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bacula-users is displayed in 5.301 as: DavideCheck out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdotBacula-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bacula-users If I forward the message from a 5.301 client the bottom text block is displayed correctly in the draft. There additionally appears to be a problem with hyperlinking. If the "http://" or "https://"" starts in column one it is not hyperlinked. If it starts in column 2+ it is. In 5.208 the message renders correctly and all "http://" and "https://" urls are hyperlinked regardless of their column start position.

27bc562ebe37bc139b84c13142681dbfe5640688

77f821cbbe5b6e01742fd8ba8f556a735b0e818a

https://github.com/thundernest/k-9/compare/27bc562ebe37bc139b84c13142681dbfe5640688...77f821cbbe5b6e01742fd8ba8f556a735b0e818a

diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java index 1b9cbf737..fc74be844 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java +++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java @@ -13,7 +13,7 @@ public class HtmlSanitizer { HtmlSanitizer() { Whitelist whitelist = Whitelist.relaxed() - .addTags("font") + .addTags("font", "hr") .addAttributes("table", "align", "bgcolor", "border", "cellpadding", "cellspacing", "width") .addAttributes(":all", "class", "style", "id") .addProtocols("img", "src", "http", "https", "cid", "data"); diff --git a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java index 23714a4e8..f4b86c2a1 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java @@ -158,4 +158,13 @@ public class HtmlSanitizerTest { "<tr><td>Hmailserver service shutdown:</td><td>Ok</td></tr>" + "</tbody></table></body></html>", toCompactString(result)); } + + @Test + public void shouldKeepHrTags() throws Exception { + String html = "<html><head></head><body>one<hr>two<hr />three</body></html>"; + + Document result = htmlSanitizer.sanitize(html); + + assertEquals("<html><head></head><body>one<hr>two<hr>three</body></html>", toCompactString(result)); + } }

['k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java', 'k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2863/2861

thundernest

k-9

https://github.com/thundernest/k-9/issues/2861

https://github.com/thundernest/k-9/pull/2863

https://github.com/thundernest/k-9/pull/2863

fixes

URL at the beginning of a line in plain text body isn't linkified

This happens because we first convert the plain text to HTML and end up with something like: ```html <br>http://uri.example.org<br> ``` But right now only supported schemes preceded by a space, a newline, or an opening parenthesis are candidates for linkifying. https://github.com/k9mail/k-9/blob/27bc562ebe37bc139b84c13142681dbfe5640688/k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java#L16

27bc562ebe37bc139b84c13142681dbfe5640688

2e20ddf6a5a5783ee483a5070eadf4c8b98a1ee2

https://github.com/thundernest/k-9/compare/27bc562ebe37bc139b84c13142681dbfe5640688...2e20ddf6a5a5783ee483a5070eadf4c8b98a1ee2

diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java b/k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java index 815acc5ce..3d2565f27 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java +++ b/k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java @@ -13,7 +13,7 @@ import android.text.TextUtils; public class UriLinkifier { private static final Pattern URI_SCHEME; private static final Map<String, UriParser> SUPPORTED_URIS; - private static final String SCHEME_SEPARATORS = " (\\\\n"; + private static final String SCHEME_SEPARATORS = " (\\\\n>"; private static final String ALLOWED_SEPARATORS_PATTERN = "(?:^|[" + SCHEME_SEPARATORS + "])"; static { diff --git a/k9mail/src/test/java/com/fsck/k9/message/html/UriLinkifierTest.java b/k9mail/src/test/java/com/fsck/k9/message/html/UriLinkifierTest.java index 3b02dc035..81abbbb34 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/html/UriLinkifierTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/html/UriLinkifierTest.java @@ -136,4 +136,13 @@ public class UriLinkifierTest { "<a href=\\"http://uri2.example.org/path\\">http://uri2.example.org/path</a> postfix", outputBuffer.toString()); } + + @Test + public void uriSurroundedByHtmlTags() { + String text = "<br>http://uri.example.org<hr>"; + + UriLinkifier.linkifyText(text, outputBuffer); + + assertEquals("<br><a href=\\"http://uri.example.org\\">http://uri.example.org</a><hr>", outputBuffer.toString()); + } }

['k9mail/src/test/java/com/fsck/k9/message/html/UriLinkifierTest.java', 'k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2203/2143

thundernest

k-9

https://github.com/thundernest/k-9/issues/2143

https://github.com/thundernest/k-9/pull/2203

https://github.com/thundernest/k-9/pull/2203

fixes

Clear local messages -> freeze

### Expected behavior "Clear local messages" should clear the locally stored messages, allowing one to re-download the messages from the server. ### Actual behavior Freeze. ### Steps to reproduce 1. Have a folder with some large amount of messages. A few hundred should suffice. 2. Make sure it's NOT up-to-date with the server 3. Clear its local messages. ### Environment K-9 Mail version: 5.203 Android version: 6.0.1 Account type (IMAP, POP3, WebDAV/Exchange): IMAP

c150bafac3aa1137376af532bba1b13dfac85fd2

4161b914415aef08ab645387893812d13356bda3

https://github.com/thundernest/k-9/compare/c150bafac3aa1137376af532bba1b13dfac85fd2...4161b914415aef08ab645387893812d13356bda3

diff --git a/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java index 4235018bf..203b6eb54 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java @@ -476,31 +476,9 @@ public class FolderList extends K9ListActivity { } private void onClearFolder(Account account, String folderName) { - // There has to be a cheaper way to get at the localFolder object than this - LocalFolder localFolder = null; - try { - if (account == null || folderName == null || !account.isAvailable(FolderList.this)) { - Log.i(K9.LOG_TAG, "not clear folder of unavailable account"); - return; - } - localFolder = account.getLocalStore().getFolder(folderName); - localFolder.open(Folder.OPEN_MODE_RW); - localFolder.clearAllMessages(); - } catch (Exception e) { - Log.e(K9.LOG_TAG, "Exception while clearing folder", e); - } finally { - if (localFolder != null) { - localFolder.close(); - } - } - - onRefresh(!REFRESH_REMOTE); + MessagingController.getInstance(getApplication()).clearFolder(account, folderName, mAdapter.mListener); } - - - - private void sendMail(Account account) { MessagingController.getInstance(getApplication()).sendPendingMessages(account, mAdapter.mListener); } diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java index 3f0af1a22..51d1d8a23 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -53,6 +53,7 @@ import com.fsck.k9.K9; import com.fsck.k9.K9.Intents; import com.fsck.k9.Preferences; import com.fsck.k9.R; +import com.fsck.k9.activity.ActivityListener; import com.fsck.k9.activity.MessageReference; import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection; import com.fsck.k9.cache.EmailProviderCache; @@ -3513,6 +3514,36 @@ public class MessagingController { }); } + public void clearFolder(final Account account, final String folderName, final ActivityListener listener) { + putBackground("clearFolder", listener, new Runnable() { + @Override + public void run() { + clearFolderSynchronous(account, folderName, listener); + } + }); + } + + @VisibleForTesting + protected void clearFolderSynchronous(Account account, String folderName, MessagingListener listener) { + LocalFolder localFolder = null; + try { + localFolder = account.getLocalStore().getFolder(folderName); + localFolder.open(Folder.OPEN_MODE_RW); + localFolder.clearAllMessages(); + } catch (UnavailableStorageException e) { + Log.i(K9.LOG_TAG, "Failed to clear folder because storage is not available - trying again later."); + throw new UnavailableAccountException(e); + } catch (Exception e) { + Log.e(K9.LOG_TAG, "clearFolder failed", e); + addErrorMessage(account, null, e); + } finally { + closeFolder(localFolder); + } + + listFoldersSynchronous(account, false, listener); + } + + /** * Find out whether the account type only supports a local Trash folder. * diff --git a/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java b/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java index e0254d7a1..8429a6cea 100644 --- a/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java +++ b/k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java @@ -13,6 +13,7 @@ import android.content.Context; import com.fsck.k9.Account; import com.fsck.k9.AccountStats; +import com.fsck.k9.K9; import com.fsck.k9.K9RobolectricTestRunner; import com.fsck.k9.Preferences; import com.fsck.k9.helper.Contacts; @@ -26,6 +27,7 @@ import com.fsck.k9.mail.Store; import com.fsck.k9.mailstore.LocalFolder; import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.mailstore.LocalStore; +import com.fsck.k9.mailstore.UnavailableStorageException; import com.fsck.k9.notification.NotificationController; import com.fsck.k9.search.LocalSearch; import org.junit.After; @@ -51,6 +53,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -80,6 +83,8 @@ public class MessagingControllerTest { @Mock private LocalFolder localFolder; @Mock + private LocalFolder errorFolder; + @Mock private Folder remoteFolder; @Mock private LocalStore localStore; @@ -130,6 +135,62 @@ public class MessagingControllerTest { controller.stop(); } + @Test + public void clearFolderSynchronous_shouldOpenFolderForWriting() throws MessagingException { + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + + verify(localFolder).open(Folder.OPEN_MODE_RW); + } + + @Test + public void clearFolderSynchronous_shouldClearAllMessagesInTheFolder() throws MessagingException { + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + + verify(localFolder).clearAllMessages(); + } + + @Test + public void clearFolderSynchronous_shouldCloseTheFolder() throws MessagingException { + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + + verify(localFolder, atLeastOnce()).close(); + } + + @Test(expected = UnavailableAccountException.class) + public void clearFolderSynchronous_whenStorageUnavailable_shouldThrowUnavailableAccountException() throws MessagingException { + doThrow(new UnavailableStorageException("Test")).when(localFolder).open(Folder.OPEN_MODE_RW); + + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + } + + @Test() + public void clearFolderSynchronous_whenExceptionThrown_shouldAddErrorMessage() throws MessagingException { + doThrow(new RuntimeException("Test")).when(localFolder).open(Folder.OPEN_MODE_RW); + + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + + verify(errorFolder).appendMessages(any(List.class)); + } + + @Test() + public void clearFolderSynchronous_whenExceptionThrown_shouldStillCloseFolder() throws MessagingException { + doThrow(new RuntimeException("Test")).when(localFolder).open(Folder.OPEN_MODE_RW); + + try { + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + } catch (Exception ignored){ + } + + verify(localFolder, atLeastOnce()).close(); + } + + @Test() + public void clearFolderSynchronous_shouldListFolders() throws MessagingException { + controller.clearFolderSynchronous(account, FOLDER_NAME, listener); + + verify(listener, atLeastOnce()).listFoldersStarted(account); + } + @Test public void listFoldersSynchronous_shouldNotifyTheListenerListingStarted() throws MessagingException { List<LocalFolder> folders = Collections.singletonList(localFolder); @@ -758,11 +819,15 @@ public class MessagingControllerTest { when(account.getLocalStore()).thenReturn(localStore); when(account.getStats(any(Context.class))).thenReturn(accountStats); when(account.getMaximumAutoDownloadMessageSize()).thenReturn(MAXIMUM_SMALL_MESSAGE_SIZE); + when(account.getErrorFolderName()).thenReturn(K9.ERROR_FOLDER_NAME); + when(account.getEmail()).thenReturn("[email protected]"); } - private void configureLocalStore() { + private void configureLocalStore() throws MessagingException { when(localStore.getFolder(FOLDER_NAME)).thenReturn(localFolder); when(localFolder.getName()).thenReturn(FOLDER_NAME); + when(localStore.getFolder(K9.ERROR_FOLDER_NAME)).thenReturn(errorFolder); + when(localStore.getPersonalNamespaces(false)).thenReturn(Collections.singletonList(localFolder)); } private void configureRemoteStoreWithFolder() throws MessagingException {

['k9mail/src/main/java/com/fsck/k9/activity/FolderList.java', 'k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java', 'k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java']

{'.java': 3}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/3174/2164

thundernest

k-9

https://github.com/thundernest/k-9/issues/2164

https://github.com/thundernest/k-9/pull/3174

https://github.com/thundernest/k-9/pull/3174

fixes

Drafts deleted when syncronizing with IMAP server

Please search to check for an existing issue (including closed issues, for which the fix may not have yet been released) before opening a new issue: https://github.com/k9mail/k-9/issues?q=is%3Aissue ### Expected behavior When "Save as Draft" is selected, draft should be remain saved either locally or on the server for future access. ### Actual behavior Either draft is automatically completely deleted and no longer available upon server sync, or the draft remains in the "drafts" folder but when opening the compose window, the text is no longer available. It seems this is dependent on the encryption setting; everytime I re-open the draft I have to re-select "Don't encrypt" because the default is always "encrypt if possible". The last selection should be remembered. If "encypt if possible" or "encrypt" is selected, the draft is deleted upon sync. If not, I can often no longer access the draft text. This happens regardless of account, and only started after upgrading to the latest K9 version and adding my keys to OpenKeychain (I was using a much older version of K9 prior to this, not sure which). ### Steps to reproduce 1. Create a draft email with text in the body. 2. Select "don't encrypt" 3. Save draft by selecting either "save draft" or by pressing back and "save draft". 4. Text is gone after server sync. OR 1. Create a draft email with text in the body. 2. Select "encrypt" or "encrypt if possible". 3. Save draft by selecting either "save draft" or by pressing back and "save draft". 4. Draft is gone after server sync. ### Environment K-9 Mail version: 5.203 Android version: 5.1.1 Account type (IMAP, POP3, WebDAV/Exchange): IMAP

3009752cac4a0f7ea6341bbef01e41cf4ab27963

f4147483e14bc42c7544a6336b2e40d34b43ebb4

https://github.com/thundernest/k-9/compare/3009752cac4a0f7ea6341bbef01e41cf4ab27963...f4147483e14bc42c7544a6336b2e40d34b43ebb4

diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java index 0f42badfa..718c6efe1 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java @@ -898,7 +898,7 @@ public class MessagingController { if (account.syncRemoteDeletions()) { List<String> destroyMessageUids = new ArrayList<>(); for (String localMessageUid : localUidMap.keySet()) { - if (remoteUidMap.get(localMessageUid) == null) { + if (!localMessageUid.startsWith(K9.LOCAL_UID_PREFIX) && remoteUidMap.get(localMessageUid) == null) { destroyMessageUids.add(localMessageUid); } } @@ -1761,9 +1761,15 @@ public class MessagingController { localMessage.setFlag(Flag.X_REMOTE_COPY_STARTED, true); remoteFolder.appendMessages(Collections.singletonList(localMessage)); - localFolder.changeUid(localMessage); - for (MessagingListener l : getListeners()) { - l.messageUidChanged(account, folder, oldUid, localMessage.getUid()); + if (localMessage.getUid().startsWith(K9.LOCAL_UID_PREFIX)) { + // We didn't get the server UID of the uploaded message. Remove the local message now. The uploaded + // version will be downloaded during the next sync. + localFolder.destroyMessages(Collections.singletonList(localMessage)); + } else { + localFolder.changeUid(localMessage); + for (MessagingListener l : getListeners()) { + l.messageUidChanged(account, folder, oldUid, localMessage.getUid()); + } } } else { /* @@ -1796,10 +1802,17 @@ public class MessagingController { localMessage.setFlag(Flag.X_REMOTE_COPY_STARTED, true); remoteFolder.appendMessages(Collections.singletonList(localMessage)); - localFolder.changeUid(localMessage); - for (MessagingListener l : getListeners()) { - l.messageUidChanged(account, folder, oldUid, localMessage.getUid()); + if (localMessage.getUid().startsWith(K9.LOCAL_UID_PREFIX)) { + // We didn't get the server UID of the uploaded message. Remove the local message now. The + // uploaded version will be downloaded during the next sync. + localFolder.destroyMessages(Collections.singletonList(localMessage)); + } else { + localFolder.changeUid(localMessage); + for (MessagingListener l : getListeners()) { + l.messageUidChanged(account, folder, oldUid, localMessage.getUid()); + } } + if (remoteDate != null) { remoteMessage.setFlag(Flag.DELETED, true); if (Expunge.EXPUNGE_IMMEDIATELY == account.getExpungePolicy()) { @@ -3172,9 +3185,8 @@ public class MessagingController { private void deleteMessagesSynchronous(final Account account, final String folder, final List<? extends Message> messages, MessagingListener listener) { - Folder localFolder = null; - Folder localTrashFolder = null; - List<String> uids = getUidsFromMessages(messages); + LocalFolder localFolder = null; + LocalFolder localTrashFolder = null; try { //We need to make these callbacks before moving the messages to the trash //as messages get a new UID after being moved @@ -3183,13 +3195,32 @@ public class MessagingController { l.messageDeleted(account, folder, message); } } - Store localStore = account.getLocalStore(); + + List<Message> localOnlyMessages = new ArrayList<>(); + List<Message> syncedMessages = new ArrayList<>(); + List<String> syncedMessageUids = new ArrayList<>(); + for (Message message : messages) { + String uid = message.getUid(); + if (uid.startsWith(K9.LOCAL_UID_PREFIX)) { + localOnlyMessages.add(message); + } else { + syncedMessages.add(message); + syncedMessageUids.add(uid); + } + } + + LocalStore localStore = account.getLocalStore(); localFolder = localStore.getFolder(folder); Map<String, String> uidMap = null; if (folder.equals(account.getTrashFolderName()) || !account.hasTrashFolder()) { Timber.d("Deleting messages in trash folder or trash set to -None-, not copying"); - localFolder.setFlags(messages, Collections.singleton(Flag.DELETED), true); + if (!localOnlyMessages.isEmpty()) { + localFolder.destroyMessages(localOnlyMessages); + } + if (!syncedMessages.isEmpty()) { + localFolder.setFlags(syncedMessages, Collections.singleton(Flag.DELETED), true); + } } else { localTrashFolder = localStore.getFolder(account.getTrashFolderName()); if (!localTrashFolder.exists()) { @@ -3221,18 +3252,21 @@ public class MessagingController { queuePendingCommand(account, command); } processPendingCommands(account); - } else if (account.getDeletePolicy() == DeletePolicy.ON_DELETE) { - if (folder.equals(account.getTrashFolderName())) { - queueSetFlag(account, folder, true, Flag.DELETED, uids); + } else if (!syncedMessageUids.isEmpty()) { + if (account.getDeletePolicy() == DeletePolicy.ON_DELETE) { + if (folder.equals(account.getTrashFolderName())) { + queueSetFlag(account, folder, true, Flag.DELETED, syncedMessageUids); + } else { + queueMoveOrCopy(account, folder, account.getTrashFolderName(), false, + syncedMessageUids, uidMap); + } + processPendingCommands(account); + } else if (account.getDeletePolicy() == DeletePolicy.MARK_AS_READ) { + queueSetFlag(account, folder, true, Flag.SEEN, syncedMessageUids); + processPendingCommands(account); } else { - queueMoveOrCopy(account, folder, account.getTrashFolderName(), false, uids, uidMap); + Timber.d("Delete policy %s prevents delete from server", account.getDeletePolicy()); } - processPendingCommands(account); - } else if (account.getDeletePolicy() == DeletePolicy.MARK_AS_READ) { - queueSetFlag(account, folder, true, Flag.SEEN, uids); - processPendingCommands(account); - } else { - Timber.d("Delete policy %s prevents delete from server", account.getDeletePolicy()); } unsuppressMessages(account, messages); diff --git a/k9mail/src/main/java/com/fsck/k9/controller/imap/ImapSync.java b/k9mail/src/main/java/com/fsck/k9/controller/imap/ImapSync.java index c16869c47..ebfa32872 100644 --- a/k9mail/src/main/java/com/fsck/k9/controller/imap/ImapSync.java +++ b/k9mail/src/main/java/com/fsck/k9/controller/imap/ImapSync.java @@ -227,7 +227,7 @@ class ImapSync { if (account.syncRemoteDeletions()) { List<String> destroyMessageUids = new ArrayList<>(); for (String localMessageUid : localUidMap.keySet()) { - if (remoteUidMap.get(localMessageUid) == null) { + if (!localMessageUid.startsWith(K9.LOCAL_UID_PREFIX) && remoteUidMap.get(localMessageUid) == null) { destroyMessageUids.add(localMessageUid); } }

['k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java', 'k9mail/src/main/java/com/fsck/k9/controller/imap/ImapSync.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/3146/3004

thundernest

k-9

https://github.com/thundernest/k-9/issues/3004

https://github.com/thundernest/k-9/pull/3146

https://github.com/thundernest/k-9/pull/3146

fixes

Body in decrypted mails empty by reply or forwarding

### Expected behavior If I click reply or forward, the body of the original mail should be filled with the whole original text and maybe attachments by forwarding . ### Actual behavior There is only the header (Mailadress and so on) and the subject line of the original mail ### Steps to reproduce 1. Receive a encrypted mail 2. Decrypt this mail 3. Click reply or forward 4. See there is no quote and no attachment (by forwarding) ### Environment K-9 Mail version: 5.400 Android version: 7.0 Account type (IMAP, POP3, WebDAV/Exchange): IMAP

6767f41505e6e784af03befd1a122a99f771ead1

8b11a7284ee2e4c2dd1c9b43d05859bcd3468187

https://github.com/thundernest/k-9/compare/6767f41505e6e784af03befd1a122a99f771ead1...8b11a7284ee2e4c2dd1c9b43d05859bcd3468187

diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java index 6d6daccf7..bda32a1fc 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java @@ -37,10 +37,10 @@ public class MessageViewInfo { this.extraAttachments = extraAttachments; } - static MessageViewInfo createWithExtractedContent(Message message, boolean isMessageIncomplete, + static MessageViewInfo createWithExtractedContent(Message message, Part rootPart, boolean isMessageIncomplete, String text, List<AttachmentViewInfo> attachments, AttachmentResolver attachmentResolver) { return new MessageViewInfo( - message, isMessageIncomplete, message, text, attachments, null, attachmentResolver, null, + message, isMessageIncomplete, rootPart, text, attachments, null, attachmentResolver, null, Collections.<AttachmentViewInfo>emptyList()); } diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java index 975b56686..9956c2b9b 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java @@ -124,7 +124,7 @@ public class MessageViewInfoExtractor { !message.isSet(Flag.X_DOWNLOADED_FULL) || MessageExtractor.hasMissingParts(message); return MessageViewInfo.createWithExtractedContent( - message, isMessageIncomplete, viewable.html, attachmentInfos, attachmentResolver); + message, contentPart, isMessageIncomplete, viewable.html, attachmentInfos, attachmentResolver); } private ViewableExtractedText extractViewableAndAttachments(List<Part> parts, diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java index a74910994..eae6f7aca 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java @@ -406,6 +406,8 @@ public class MessageViewInfoExtractorTest { assertEquals("<pre class=\\"k9mail\\">text</pre>", messageViewInfo.text); assertSame(annotation, messageViewInfo.cryptoResultAnnotation); + assertSame(message, messageViewInfo.message); + assertSame(message, messageViewInfo.rootPart); assertTrue(messageViewInfo.attachments.isEmpty()); assertTrue(messageViewInfo.extraAttachments.isEmpty()); } @@ -427,6 +429,8 @@ public class MessageViewInfoExtractorTest { assertEquals("<pre class=\\"k9mail\\">replacement text</pre>", messageViewInfo.text); assertSame(annotation, messageViewInfo.cryptoResultAnnotation); + assertSame(message, messageViewInfo.message); + assertSame(replacementPart, messageViewInfo.rootPart); assertTrue(messageViewInfo.attachments.isEmpty()); assertTrue(messageViewInfo.extraAttachments.isEmpty()); }

['k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java', 'k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfo.java', 'k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java']

{'.java': 3}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/3130/3129

thundernest

k-9

https://github.com/thundernest/k-9/issues/3129

https://github.com/thundernest/k-9/pull/3130

https://github.com/thundernest/k-9/pull/3130

fixes

App crashes when I click on contact logo

Hi, I've not found a recent issue related to my issue. Thanks for your answer ### Expected behavior It should be create a new message with the clicked contact, as recipient. ### Actual behavior Since the update, the app crashes when I click on contact logo square. ### Steps to reproduce 1. Open the app 2. Click on the logo square of any email 3. The app will crash ### Environment K-9 Mail version: 5.403 Android version: 5.1 with Flyme 6.2.0.0A Account type (IMAP, POP3, WebDAV/Exchange): IMAP with Gmail

7c3b90b356ffe045c27b2ab5ceb0a4db3381a7b9

2ec1b3fe29aa8ce745acd03169f70cf0978c5b20

https://github.com/thundernest/k-9/compare/7c3b90b356ffe045c27b2ab5ceb0a4db3381a7b9...2ec1b3fe29aa8ce745acd03169f70cf0978c5b20

diff --git a/k9mail/src/main/java/com/fsck/k9/ui/ContactBadge.java b/k9mail/src/main/java/com/fsck/k9/ui/ContactBadge.java index fbea32426..6a09fedca 100644 --- a/k9mail/src/main/java/com/fsck/k9/ui/ContactBadge.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/ContactBadge.java @@ -1,6 +1,7 @@ package com.fsck.k9.ui; +import android.content.ActivityNotFoundException; import android.content.AsyncQueryHandler; import android.content.ContentResolver; import android.content.Context; @@ -20,6 +21,9 @@ import android.view.View.OnClickListener; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; +import android.widget.Toast; + +import com.fsck.k9.R; /** @@ -207,10 +211,14 @@ public class ContactBadge extends ImageView implements OnClickListener { getContext(), ContactBadge.this, lookupUri, QuickContact.MODE_LARGE, null); } else if (createUri != null) { // Prompt user to add this person to contacts - final Intent intent = new Intent(Intents.SHOW_OR_CREATE_CONTACT, createUri); - extras.remove(EXTRA_URI_CONTENT); - intent.putExtras(extras); - getContext().startActivity(intent); + try { + final Intent intent = new Intent(Intents.SHOW_OR_CREATE_CONTACT, createUri); + extras.remove(EXTRA_URI_CONTENT); + intent.putExtras(extras); + getContext().startActivity(intent); + } catch (ActivityNotFoundException e) { + Toast.makeText(getContext(), R.string.error_activity_not_found, Toast.LENGTH_LONG).show(); + } } } }

['k9mail/src/main/java/com/fsck/k9/ui/ContactBadge.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/3073/3065

thundernest

k-9

https://github.com/thundernest/k-9/issues/3065

https://github.com/thundernest/k-9/pull/3073

https://github.com/thundernest/k-9/pull/3073

fixes

tel URI links are stripped by HtmlSanitizer

Please search to check for an existing issue (including closed issues, for which the fix may not have yet been released) before opening a new issue: https://github.com/k9mail/k-9/issues?q=is%3Aissue ### Expected behavior Tell us what should happen Click to call link does not work since a few weeks. A click to call link is a hyperlink which is opened by a dialer-application. For Exampel: `<a href="tel:004955555">55555</a>` ### Actual behavior Tell us what happens instead Link is shown as plain text ### Steps to reproduce 1. Create a new mail with html code` <a href="tel:004955555">55555</a>` in it 2. Check for new mails in an old version of k9, or in thunderbird and look for the link 3. Check with current k9 mail, link is shown as plain-text. ### Environment K-9 Mail version: current 5.403 Android version: 7.0 (motorola) and 7.1.2 (lineage) verified Account type (IMAP, POP3, WebDAV/Exchange): does not matter

e4467ef959d5dc13d84afb9e49029cc6676fe6f5

11f6614a3b63371e2ce8b7d41623692990de2930

https://github.com/thundernest/k-9/compare/e4467ef959d5dc13d84afb9e49029cc6676fe6f5...11f6614a3b63371e2ce8b7d41623692990de2930

diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java index 63e9eaedb..2b197857a 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java +++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java @@ -25,7 +25,8 @@ public class HtmlSanitizer { "align", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope", "valign", "width") .addAttributes(":all", "class", "style", "id") - .addProtocols("img", "src", "http", "https", "cid", "data"); + .addProtocols("img", "src", "http", "https", "cid", "data") + .addProtocols("a", "href", "tel", "sip", "bitcoin", "ethereum", "rtsp"); cleaner = new Cleaner(whitelist); headCleaner = new HeadCleaner(); diff --git a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java index 38d8d6e4f..3e9f6bf9c 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java @@ -213,4 +213,31 @@ public class HtmlSanitizerTest { "<center><font face=\\"Arial\\" color=\\"red\\" size=\\"12\\">A</font></center>" + "</body></html>", toCompactString(result)); } + + @Test + public void shouldKeepUris() { + String html = "<html><body>" + + "<a href=\\"http://example.com/index.html\\">HTTP</a>" + + "<a href=\\"https://example.com/default.html\\">HTTPS</a>" + + "<a href=\\"mailto:[email protected]\\">Mailto</a>" + + "<a href=\\"tel:00442079460111\\">Telephone</a>" + + "<a href=\\"sip:[email protected]\\">SIP</a>" + + "<a href=\\"bitcoin:12A1MyfXbW6RhdRAZEqofac5jCQQjwEPBu\\">Bitcoin</a>" + + "<a href=\\"ethereum:0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7\\">Ethereum</a>" + + "<a href=\\"rtsp://example.com/media.mp4\\">RTSP</a>" + + "</body></html>"; + + Document result = htmlSanitizer.sanitize(html); + + assertEquals("<html><head></head><body>" + + "<a href=\\"http://example.com/index.html\\">HTTP</a>" + + "<a href=\\"https://example.com/default.html\\">HTTPS</a>" + + "<a href=\\"mailto:[email protected]\\">Mailto</a>" + + "<a href=\\"tel:00442079460111\\">Telephone</a>" + + "<a href=\\"sip:[email protected]\\">SIP</a>" + + "<a href=\\"bitcoin:12A1MyfXbW6RhdRAZEqofac5jCQQjwEPBu\\">Bitcoin</a>" + + "<a href=\\"ethereum:0x89205A3A3b2A69De6Dbf7f01ED13B2108B2c43e7\\">Ethereum</a>" + + "<a href=\\"rtsp://example.com/media.mp4\\">RTSP</a>" + + "</body></html>", toCompactString(result)); + } }

['k9mail/src/main/java/com/fsck/k9/message/html/HtmlSanitizer.java', 'k9mail/src/test/java/com/fsck/k9/message/html/HtmlSanitizerTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2215/1500

thundernest

k-9

https://github.com/thundernest/k-9/issues/1500

https://github.com/thundernest/k-9/pull/2215

https://github.com/thundernest/k-9/pull/2215

fix

Webdav (Exchange) sending email is broken since v5.109 (alpha)

Android version: 6.01 Using K-9 Mail v5.010 (stable) i could send emails using my old WEBDAV account. But never delete emails on the server. Then Updated to K-9 Mail v5.109 (alpha) / and also to K-9 Mail v5.110 (alpha). Now I can delete emails on the server, but I can not send emails any more. They end up on the outgoing folder. Sorry I can't tell you the error message. The message text is too long so it's truncated... Then Downgraded (titanium Backup / also the database) and sending emails is working again.

c150bafac3aa1137376af532bba1b13dfac85fd2

2cec47491d963b0e7493469aba1bf9497ccf2678

https://github.com/thundernest/k-9/compare/c150bafac3aa1137376af532bba1b13dfac85fd2...2cec47491d963b0e7493469aba1bf9497ccf2678

diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java index 7eda5d5b3..0f7d8da1b 100644 --- a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java +++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java @@ -27,6 +27,7 @@ import java.io.InputStreamReader; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -678,28 +679,8 @@ class WebDavFolder extends Folder<WebDavMessage> { Log.i(LOG_TAG, "Uploading message as " + messageURL); - httpmethod = new HttpGeneric(messageURL); - httpmethod.setMethod("PUT"); - httpmethod.setEntity(bodyEntity); + store.sendRequest(messageURL, "PUT", bodyEntity, null, true); - String mAuthString = store.getAuthString(); - - if (mAuthString != null) { - httpmethod.setHeader("Authorization", mAuthString); - } - - response = httpclient.executeOverride(httpmethod, store.getContext()); - statusCode = response.getStatusLine().getStatusCode(); - - if (statusCode < 200 || - statusCode > 300) { - - //TODO: Could we handle a login timeout here? - - throw new IOException("Error with status code " + statusCode - + " while sending/appending message. Response = " - + response.getStatusLine().toString() + " for message " + messageURL); - } WebDavMessage retMessage = new WebDavMessage(message.getUid(), this); retMessage.setUrl(messageURL); diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java index 3132904b3..44ed5fa04 100644 --- a/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java +++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java @@ -830,7 +830,7 @@ public class WebDavStore extends RemoteStore { return mHttpClient; } - private InputStream sendRequest(String url, String method, StringEntity messageBody, + protected InputStream sendRequest(String url, String method, StringEntity messageBody, Map<String, String> headers, boolean tryAuth) throws MessagingException { if (url == null || method == null) { diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java index 69b18552a..e9a6d1a25 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java @@ -12,6 +12,7 @@ import org.apache.http.HttpResponse; import org.apache.http.StatusLine; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.entity.BasicHttpEntity; +import org.apache.http.entity.StringEntity; import org.apache.http.protocol.HttpContext; import org.junit.Before; import org.junit.Test; @@ -37,6 +38,7 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -75,10 +77,16 @@ public class WebDavFolderTest { private StatusLine mockStatusLine; @Captor private ArgumentCaptor<Map<String, String>> headerCaptor; + @Captor + private ArgumentCaptor<String> urlCaptor; + @Captor + private ArgumentCaptor<StringEntity> entityCaptor; private WebDavFolder folder; private WebDavFolder destinationFolder; + private String storeUrl = "https://localhost/webDavStoreUrl"; + private String folderName = "testFolder"; private String moveOrCopyXml = "<xml>MoveOrCopyXml</xml>"; private HashMap<String, String> moveOrCopyHeaders; private List<WebDavMessage> messages; @@ -86,10 +94,10 @@ public class WebDavFolderTest { @Before public void before() throws MessagingException, IOException { MockitoAnnotations.initMocks(this); - when(mockStore.getUrl()).thenReturn("https://localhost/webDavStoreUrl"); + when(mockStore.getUrl()).thenReturn(storeUrl); when(mockStore.getHttpClient()).thenReturn(mockHttpClient); when(mockStore.getStoreConfig()).thenReturn(mockStoreConfig); - folder = new WebDavFolder(mockStore, "testFolder"); + folder = new WebDavFolder(mockStore, folderName); setupTempDirectory(); } @@ -514,9 +522,6 @@ public class WebDavFolderTest { @Test public void appendWebDavMessages_replaces_messages_with_WebDAV_versions() throws MessagingException, IOException { - when(mockHttpClient.executeOverride(any(HttpUriRequest.class), any(HttpContext.class))).thenReturn(mockHttpResponse); - when(mockHttpResponse.getStatusLine()).thenReturn(mockStatusLine); - when(mockStatusLine.getStatusCode()).thenReturn(200); List<Message> existingMessages = new ArrayList<>(); Message existingMessage = mock(Message.class); existingMessages.add(existingMessage); @@ -529,4 +534,20 @@ public class WebDavFolderTest { assertEquals(WebDavMessage.class, response.get(0).getClass()); assertEquals(messageUid, response.get(0).getUid()); } + + @Test + public void appendWebDavMessages_sendsRequestUsingStore() throws MessagingException, IOException { + List<Message> existingMessages = new ArrayList<>(); + Message existingMessage = mock(Message.class); + existingMessages.add(existingMessage); + String messageUid = "testMessageUid"; + when(existingMessage.getUid()).thenReturn(messageUid); + + folder.appendWebDavMessages(existingMessages); + + verify(mockStore).sendRequest(urlCaptor.capture(), eq("PUT"), entityCaptor.capture(), + Matchers.<Map<String, String>>eq(null), eq(true)); + assertTrue(urlCaptor.getValue().startsWith(storeUrl + "/" + folderName + "/" + messageUid)); + assertTrue(urlCaptor.getValue().endsWith(".eml")); + } }

['k9mail-library/src/test/java/com/fsck/k9/mail/store/webdav/WebDavFolderTest.java', 'k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java', 'k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavFolder.java']

{'.java': 3}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2380/2282

thundernest

k-9

https://github.com/thundernest/k-9/issues/2282

https://github.com/thundernest/k-9/pull/2380

https://github.com/thundernest/k-9/pull/2380

fixes

Crash in 5.205: Bug in ParcelableUtil.unmarshall()?

Crash reported via Google Play. User messages: * crash when opening from 1x1 widget * using inbox icon to start k9 results in crash * force closes on start from widget ``` java.lang.RuntimeException: Unable to start activity ComponentInfo{com.fsck.k9/com.fsck.k9.activity.MessageList}: java.lang.NullPointerException: Attempt to get length of null array at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3253) at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:3349) at android.app.ActivityThread.access$1100(ActivityThread.java:221) at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1794) at android.os.Handler.dispatchMessage(Handler.java:102) at android.os.Looper.loop(Looper.java:158) at android.app.ActivityThread.main(ActivityThread.java:7224) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:1230) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1120) Caused by: java.lang.NullPointerException: Attempt to get length of null array at com.fsck.k9.helper.ParcelableUtil.unmarshall(ParcelableUtil.java:27) at com.fsck.k9.helper.ParcelableUtil.unmarshall(ParcelableUtil.java:19) at com.fsck.k9.activity.MessageList.decodeExtras(MessageList.java:437) at com.fsck.k9.activity.MessageList.onCreate(MessageList.java:225) at android.app.Activity.performCreate(Activity.java:6876) at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1135) at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3206) ... 9 more ```

7880e8396e9f4674a3728543742eec64ad389242

5485f7a1bb8c5d816706e58b35a176cfd79c7de9

https://github.com/thundernest/k-9/compare/7880e8396e9f4674a3728543742eec64ad389242...5485f7a1bb8c5d816706e58b35a176cfd79c7de9

diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java index f1addf57f..28f4c0df3 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java @@ -72,8 +72,11 @@ public class MessageList extends K9Activity implements MessageListFragmentListen MessageViewFragmentListener, OnBackStackChangedListener, OnSwipeGestureListener, OnSwitchCompleteListener { - // for this activity - private static final String EXTRA_SEARCH = "search"; + @Deprecated + //TODO: Remove after 2017-09-11 + private static final String EXTRA_SEARCH_OLD = "search"; + + private static final String EXTRA_SEARCH = "search_bytes"; private static final String EXTRA_NO_THREADING = "no_threading"; private static final String ACTION_SHORTCUT = "shortcut"; @@ -431,6 +434,9 @@ public class MessageList extends K9Activity implements MessageListFragmentListen mSearch.addAccountUuid(LocalSearch.ALL_ACCOUNTS); } } + } else if (intent.hasExtra(EXTRA_SEARCH_OLD)) { + mSearch = intent.getParcelableExtra(EXTRA_SEARCH_OLD); + mNoThreading = intent.getBooleanExtra(EXTRA_NO_THREADING, false); } else { // regular LocalSearch object was passed mSearch = intent.hasExtra(EXTRA_SEARCH) ?

['k9mail/src/main/java/com/fsck/k9/activity/MessageList.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2521/2503

thundernest

k-9

https://github.com/thundernest/k-9/issues/2503

https://github.com/thundernest/k-9/pull/2521

https://github.com/thundernest/k-9/pull/2521

fixes

Export settings does not export 'Support signing of unecrypted mail' setting

If I set 'Support signing of unecrypted mail' option, then export the settings, then clear K9 mail app. data, then import the settings, the 'Support signing of unecrypted mail' option does not get set.

231b46f27839f599d95ef3f62cd66f4a20e0e62e

35a29ec4560a031c6ada2849be987aee08108e60

https://github.com/thundernest/k-9/compare/231b46f27839f599d95ef3f62cd66f4a20e0e62e...35a29ec4560a031c6ada2849be987aee08108e60

diff --git a/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java b/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java index 14c77e63e..f1a799ed9 100644 --- a/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java +++ b/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java @@ -285,10 +285,10 @@ public class GlobalSettings { s.put("pgpSignOnlyDialogCounter", Settings.versions( new V(45, new IntegerRangeSetting(0, Integer.MAX_VALUE, 0)) )); - s.put("openpgpProvider", Settings.versions( + s.put("openPgpProvider", Settings.versions( new V(46, new StringSetting(K9.NO_OPENPGP_PROVIDER)) )); - s.put("openpgpSupportSignOnly", Settings.versions( + s.put("openPgpSupportSignOnly", Settings.versions( new V(47, new BooleanSetting(false)) ));

['k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java']

{'.java': 1}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/3025/3018

thundernest

k-9

https://github.com/thundernest/k-9/issues/3018

https://github.com/thundernest/k-9/pull/3025

https://github.com/thundernest/k-9/pull/3025

fixes

Bad <hr> detection causes emails to appear empty

Some emails displayed empty, despite there is text in the email body. Note: Email preview in notification window shows (part) of body; but email body seems empty in K9. This behavior has been introduced with the latest K9 update a few days ago. ### Expected behavior Email displayed correctly. ### Actual behavior Email shown empty. When using "Reply" on the mail, no email body is shown, the wait cursor is shown indefinitely. ### Steps to reproduce Not sure why some emails get not displayed. I could provide the emails not correctly shown if needed. ### Environment K-9 Mail version: 5.400 Android version: 7.1.1 and also 4.4.4 Account type (IMAP, POP3, WebDAV/Exchange): POP3

1506c6d4c028586da0cac60d0688f6a2493ed1e5

b49af84dc803c361244ece7e0333787d2e321573

https://github.com/thundernest/k-9/compare/1506c6d4c028586da0cac60d0688f6a2493ed1e5...b49af84dc803c361244ece7e0333787d2e321573

diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java index 9d5d27aa4..fb618e80d 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java +++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java @@ -5,7 +5,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Locale; import java.util.Set; -import java.util.regex.Pattern; import android.text.Annotation; import android.text.Editable; @@ -179,11 +178,6 @@ public class HtmlConverter { "style=\\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid $$COLOR$$; padding-left: 1ex;\\">"; private static final String HTML_BLOCKQUOTE_END = "</blockquote>"; private static final String HTML_NEWLINE = "<br />"; - private static final Pattern ASCII_PATTERN_FOR_HR = Pattern.compile( - "(^|\\\\Q" + HTML_NEWLINE + "\\\\E)\\\\s*((\\\\Q" + HTML_NEWLINE + "\\\\E)*" + - "((((\\\\Q" + HTML_NEWLINE + "\\\\E){0,2}([-=_]{3,})(\\\\Q" + HTML_NEWLINE + - "\\\\E){0,2})|(([-=_]{2,} ?)(8&lt;|<gt>8|%&lt;|<gt>%)" + - "( ?[-=_]{2,})))+(\\\\Q" + HTML_NEWLINE + "\\\\E|$)))"); /** * Convert a text string into an HTML document. @@ -276,7 +270,7 @@ public class HtmlConverter { HTML_BLOCKQUOTE_END + "$1" ); - text = ASCII_PATTERN_FOR_HR.matcher(text).replaceAll("<hr>"); + text = text.replaceAll("\\\\s*([-=_]{30,}+)\\\\s*", "<hr>"); StringBuffer sb = new StringBuffer(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH); diff --git a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java index 9cd79b53d..b2dca89a9 100644 --- a/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java +++ b/k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java @@ -8,6 +8,7 @@ import java.io.IOException; import com.fsck.k9.K9RobolectricTestRunner; import org.apache.commons.io.IOUtils; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @@ -194,6 +195,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void issue2259Spec() { String text = "text\\n" + "---------------------------\\n" + @@ -225,6 +227,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void mergeConsecutiveBreaksIntoOne() { String text = "hello\\n------------\\n---------------\\nfoo bar"; String result = HtmlConverter.textToHtml(text); @@ -260,6 +263,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void anyTripletIsHRuledOut() { String text = "--=\\n-=-\\n===\\n___\\n\\n"; String result = HtmlConverter.textToHtml(text); @@ -267,6 +271,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void replaceSpaceSeparatedDashesWithHR() { String text = "hello\\n---------------------------\\nfoo bar"; String result = HtmlConverter.textToHtml(text); @@ -274,6 +279,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void replacementWithHRAtBeginning() { String text = "---------------------------\\nfoo bar"; String result = HtmlConverter.textToHtml(text); @@ -281,6 +287,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void replacementWithHRAtEnd() { String text = "hello\\n__________________________________"; String result = HtmlConverter.textToHtml(text); @@ -288,6 +295,7 @@ public class HtmlConverterTest { } @Test + @Ignore("Disabled due to temporary fix for issue #3018") public void replacementOfScissorsByHR() { String text = "hello\\n-- %< -------------- >8 --\\nworld\\n"; String result = HtmlConverter.textToHtml(text);

['k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java', 'k9mail/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

thundernest/k-9/2885/2846

thundernest

k-9

https://github.com/thundernest/k-9/issues/2846

https://github.com/thundernest/k-9/pull/2885

https://github.com/thundernest/k-9/pull/2885

fixes

Parsing email address list with invalid base64 encoded word crashes the app

Test case: ```java Address.parse("=?utf-8?b?invalid#?= <[email protected]>"); ``` Exception: ``` java.lang.Error: java.io.IOException: Unexpected base64 byte at org.apache.james.mime4j.codec.DecoderUtil.decodeBase64(DecoderUtil.java:89) at org.apache.james.mime4j.codec.DecoderUtil.decodeB(DecoderUtil.java:106) at org.apache.james.mime4j.codec.DecoderUtil.tryDecodeEncodedWord(DecoderUtil.java:233) at org.apache.james.mime4j.codec.DecoderUtil.decodeEncodedWords(DecoderUtil.java:187) at org.apache.james.mime4j.codec.DecoderUtil.decodeEncodedWords(DecoderUtil.java:143) at org.apache.james.mime4j.field.address.Builder.buildAddress(Builder.java:71) at org.apache.james.mime4j.field.address.Builder.buildAddressList(Builder.java:51) at org.apache.james.mime4j.field.address.DefaultAddressParser.parseAddressList(DefaultAddressParser.java:69) at org.apache.james.mime4j.field.address.DefaultAddressParser.parseAddressList(DefaultAddressParser.java:73) at com.fsck.k9.mail.Address.parse(Address.java:145) [...] Caused by: java.io.IOException: Unexpected base64 byte at org.apache.james.mime4j.codec.Base64InputStream.read0(Base64InputStream.java:193) at org.apache.james.mime4j.codec.Base64InputStream.read(Base64InputStream.java:87) at org.apache.james.mime4j.codec.DecoderUtil.decodeBase64(DecoderUtil.java:80) ... 39 more ``` I'm not sure what the best way to handle this is. Probably using the personal part as is. However, the options in MIME4J are somewhat limited. It's either crashing with an `Error` or ignoring invalid characters when decoding the base64 payload. Since we don't like crashes we should probably start out with the latter option.

d696723023d8eb2c5dde223fdbcef1d67bd49bb9

ddcf1e257e43a9e08bb4bdcd237f93651c3651d5

https://github.com/thundernest/k-9/compare/d696723023d8eb2c5dde223fdbcef1d67bd49bb9...ddcf1e257e43a9e08bb4bdcd237f93651c3651d5

diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/Address.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Address.java index 042fbbf44..eb8183768 100644 --- a/k9mail-library/src/main/java/com/fsck/k9/mail/Address.java +++ b/k9mail-library/src/main/java/com/fsck/k9/mail/Address.java @@ -2,12 +2,14 @@ package com.fsck.k9.mail; import android.support.annotation.VisibleForTesting; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; import org.apache.james.mime4j.MimeException; +import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.EncoderUtil; import org.apache.james.mime4j.dom.address.Mailbox; import org.apache.james.mime4j.dom.address.MailboxList; @@ -30,7 +32,6 @@ public class Address implements Serializable { private String mPersonal; - public Address(Address address) { mAddress = address.mAddress; mPersonal = address.mPersonal; @@ -142,7 +143,7 @@ public class Address implements Serializable { } List<Address> addresses = new ArrayList<>(); try { - MailboxList parsedList = DefaultAddressParser.DEFAULT.parseAddressList(addressList).flatten(); + MailboxList parsedList = DefaultAddressParser.DEFAULT.parseAddressList(addressList, DecodeMonitor.SILENT).flatten(); for (int i = 0, count = parsedList.size(); i < count; i++) { Mailbox mailbox = parsedList.get(i); diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java index 82a48be51..1fa329163 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java @@ -180,4 +180,10 @@ public class AddressTest { assertNull(result); } + + @Test + public void handlesInvalidBase64Encoding() throws Exception { + Address address = Address.parse("=?utf-8?b?invalid#?= <[email protected]>")[0]; + assertEquals("[email protected]", address.getAddress()); + } }

['k9mail-library/src/test/java/com/fsck/k9/mail/AddressTest.java', 'k9mail-library/src/main/java/com/fsck/k9/mail/Address.java']

{'.java': 2}

Kotlin

{'Kotlin': 4058553, 'Java': 2375292, 'Shell': 7553, 'AIDL': 1946}

Apache License 2.0

apache/shardingsphere-elasticjob/368/367

apache

shardingsphere-elasticjob

https://github.com/apache/shardingsphere-elasticjob/issues/367

https://github.com/apache/shardingsphere-elasticjob/pull/368

https://github.com/apache/shardingsphere-elasticjob/pull/368

fixed

Resuming Transient Job is abnormal

### Which version of Elastic-Job do you using? 2.1.4 ### Expected behavior Disable the job and then resume the job, then triggered by cron expression. ### Actual behavior Disable the job and then resume the job, immediately triggered several times. ### Steps to reproduce the behavior Disable the transient job(cron 0/30 * * * * ?) with "misfire" parameter, wait several minutes, then resume it.

a3db7607ea9d33beb7b94c95ac0f56b7589d2b11

064eca0ab1804af654599bb06eae2ad6a1e59ea5

https://github.com/apache/shardingsphere-elasticjob/compare/a3db7607ea9d33beb7b94c95ac0f56b7589d2b11...064eca0ab1804af654599bb06eae2ad6a1e59ea5

diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListener.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListener.java index 0f9e58ae7..bccbb183a 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListener.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListener.java @@ -70,7 +70,7 @@ public final class CloudJobConfigurationListener implements TreeCacheListener { if (!jobConfig.getTypeConfig().getCoreConfig().isMisfire()) { readyService.setMisfireDisabled(jobConfig.getJobName()); } - producerManager.reschedule(jobConfig); + producerManager.reschedule(jobConfig.getJobName()); } else if (isJobConfigNode(event, path, Type.NODE_REMOVED)) { String jobName = path.substring(CloudJobConfigurationNode.ROOT.length() + 1, path.length()); producerManager.unschedule(jobName); diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeService.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeService.java index 527c58e1a..d27c36c53 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeService.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeService.java @@ -172,12 +172,19 @@ public final class FacadeService { if (!jobConfigOptional.isPresent()) { return; } + if (isDisable(jobConfigOptional.get())) { + return; + } CloudJobConfiguration jobConfig = jobConfigOptional.get(); if (jobConfig.getTypeConfig().getCoreConfig().isFailover() || CloudJobExecutionType.DAEMON == jobConfig.getJobExecutionType()) { failoverService.add(taskContext); } } + private boolean isDisable(final CloudJobConfiguration jobConfiguration) { + return disableAppService.isDisabled(jobConfiguration.getAppName()) || disableJobService.isDisabled(jobConfiguration.getJobName()); + } + /** * 将瞬时作业放入待执行队列. * @@ -223,6 +230,13 @@ public final class FacadeService { * @param jobName 作业名称 */ public void addDaemonJobToReadyQueue(final String jobName) { + Optional<CloudJobConfiguration> jobConfigOptional = jobConfigService.load(jobName); + if (!jobConfigOptional.isPresent()) { + return; + } + if (isDisable(jobConfigOptional.get())) { + return; + } readyService.addDaemon(jobName); } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java index 71d4c6d37..e681e656e 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java @@ -117,7 +117,7 @@ public final class ProducerManager { throw new JobConfigurationException("Cannot found job '%s', please register first.", jobConfig.getJobName()); } configService.update(jobConfig); - reschedule(jobConfig); + reschedule(jobConfig.getJobName()); } /** @@ -130,7 +130,6 @@ public final class ProducerManager { if (jobConfig.isPresent()) { disableJobService.remove(jobName); configService.remove(jobName); - transientProducerScheduler.deregister(jobConfig.get()); } unschedule(jobName); } @@ -162,16 +161,23 @@ public final class ProducerManager { } runningService.remove(jobName); readyService.remove(Lists.newArrayList(jobName)); + Optional<CloudJobConfiguration> jobConfig = configService.load(jobName); + if (jobConfig.isPresent()) { + transientProducerScheduler.deregister(jobConfig.get()); + } } /** * 重新调度作业. * - * @param jobConfig 作业配置 + * @param jobName 作业名称 */ - public void reschedule(final CloudJobConfiguration jobConfig) { - unschedule(jobConfig.getJobName()); - schedule(jobConfig); + public void reschedule(final String jobName) { + unschedule(jobName); + Optional<CloudJobConfiguration> jobConfig = configService.load(jobName); + if (jobConfig.isPresent()) { + schedule(jobConfig.get()); + } } /** diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/TransientProducerScheduler.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/TransientProducerScheduler.java index bfb793cc0..93d379f9d 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/TransientProducerScheduler.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/TransientProducerScheduler.java @@ -112,7 +112,7 @@ final class TransientProducerScheduler { return TriggerBuilder.newTrigger().withIdentity(cron).withSchedule(CronScheduleBuilder.cronSchedule(cron).withMisfireHandlingInstructionDoNothing()).build(); } - void deregister(final CloudJobConfiguration jobConfig) { + synchronized void deregister(final CloudJobConfiguration jobConfig) { repository.remove(jobConfig.getJobName()); String cron = jobConfig.getTypeConfig().getCoreConfig().getCron(); if (!repository.containsKey(buildJobKey(cron))) { diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java index 5c2c7f6a2..9d849510e 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java @@ -186,6 +186,11 @@ public final class CloudAppRestfulApi { public void enable(@PathParam("appName") final String appName) throws JSONException { if (appConfigService.load(appName).isPresent()) { disableAppService.remove(appName); + for (CloudJobConfiguration each : jobConfigService.loadAll()) { + if (appName.equals(each.getAppName())) { + producerManager.reschedule(each.getJobName()); + } + } } } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApi.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApi.java index 2ad20f6db..2505b0435 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApi.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApi.java @@ -184,8 +184,10 @@ public final class CloudJobRestfulApi { @DELETE @Path("/{jobName}/disable") public void enable(@PathParam("jobName") final String jobName) throws JSONException { - if (configService.load(jobName).isPresent()) { + Optional<CloudJobConfiguration> configOptional = configService.load(jobName); + if (configOptional.isPresent()) { facadeService.enableJob(jobName); + producerManager.reschedule(jobName); } } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java index 99f7ae93e..e8dc9213b 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java @@ -58,7 +58,7 @@ public final class CloudJobConfigurationListenerTest { public void assertChildEventWhenDataIsNull() throws Exception { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_ADDED, null)); verify(producerManager, times(0)).schedule(ArgumentMatchers.<CloudJobConfiguration>any()); - verify(producerManager, times(0)).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager, times(0)).reschedule(ArgumentMatchers.<String>any()); verify(producerManager, times(0)).unschedule(ArgumentMatchers.<String>any()); } @@ -66,7 +66,7 @@ public final class CloudJobConfigurationListenerTest { public void assertChildEventWhenIsNotConfigPath() throws Exception { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_UPDATED, new ChildData("/other/test_job", null, "".getBytes()))); verify(producerManager, times(0)).schedule(ArgumentMatchers.<CloudJobConfiguration>any()); - verify(producerManager, times(0)).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager, times(0)).reschedule(ArgumentMatchers.<String>any()); verify(producerManager, times(0)).unschedule(ArgumentMatchers.<String>any()); } @@ -74,7 +74,7 @@ public final class CloudJobConfigurationListenerTest { public void assertChildEventWhenIsRootConfigPath() throws Exception { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_REMOVED, new ChildData("/config/job", null, "".getBytes()))); verify(producerManager, times(0)).schedule(ArgumentMatchers.<CloudJobConfiguration>any()); - verify(producerManager, times(0)).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager, times(0)).reschedule(ArgumentMatchers.<String>any()); verify(producerManager, times(0)).unschedule(ArgumentMatchers.<String>any()); } @@ -82,7 +82,7 @@ public final class CloudJobConfigurationListenerTest { public void assertChildEventWhenStateIsAddAndIsConfigPathAndInvalidData() throws Exception { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_ADDED, new ChildData("/config/job/test_job", null, "".getBytes()))); verify(producerManager, times(0)).schedule(ArgumentMatchers.<CloudJobConfiguration>any()); - verify(producerManager, times(0)).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager, times(0)).reschedule(ArgumentMatchers.<String>any()); verify(producerManager, times(0)).unschedule(ArgumentMatchers.<String>any()); } @@ -96,7 +96,7 @@ public final class CloudJobConfigurationListenerTest { public void assertChildEventWhenStateIsUpdateAndIsConfigPathAndTransientJob() throws Exception { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_UPDATED, new ChildData("/config/job/test_job", null, CloudJsonConstants.getJobJson().getBytes()))); verify(readyService, times(0)).remove(Collections.singletonList("test_job")); - verify(producerManager).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager).reschedule(ArgumentMatchers.<String>any()); } @Test @@ -104,7 +104,7 @@ public final class CloudJobConfigurationListenerTest { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_UPDATED, new ChildData("/config/job/test_job", null, CloudJsonConstants.getJobJson(CloudJobExecutionType.DAEMON).getBytes()))); verify(readyService).remove(Collections.singletonList("test_job")); - verify(producerManager).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager).reschedule(ArgumentMatchers.<String>any()); } @Test @@ -112,7 +112,7 @@ public final class CloudJobConfigurationListenerTest { cloudJobConfigurationListener.childEvent(null, new TreeCacheEvent(TreeCacheEvent.Type.NODE_UPDATED, new ChildData("/config/job/test_job", null, CloudJsonConstants.getJobJson(false).getBytes()))); verify(readyService).setMisfireDisabled("test_job"); - verify(producerManager).reschedule(ArgumentMatchers.<CloudJobConfiguration>any()); + verify(producerManager).reschedule(ArgumentMatchers.<String>any()); } @Test diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeServiceTest.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeServiceTest.java index 35e44ccde..50cc09c4f 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeServiceTest.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeServiceTest.java @@ -222,6 +222,7 @@ public final class FacadeServiceTest { @Test public void assertAddDaemonJobToReadyQueue() { + when(jobConfigService.load("test_job")).thenReturn(Optional.of(CloudJobConfigurationBuilder.createCloudJobConfiguration("test_job"))); facadeService.addDaemonJobToReadyQueue("test_job"); verify(readyService).addDaemon("test_job"); } diff --git a/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApiTest.java b/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApiTest.java index e1c902886..1956a5da2 100644 --- a/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApiTest.java +++ b/elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApiTest.java @@ -106,7 +106,7 @@ public final class CloudJobRestfulApiTest extends AbstractCloudRestfulApiTest { public void assertDeregister() throws Exception { when(getRegCenter().isExisted("/config/job/test_job")).thenReturn(false); assertThat(sentRequest("http://127.0.0.1:19000/api/job/deregister", "DELETE", "test_job"), is(204)); - verify(getRegCenter(), times(2)).get("/config/job/test_job"); + verify(getRegCenter(), times(3)).get("/config/job/test_job"); } @Test

['elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApi.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeServiceTest.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListener.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/mesos/FacadeService.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/config/job/CloudJobConfigurationListenerTest.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/test/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudJobRestfulApiTest.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/TransientProducerScheduler.java', 'elastic-job-cloud/elastic-job-cloud-scheduler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java']

{'.java': 9}

Java

{'Java': 2266368, 'Shell': 3428, 'Dockerfile': 1094, 'Batchfile': 861}

Apache License 2.0

spring-projects/spring-security/13276/13243

spring-projects

spring-security

https://github.com/spring-projects/spring-security/issues/13243

https://github.com/spring-projects/spring-security/pull/13276

https://github.com/spring-projects/spring-security/pull/13276

fixes

CasAuthenticationFilter.successfulAuthentication missing call to securityContextRepository.saveContext

**Describe the bug** `org.springframework.security.cas.web.CasAuthenticationFilter.successfulAuthentication` seems to be missing a call to `securityContextRepository.saveContext` as per [the Spring 6 migration document](https://docs.spring.io/spring-security/reference/migration/servlet/session-management.html). I think this makes the filter completely unusable on Spring6/Boot3 and begs to question if the `CasAuthenticationFilter` code is production ready for Spring 6 otherwise. **To Reproduce** Use the filter **Expected behavior** SecurityContext is saved between requests :)

537e10cf9c7feaf8c00d5523052823f3c469410d

52b87f339c36eaa95d835f456aadd37425bbad02

https://github.com/spring-projects/spring-security/compare/537e10cf9c7feaf8c00d5523052823f3c469410d...52b87f339c36eaa95d835f456aadd37425bbad02

diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java index a951168f66..6f2920b3d0 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java @@ -42,6 +42,7 @@ import org.springframework.security.web.authentication.AbstractAuthenticationPro import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; import org.springframework.security.web.context.HttpSessionSecurityContextRepository; +import org.springframework.security.web.context.SecurityContextRepository; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; @@ -192,10 +193,12 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil private AuthenticationFailureHandler proxyFailureHandler = new SimpleUrlAuthenticationFailureHandler(); + private SecurityContextRepository securityContextRepository= new HttpSessionSecurityContextRepository(); + public CasAuthenticationFilter() { super("/login/cas"); setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler()); - setSecurityContextRepository(new HttpSessionSecurityContextRepository()); + setSecurityContextRepository(this.securityContextRepository); } @Override @@ -211,6 +214,7 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil SecurityContext context = SecurityContextHolder.createEmptyContext(); context.setAuthentication(authResult); SecurityContextHolder.setContext(context); + this.securityContextRepository.saveContext(context,request,response); if (this.eventPublisher != null) { this.eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass())); }

['cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java']

{'.java': 1}

Java

{'Java': 16395664, 'Kotlin': 860788, 'Groovy': 47907, 'AspectJ': 16776, 'Ruby': 7008, 'PLSQL': 3180, 'XSLT': 2369, 'Shell': 811, 'Python': 129, 'HTML': 80, 'JavaScript': 10}

Apache License 2.0

dropwizard/metrics/505/444

dropwizard

metrics

https://github.com/dropwizard/metrics/issues/444

https://github.com/dropwizard/metrics/pull/505

https://github.com/dropwizard/metrics/pull/505

fix

Another ClassCastException in metrics-jetty9's InstrumentedHandler

I found another ClassCastException in metrics-jetty9. Commit 622ef9b which is included in 3.0.1 doesn't seem to completly fix issue #435 that I reported earlier. ``` java.lang.ClassCastException: org.atmosphere.cpr.AtmosphereRequest cannot be cast to org.eclipse.jetty.server.Request at com.codahale.metrics.jetty9.InstrumentedHandler$1.onComplete(InstrumentedHandler.java:140) ~[metrics-jetty9-3.0.1.jar:3.0.1] at org.eclipse.jetty.server.HttpChannelState.completed(HttpChannelState.java:470) ~[jetty-server-9.0.4.v20130625.jar:9.0.4.v20130625] at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:315) ~[jetty-server-9.0.4.v20130625.jar:9.0.4.v20130625] at org.eclipse.jetty.server.HttpChannel.run(HttpChannel.java:228) ~[jetty-server-9.0.4.v20130625.jar:9.0.4.v20130625] at org.eclipse.jetty.server.handler.ContextHandler.handle(ContextHandler.java:1143) ~[jetty-server-9.0.4.v20130625.jar:9.0.4.v20130625] at org.eclipse.jetty.server.HttpChannelState.complete(HttpChannelState.java:432) ~[jetty-server-9.0.4.v20130625.jar:9.0.4.v20130625] at org.eclipse.jetty.server.AsyncContextState.complete(AsyncContextState.java:90) ~[jetty-server-9.0.4.v20130625.jar:9.0.4.v20130625] at org.atmosphere.container.Servlet30CometSupport.action(Servlet30CometSupport.java:157) ~[atmosphere-runtime-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.container.Servlet30CometSupport.action(Servlet30CometSupport.java:79) ~[atmosphere-runtime-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.cpr.AtmosphereResourceImpl.resume(AtmosphereResourceImpl.java:326) ~[atmosphere-runtime-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.jersey.util.JerseyBroadcasterUtil.broadcast(JerseyBroadcasterUtil.java:161) ~[atmosphere-jersey-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.jersey.JerseyBroadcaster.invokeOnStateChange(JerseyBroadcaster.java:77) ~[atmosphere-jersey-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.cpr.DefaultBroadcaster.prepareInvokeOnStateChange(DefaultBroadcaster.java:1047) ~[atmosphere-runtime-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.cpr.DefaultBroadcaster.executeAsyncWrite(DefaultBroadcaster.java:921) ~[atmosphere-runtime-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at org.atmosphere.cpr.DefaultBroadcaster$3.run(DefaultBroadcaster.java:580) ~[atmosphere-runtime-2.0.0-SNAPSHOT.jar:2.0.0-SNAPSHOT] at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) ~[na:1.7.0_25] at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) ~[na:1.7.0_25] at java.util.concurrent.FutureTask.run(FutureTask.java:166) ~[na:1.7.0_25] at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) ~[na:1.7.0_25] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) ~[na:1.7.0_25] at java.lang.Thread.run(Thread.java:724) ~[na:1.7.0_25] ```

32f19d565b2883d91a9a9dbc52684891d58a8cd0

92f7d920deac3c0065ae504784a3b271d6b46fe7

https://github.com/dropwizard/metrics/compare/32f19d565b2883d91a9a9dbc52684891d58a8cd0...92f7d920deac3c0065ae504784a3b271d6b46fe7

diff --git a/metrics-jetty9-legacy/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java b/metrics-jetty9-legacy/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java index 56805cdc9..503e7867f 100644 --- a/metrics-jetty9-legacy/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java +++ b/metrics-jetty9-legacy/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java @@ -133,6 +133,8 @@ public class InstrumentedHandler extends HandlerWrapper { this.otherRequests = metricRegistry.timer(name(prefix, "other-requests")); this.listener = new AsyncListener() { + private long startTime; + @Override public void onTimeout(AsyncEvent event) throws IOException { asyncTimeouts.mark(); @@ -140,6 +142,7 @@ public class InstrumentedHandler extends HandlerWrapper { @Override public void onStartAsync(AsyncEvent event) throws IOException { + startTime = System.currentTimeMillis(); event.getAsyncContext().addListener(this); } @@ -150,8 +153,9 @@ public class InstrumentedHandler extends HandlerWrapper { @Override public void onComplete(AsyncEvent event) throws IOException { final AsyncContextState state = (AsyncContextState) event.getAsyncContext(); - final Request request = (Request) state.getRequest(); - updateResponses(request); + final HttpServletRequest request = (HttpServletRequest) state.getRequest(); + final HttpServletResponse response = (HttpServletResponse) state.getResponse(); + updateResponses(request, response, startTime); if (!state.getHttpChannelState().isDispatched()) { activeSuspended.dec(); } @@ -197,7 +201,7 @@ public class InstrumentedHandler extends HandlerWrapper { } activeSuspended.inc(); } else if (state.isInitial()) { - updateResponses(request); + updateResponses(httpRequest, httpResponse, start); } // else onCompletion will handle it. } @@ -233,13 +237,13 @@ public class InstrumentedHandler extends HandlerWrapper { } } - private void updateResponses(Request request) { - final int response = request.getResponse().getStatus() / 100; - if (response >= 1 && response <= 5) { - responses[response - 1].mark(); + private void updateResponses(HttpServletRequest request, HttpServletResponse response, long start) { + final int responseStatus = response.getStatus() / 100; + if (responseStatus >= 1 && responseStatus <= 5) { + responses[responseStatus - 1].mark(); } activeRequests.dec(); - final long elapsedTime = System.currentTimeMillis() - request.getTimeStamp(); + final long elapsedTime = System.currentTimeMillis() - start; requests.update(elapsedTime, TimeUnit.MILLISECONDS); requestTimer(request.getMethod()).update(elapsedTime, TimeUnit.MILLISECONDS); } diff --git a/metrics-jetty9/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java b/metrics-jetty9/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java index 3c31cb66f..27b03900a 100644 --- a/metrics-jetty9/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java +++ b/metrics-jetty9/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java @@ -133,6 +133,8 @@ public class InstrumentedHandler extends HandlerWrapper { this.otherRequests = metricRegistry.timer(name(prefix, "other-requests")); this.listener = new AsyncListener() { + private long startTime; + @Override public void onTimeout(AsyncEvent event) throws IOException { asyncTimeouts.mark(); @@ -140,6 +142,7 @@ public class InstrumentedHandler extends HandlerWrapper { @Override public void onStartAsync(AsyncEvent event) throws IOException { + startTime = System.currentTimeMillis(); event.getAsyncContext().addListener(this); } @@ -150,8 +153,9 @@ public class InstrumentedHandler extends HandlerWrapper { @Override public void onComplete(AsyncEvent event) throws IOException { final AsyncContextState state = (AsyncContextState) event.getAsyncContext(); - final Request request = (Request) state.getRequest(); - updateResponses(request); + final HttpServletRequest request = (HttpServletRequest) state.getRequest(); + final HttpServletResponse response = (HttpServletResponse) state.getResponse(); + updateResponses(request, response, startTime); if (state.getHttpChannelState().getState() != HttpChannelState.State.DISPATCHED) { activeSuspended.dec(); } @@ -197,7 +201,7 @@ public class InstrumentedHandler extends HandlerWrapper { } activeSuspended.inc(); } else if (state.isInitial()) { - updateResponses(request); + updateResponses(httpRequest, httpResponse, start); } // else onCompletion will handle it. } @@ -233,13 +237,13 @@ public class InstrumentedHandler extends HandlerWrapper { } } - private void updateResponses(Request request) { - final int response = request.getResponse().getStatus() / 100; - if (response >= 1 && response <= 5) { - responses[response - 1].mark(); + private void updateResponses(HttpServletRequest request, HttpServletResponse response, long start) { + final int responseStatus = response.getStatus() / 100; + if (responseStatus >= 1 && responseStatus <= 5) { + responses[responseStatus - 1].mark(); } activeRequests.dec(); - final long elapsedTime = System.currentTimeMillis() - request.getTimeStamp(); + final long elapsedTime = System.currentTimeMillis() - start; requests.update(elapsedTime, TimeUnit.MILLISECONDS); requestTimer(request.getMethod()).update(elapsedTime, TimeUnit.MILLISECONDS); }

['metrics-jetty9-legacy/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java', 'metrics-jetty9/src/main/java/com/codahale/metrics/jetty9/InstrumentedHandler.java']

{'.java': 2}

Java

{'Java': 1542841, 'Shell': 1659, 'Python': 351}

Apache License 2.0

swagger-api/swagger-core/1579/1578

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1578

https://github.com/swagger-api/swagger-core/pull/1579

https://github.com/swagger-api/swagger-core/pull/1579

fixes

byte and binary properties are wrong

It looks like these two commits are backwards: Addition of `binary` property: https://github.com/swagger-api/swagger-core/commit/a18409eb69d9c69435bb2f0bbec7b2540b46616d Addition of `byte` property: https://github.com/swagger-api/swagger-core/commit/4e7a8014d14a8d0dd54f31f825858ae072be1061

05475b8552b8ac18864de841468f8665f8c3de10

deda3feafc61377ccf55883cca0e396a07615bc5

https://github.com/swagger-api/swagger-core/compare/05475b8552b8ac18864de841468f8665f8c3de10...deda3feafc61377ccf55883cca0e396a07615bc5

diff --git a/modules/swagger-core/src/main/java/io/swagger/util/PrimitiveType.java b/modules/swagger-core/src/main/java/io/swagger/util/PrimitiveType.java index 8c4980987..237c592c2 100644 --- a/modules/swagger-core/src/main/java/io/swagger/util/PrimitiveType.java +++ b/modules/swagger-core/src/main/java/io/swagger/util/PrimitiveType.java @@ -1,19 +1,7 @@ package io.swagger.util; import com.fasterxml.jackson.databind.type.TypeFactory; -import io.swagger.models.properties.BaseIntegerProperty; -import io.swagger.models.properties.BooleanProperty; -import io.swagger.models.properties.DateProperty; -import io.swagger.models.properties.DateTimeProperty; -import io.swagger.models.properties.DecimalProperty; -import io.swagger.models.properties.DoubleProperty; -import io.swagger.models.properties.FloatProperty; -import io.swagger.models.properties.IntegerProperty; -import io.swagger.models.properties.LongProperty; -import io.swagger.models.properties.ObjectProperty; -import io.swagger.models.properties.Property; -import io.swagger.models.properties.StringProperty; -import io.swagger.models.properties.UUIDProperty; +import io.swagger.models.properties.*; import java.lang.reflect.Type; import java.util.Collections; @@ -49,8 +37,17 @@ public enum PrimitiveType { */ BYTE(Byte.class, "byte") { @Override - public StringProperty createProperty() { - return new StringProperty(StringProperty.Format.BYTE); + public ByteArrayProperty createProperty() { + return new ByteArrayProperty(); + } + }, + /** + * Binary + */ + BINARY(Byte.class, "binary") { + @Override + public BinaryProperty createProperty() { + return new BinaryProperty(); } }, /** diff --git a/modules/swagger-core/src/test/java/io/swagger/ByteConverterTest.java b/modules/swagger-core/src/test/java/io/swagger/ByteConverterTest.java index b043684b1..ef27bd4cf 100644 --- a/modules/swagger-core/src/test/java/io/swagger/ByteConverterTest.java +++ b/modules/swagger-core/src/test/java/io/swagger/ByteConverterTest.java @@ -4,10 +4,17 @@ import io.swagger.converter.ModelConverters; import io.swagger.matchers.SerializationMatchers; import io.swagger.models.Model; +import io.swagger.models.ModelImpl; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.BinaryProperty; +import io.swagger.models.properties.ByteArrayProperty; +import io.swagger.util.Json; import org.testng.annotations.Test; import java.util.Map; +import static org.testng.Assert.assertEquals; + public class ByteConverterTest { @Test @@ -30,6 +37,54 @@ public class ByteConverterTest { SerializationMatchers.assertEqualsToJson(models, json); } + @Test + public void testByteProperty() { + Model model = new ModelImpl() + .property("byteProperty", new ByteArrayProperty()); + + assertEquals(Json.pretty(model), "{\\n" + + " \\"properties\\" : {\\n" + + " \\"byteProperty\\" : {\\n" + + " \\"type\\" : \\"string\\",\\n" + + " \\"format\\" : \\"byte\\"\\n" + + " }\\n" + + " }\\n" + + "}"); + } + + @Test + public void testDeserializeByteProperty() throws Exception { + String json = "{\\n" + + " \\"properties\\" : {\\n" + + " \\"byteProperty\\" : {\\n" + + " \\"type\\" : \\"string\\",\\n" + + " \\"format\\" : \\"byte\\"\\n" + + " }\\n" + + " }\\n" + + "}"; + + Model model = Json.mapper().readValue(json, Model.class); + Json.prettyPrint(model); + } + + @Test + public void testByteArray() { + Model model = new ModelImpl() + .property("byteArray", new ArrayProperty(new BinaryProperty())); + + assertEquals(Json.pretty(model), "{\\n" + + " \\"properties\\" : {\\n" + + " \\"byteArray\\" : {\\n" + + " \\"type\\" : \\"array\\",\\n" + + " \\"items\\" : {\\n" + + " \\"type\\" : \\"string\\",\\n" + + " \\"format\\" : \\"binary\\"\\n" + + " }\\n" + + " }\\n" + + " }\\n" + + "}"); + } + class ByteConverterModel { public Byte[] myBytes = new Byte[0]; } diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteProperty.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/BinaryProperty.java similarity index 74% rename from modules/swagger-models/src/main/java/io/swagger/models/properties/ByteProperty.java rename to modules/swagger-models/src/main/java/io/swagger/models/properties/BinaryProperty.java index c80d984b9..c1e20c5ac 100644 --- a/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteProperty.java +++ b/modules/swagger-models/src/main/java/io/swagger/models/properties/BinaryProperty.java @@ -2,73 +2,52 @@ package io.swagger.models.properties; import io.swagger.models.Xml; -import java.util.ArrayList; import java.util.List; -public class ByteProperty extends AbstractProperty implements Property { +public class BinaryProperty extends AbstractProperty implements Property { private static final String TYPE = "string"; - - private static final String FORMAT = "byte"; - protected List<String> _enum; protected Integer minLength = null, maxLength = null; protected String pattern = null; protected String _default; - public ByteProperty() { - super.type = TYPE; - super.format = FORMAT; - } - - public ByteProperty _enum(String value) { - if (this._enum == null) { - this._enum = new ArrayList<String>(); - } - if (!_enum.contains(value)) { - _enum.add(value); - } - return this; - } - - public ByteProperty _enum(List<String> value) { - this._enum = value; - return this; + public BinaryProperty() { + super.type = "string"; + super.format = "binary"; } public static boolean isType(String type, String format) { - if (TYPE.equals(type) && FORMAT.equals(format)) { + if ("string".equals(type) && "binary".equals(format)) return true; - } else { - return false; - } + else return false; } - public ByteProperty xml(Xml xml) { + public BinaryProperty xml(Xml xml) { this.setXml(xml); return this; } - public ByteProperty minLength(Integer minLength) { + public BinaryProperty minLength(Integer minLength) { this.setMinLength(minLength); return this; } - public ByteProperty maxLength(Integer maxLength) { + public BinaryProperty maxLength(Integer maxLength) { this.setMaxLength(maxLength); return this; } - public ByteProperty pattern(String pattern) { + public BinaryProperty pattern(String pattern) { this.setPattern(pattern); return this; } - public ByteProperty _default(String _default) { + public BinaryProperty _default(String _default) { this._default = _default; return this; } - public ByteProperty vendorExtension(String key, Object obj) { + public BinaryProperty vendorExtension(String key, Object obj) { this.setVendorExtension(key, obj); return this; } @@ -130,10 +109,10 @@ public class ByteProperty extends AbstractProperty implements Property { if (!super.equals(obj)) { return false; } - if (!(obj instanceof ByteProperty)) { + if (!(obj instanceof BinaryProperty)) { return false; } - ByteProperty other = (ByteProperty) obj; + BinaryProperty other = (BinaryProperty) obj; if (_default == null) { if (other._default != null) { return false; diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java index 496a7ed05..c6ba49a34 100644 --- a/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java +++ b/modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java @@ -2,18 +2,16 @@ package io.swagger.models.properties; import io.swagger.models.Xml; -import java.util.*; - public class ByteArrayProperty extends AbstractProperty implements Property { public ByteArrayProperty() { super.type = "string"; - super.format = "binary"; + super.format = "byte"; } public static boolean isType(String type, String format) { - if ("string".equals(type) && "binary".equals(format)) + if ("string".equals(type) && "byte".equals(format)) return true; else return false; } diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java index 750f788d2..8fb677dca 100644 --- a/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java +++ b/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java @@ -156,6 +156,17 @@ public class PropertyBuilder { return new ByteArrayProperty(); } }, + BINARY(BinaryProperty.class) { + @Override + protected boolean isType(String type, String format) { + return BinaryProperty.isType(type, format); + } + + @Override + protected BinaryProperty create() { + return new BinaryProperty(); + } + }, DATE(DateProperty.class) { @Override protected boolean isType(String type, String format) { diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/StringProperty.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/StringProperty.java index 0dbb65ced..920ab1b3e 100644 --- a/modules/swagger-models/src/main/java/io/swagger/models/properties/StringProperty.java +++ b/modules/swagger-models/src/main/java/io/swagger/models/properties/StringProperty.java @@ -17,7 +17,6 @@ public class StringProperty extends AbstractProperty implements Property { protected String _default; public enum Format { - BYTE("byte"), URI("uri"), URL("url"); diff --git a/modules/swagger-models/src/test/java/io/swagger/StringPropertyTest.java b/modules/swagger-models/src/test/java/io/swagger/StringPropertyTest.java index 19bf1ae6e..45be6930d 100644 --- a/modules/swagger-models/src/test/java/io/swagger/StringPropertyTest.java +++ b/modules/swagger-models/src/test/java/io/swagger/StringPropertyTest.java @@ -1,21 +1,17 @@ package io.swagger; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; - import io.swagger.models.properties.StringProperty; - import org.testng.annotations.Test; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; + public class StringPropertyTest { private static final String PROP_1 = "prop1"; private static final String PROP_2 = "prop2"; @Test public void testEquals() { - assertNotEquals(new StringProperty(StringProperty.Format.BYTE), new StringProperty(StringProperty.Format.URL)); - assertEquals(new StringProperty(StringProperty.Format.BYTE), new StringProperty(StringProperty.Format.BYTE)); - final StringProperty prop1 = new StringProperty(); prop1.setName(PROP_1); prop1.setRequired(true); diff --git a/modules/swagger-models/src/test/java/io/swagger/models/properties/PropertyBuilderTest.java b/modules/swagger-models/src/test/java/io/swagger/models/properties/PropertyBuilderTest.java index d32f3dc27..3c0ff8b69 100644 --- a/modules/swagger-models/src/test/java/io/swagger/models/properties/PropertyBuilderTest.java +++ b/modules/swagger-models/src/test/java/io/swagger/models/properties/PropertyBuilderTest.java @@ -1,17 +1,15 @@ package io.swagger.models.properties; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.Iterator; -import java.util.List; - +import io.swagger.models.properties.PropertyBuilder.PropertyId; +import io.swagger.models.properties.StringProperty.Format; import org.testng.Assert; - import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import io.swagger.models.properties.PropertyBuilder.PropertyId; -import io.swagger.models.properties.StringProperty.Format; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.Iterator; +import java.util.List; public class PropertyBuilderTest { @@ -57,8 +55,8 @@ public class PropertyBuilderTest { {"number", "float", FloatProperty.class}, {"number", "double", DoubleProperty.class}, {"string", null, StringProperty.class}, - {"string", "byte", StringProperty.class}, // are this and the next one correct? - {"string", "binary", ByteArrayProperty.class}, + {"string", "byte", ByteArrayProperty.class}, + {"string", "binary", BinaryProperty.class}, {"boolean", null, BooleanProperty.class}, {"string", "date", DateProperty.class}, {"string", "date-time", DateTimeProperty.class},

['modules/swagger-core/src/main/java/io/swagger/util/PrimitiveType.java', 'modules/swagger-models/src/test/java/io/swagger/StringPropertyTest.java', 'modules/swagger-models/src/main/java/io/swagger/models/properties/ByteArrayProperty.java', 'modules/swagger-models/src/test/java/io/swagger/models/properties/PropertyBuilderTest.java', 'modules/swagger-core/src/test/java/io/swagger/ByteConverterTest.java', 'modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java', 'modules/swagger-models/src/main/java/io/swagger/models/properties/ByteProperty.java', 'modules/swagger-models/src/main/java/io/swagger/models/properties/StringProperty.java']

{'.java': 8}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1678/1512

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1512

https://github.com/swagger-api/swagger-core/pull/1678

https://github.com/swagger-api/swagger-core/pull/1678

fix

swagger-servlet generating non-unique operationIds

using swagger-servlet-1.5.4. first of all, @iushankin huuuge thanks for swagger-servlet migration with 1.5.4! works almost flawlessly. i noticed that swagger-servlet will use `@ApiOperation`s `nickname` attribute for path generation as well as for `operationId`. however, it may be necessary to have multiple operations with the same path (but different http methods). in this case, the `nickname` is correctly used multiple times as path for different operations but also as `operationId` which means the `operationId` is no longer unique. as a result, swagger editor - for example - shows errors: > Cannot have multiple operations with the same operationId: /myPath thanks, zyro

9e93afaf1ee7a9a0130b262fd2112b3c20bbb825

b2ae3198f993ac3d20446e4da7725153c19185b3

https://github.com/swagger-api/swagger-core/compare/9e93afaf1ee7a9a0130b262fd2112b3c20bbb825...b2ae3198f993ac3d20446e4da7725153c19185b3

diff --git a/modules/swagger-servlet/src/main/java/io/swagger/servlet/extensions/ServletReaderExtension.java b/modules/swagger-servlet/src/main/java/io/swagger/servlet/extensions/ServletReaderExtension.java index 5345b1a9f..5eaae4195 100644 --- a/modules/swagger-servlet/src/main/java/io/swagger/servlet/extensions/ServletReaderExtension.java +++ b/modules/swagger-servlet/src/main/java/io/swagger/servlet/extensions/ServletReaderExtension.java @@ -222,7 +222,7 @@ public class ServletReaderExtension implements ReaderExtension { final String operationPath = apiOperation == null ? null : apiOperation.nickname(); return PathUtils.collectPath(context.getParentPath(), apiAnnotation == null ? null : apiAnnotation.value(), - StringUtils.defaultIfBlank(operationPath, method.getName())); + method.getName()); } @Override diff --git a/modules/swagger-servlet/src/test/java/io/swagger/servlet/ReaderTest.java b/modules/swagger-servlet/src/test/java/io/swagger/servlet/ReaderTest.java index a48d65190..a36bacfe1 100644 --- a/modules/swagger-servlet/src/test/java/io/swagger/servlet/ReaderTest.java +++ b/modules/swagger-servlet/src/test/java/io/swagger/servlet/ReaderTest.java @@ -43,12 +43,12 @@ public class ReaderTest { Assert.assertEquals(swagger.getHost(), "host"); Assert.assertEquals(swagger.getBasePath(), "/api"); - Assert.assertNotNull(swagger.getPath("/resources/users")); + Assert.assertNotNull(swagger.getPath("/resources/testMethod3")); Assert.assertNotNull(swagger.getDefinitions().get("SampleData")); Assert.assertEquals(swagger.getExternalDocs().getDescription(), "docs"); Assert.assertEquals(swagger.getExternalDocs().getUrl(), "url_to_docs"); - Path path = swagger.getPath("/resources/users"); + Path path = swagger.getPath("/resources/testMethod3"); Assert.assertNotNull(path); Operation get = path.getGet(); Assert.assertNotNull( get ); diff --git a/modules/swagger-servlet/src/test/java/io/swagger/servlet/extensions/PathGetterTest.java b/modules/swagger-servlet/src/test/java/io/swagger/servlet/extensions/PathGetterTest.java index 4b643b073..3c1092335 100644 --- a/modules/swagger-servlet/src/test/java/io/swagger/servlet/extensions/PathGetterTest.java +++ b/modules/swagger-servlet/src/test/java/io/swagger/servlet/extensions/PathGetterTest.java @@ -13,7 +13,7 @@ public class PathGetterTest extends BaseServletReaderExtensionTest { return new Object[][]{ {"testMethod1", "/tests/resources/testMethod1"}, {"testMethod2", "/tests/resources/testMethod2"}, - {"testMethod3", "/tests/resources/users"}, + {"testMethod3", "/tests/resources/testMethod3"}, {"testMethod4", "/tests/resources/testMethod4"}, }; } @@ -23,7 +23,7 @@ public class PathGetterTest extends BaseServletReaderExtensionTest { return new Object[][]{ {"testMethod1", "/tests/testMethod1"}, {"testMethod2", "/tests/testMethod2"}, - {"testMethod3", "/tests/users"}, + {"testMethod3", "/tests/testMethod3"}, {"testMethod4", "/tests/testMethod4"}, }; }

['modules/swagger-servlet/src/main/java/io/swagger/servlet/extensions/ServletReaderExtension.java', 'modules/swagger-servlet/src/test/java/io/swagger/servlet/extensions/PathGetterTest.java', 'modules/swagger-servlet/src/test/java/io/swagger/servlet/ReaderTest.java']

{'.java': 3}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1556/1526

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1526

https://github.com/swagger-api/swagger-core/pull/1556

https://github.com/swagger-api/swagger-core/pull/1556

fixes

Example Value overwrites Parameter's DataType

Hi, I encountered the following unexpected behavior. When specifying an example value in a `@ApiImplicitParam` annotation the parameter's dataType will be set to the example value. For instance annotation ``` java @ApiImplicitParam(name="id", paramType="path", dataType="string", example="123456") ``` will lead to JSON ``` json "parameters": [{"name":"id", "in":"path", "type":"123456", "x-example":"123456"}] ``` This behavior was observed on swagger 1.5.4. Cause is the `ParameterProcessor.applyAnnotations()` method. The following code found in the method overwrites the parameter's dataType: ``` java if (StringUtils.isNotEmpty(param.getExample())) { p.setType(param.getExample()); } ``` I am not really sure about the original intention of the code but it does not look right to me. The code was introduced by commit 62c100f33a54d7688e859cd011abb89a907e02ef "added example support for non-body params, implicits". Best regards, phosn

436a9cb792be23fc835cf2dcbe1bdb087590f483

edeca227123e85ab03666f3d5e131d6e2c457663

https://github.com/swagger-api/swagger-core/compare/436a9cb792be23fc835cf2dcbe1bdb087590f483...edeca227123e85ab03666f3d5e131d6e2c457663

diff --git a/modules/swagger-core/src/main/java/io/swagger/util/ParameterProcessor.java b/modules/swagger-core/src/main/java/io/swagger/util/ParameterProcessor.java index b75656013..adb4106f0 100644 --- a/modules/swagger-core/src/main/java/io/swagger/util/ParameterProcessor.java +++ b/modules/swagger-core/src/main/java/io/swagger/util/ParameterProcessor.java @@ -67,9 +67,6 @@ public class ParameterProcessor { p.setType(param.getDataType()); } } - if (StringUtils.isNotEmpty(param.getExample())) { - p.setType(param.getExample()); - } if (helper.getMinItems() != null) { p.setMinItems(helper.getMinItems()); } diff --git a/modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithImplicitFileParam.java b/modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithImplicitFileParam.java index 63f6d5da6..fbf438d74 100644 --- a/modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithImplicitFileParam.java +++ b/modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithImplicitFileParam.java @@ -13,7 +13,7 @@ public class ResourceWithImplicitFileParam { @POST @Path("/testString") @ApiImplicitParams({ - @ApiImplicitParam(name = "sort", paramType = "form", dataType = "java.io.File", required = false, value = "file to upload") + @ApiImplicitParam(name = "sort", paramType = "form", dataType = "java.io.File", required = false, value = "file to upload") }) @ApiOperation("Test operation with implicit parameters") public void testImplicitFileParam() {

['modules/swagger-core/src/main/java/io/swagger/util/ParameterProcessor.java', 'modules/swagger-jaxrs/src/test/java/io/swagger/resources/ResourceWithImplicitFileParam.java']

{'.java': 2}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1453/1440

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1440

https://github.com/swagger-api/swagger-core/pull/1453

https://github.com/swagger-api/swagger-core/pull/1453

fixes

The ApiOperation.nickname property does not work

The reason: please check this class: io.swagger.jaxrs.Reader, line 711 I think there should be: operationId = apiOperation.nickname(); instead of: operationId = method.getName(); Sincerely yours Nazar

4e6793564819457e5724464b27a782afad145e10

91a4dbef7c3756ecc69f334bd5d7a89ecf4b5737

https://github.com/swagger-api/swagger-core/compare/4e6793564819457e5724464b27a782afad145e10...91a4dbef7c3756ecc69f334bd5d7a89ecf4b5737

diff --git a/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java b/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java index 937ec0a52..464d77c2a 100644 --- a/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java +++ b/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java @@ -714,7 +714,7 @@ public class Reader { return null; } if (!"".equals(apiOperation.nickname())) { - operationId = method.getName(); + operationId = apiOperation.nickname(); } defaultResponseHeaders = parseResponseHeaders(apiOperation.responseHeaders());

['modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java']

{'.java': 1}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1262/1175

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1175

https://github.com/swagger-api/swagger-core/pull/1262

https://github.com/swagger-api/swagger-core/pull/1262

fixes

Change logging level to DEBUG for some messages in PropertyBuilder

Change logging level for [this](https://github.com/swagger-api/swagger-core/blob/400662d7253c0c2efb14316f8948ddc61a60069e/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java#L569) message to DEBUG as these messages look confusing for [codegen](https://github.com/swagger-api/swagger-codegen) users (https://github.com/swagger-api/swagger-parser/issues/60).

42056f20c52407e4c13283794a65d6d71b3a7e41

183a6fccd65bc0cd6de129aa2c7b35b13bfd2797

https://github.com/swagger-api/swagger-core/compare/42056f20c52407e4c13283794a65d6d71b3a7e41...183a6fccd65bc0cd6de129aa2c7b35b13bfd2797

diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java index 41fbdf96a..660d11c86 100644 --- a/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java +++ b/modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java @@ -566,7 +566,7 @@ public class PropertyBuilder { return item; } } - LOGGER.error("no property for " + type + ", " + format); + LOGGER.debug("no property for " + type + ", " + format); return null; }

['modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java']

{'.java': 1}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1190/1185

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1185

https://github.com/swagger-api/swagger-core/pull/1190

https://github.com/swagger-api/swagger-core/pull/1190

fixes

'hidden' variable is not used

'hidden' variable is declared, but isn't used https://github.com/swagger-api/swagger-core/blob/9c67549cc4e30db916dac0165f0549485a6eb4c7/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java#L834-L837

8999c5b5a862cc4b9f533d1692ba9db7858b1d5f

a671881ac26a1df940012f2b2ff370d393f2dfee

https://github.com/swagger-api/swagger-core/compare/8999c5b5a862cc4b9f533d1692ba9db7858b1d5f...a671881ac26a1df940012f2b2ff370d393f2dfee

diff --git a/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java b/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java index 1657326ca..145416564 100644 --- a/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java +++ b/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java @@ -829,11 +829,6 @@ public class Reader { operation.setDeprecated(true); } - boolean hidden = false; - if (apiOperation != null) { - hidden = apiOperation.hidden(); - } - // process parameters for (Parameter globalParameter : globalParameters) { operation.parameter(globalParameter);

['modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java']

{'.java': 1}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1033/1000

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1000

https://github.com/swagger-api/swagger-core/pull/1033

https://github.com/swagger-api/swagger-core/pull/1033

fixes

NPE without any class with @Api annotation

If there is no class with `@Api` annotation trying to get `swagger.json` causes NPE. This may be very confusing at the beginning, when we are implementing Swagger step-by-step and get exception. Stack: ``` java.lang.NullPointerException at com.wordnik.swagger.jaxrs.config.BeanConfig.configure(BeanConfig.java:196) at com.wordnik.swagger.jaxrs.listing.ApiListingResource.scan(ApiListingResource.java:52) at com.wordnik.swagger.jaxrs.listing.ApiListingResource.getListingJson(ApiListingResource.java:79) ... ``` So we have to check for nulls somewhere in this area: https://github.com/swagger-api/swagger-core/blob/c4260bea041027f9887c67d5d6c6eb408c238969/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/config/BeanConfig.java#L197

e9cad60100c883f171b6d2a989ee6eb398fd3a25

e2e459b0a134e4310b91f60e2fb31625a40f57f0

https://github.com/swagger-api/swagger-core/compare/e9cad60100c883f171b6d2a989ee6eb398fd3a25...e2e459b0a134e4310b91f60e2fb31625a40f57f0

diff --git a/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java b/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java index 0574c9891..23aea9a17 100644 --- a/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java +++ b/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java @@ -58,7 +58,7 @@ public class Reader { static ObjectMapper m = Json.mapper(); public Reader(Swagger swagger) { - this.swagger = swagger; + this.swagger = swagger == null ? new Swagger() : swagger; } public Swagger read(Set<Class<?>> classes) { @@ -76,8 +76,6 @@ public class Reader { } protected Swagger read(Class<?> cls, String parentPath, String parentMethod, boolean readHidden, String[] parentConsumes, String[] parentProduces, Map<String, Tag> parentTags, List<Parameter> parentParameters) { - if(swagger == null) - swagger = new Swagger(); Api api = (Api) cls.getAnnotation(Api.class); Map<String, SecurityScope> globalScopes = new HashMap<String, SecurityScope>();

['modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java']

{'.java': 1}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

swagger-api/swagger-core/1718/1714

swagger-api

swagger-core

https://github.com/swagger-api/swagger-core/issues/1714

https://github.com/swagger-api/swagger-core/pull/1718

https://github.com/swagger-api/swagger-core/pull/1718

fix

jersey2 listing resource broken

1.5.8 seems to have broken the listing resource for jersey2. Now this class: ``` java package io.swagger.jersey.listing; /* */ @Path("/") public class ApiListingResourceJSON extends ApiListingResource { } ``` causes the swagger definition to appear only on `"/"` instead of `"/swagger.{type:json|yaml}"` as defined in the `io.swagger.jaxrs.listing.ApiListingResource` class The solution is to use `io.swagger.jaxrs.listing.ApiListingResource`, but for previous uses (like swagger-generator), the 1.5.8 changes break the resource. We should either fix the ApiListingResourceJSON, remove it, or make it clear how to update when going to 1.5.8.

3e5a7e613daaa95028f3aeb45cd8545c14deaa8c

2425b7f3aa36d7661777ca8819445180af792431

https://github.com/swagger-api/swagger-core/compare/3e5a7e613daaa95028f3aeb45cd8545c14deaa8c...2425b7f3aa36d7661777ca8819445180af792431

diff --git a/modules/swagger-jersey2-jaxrs/src/main/java/io/swagger/jersey/listing/ApiListingResourceJSON.java b/modules/swagger-jersey2-jaxrs/src/main/java/io/swagger/jersey/listing/ApiListingResourceJSON.java index 05a54d0cf..dbe40f642 100644 --- a/modules/swagger-jersey2-jaxrs/src/main/java/io/swagger/jersey/listing/ApiListingResourceJSON.java +++ b/modules/swagger-jersey2-jaxrs/src/main/java/io/swagger/jersey/listing/ApiListingResourceJSON.java @@ -2,9 +2,7 @@ package io.swagger.jersey.listing; import io.swagger.jaxrs.listing.ApiListingResource; -import javax.ws.rs.Path; - -@Path("/") +@Deprecated public class ApiListingResourceJSON extends ApiListingResource { } \\ No newline at end of file

['modules/swagger-jersey2-jaxrs/src/main/java/io/swagger/jersey/listing/ApiListingResourceJSON.java']

{'.java': 1}

Java

{'Java': 2870337, 'Shell': 9095, 'Python': 4538}

Apache License 2.0

karatelabs/karate/1556/1555

karatelabs

karate

https://github.com/karatelabs/karate/issues/1555

https://github.com/karatelabs/karate/pull/1556

https://github.com/karatelabs/karate/pull/1556

fixes

`logPrettyResponse` configuration parameter is not considered

`logPrettyResponse` is not considered when configured, either in `karate-config.js` or in the feature itself. Looking at the code I found the issue and will submit a PR to fix it.

e2b4f3a875805da0a6f2531952af26540eb7c7c1

d5abda97bfcd507f7bd1fcd5b31a876f564b5bc5

https://github.com/karatelabs/karate/compare/e2b4f3a875805da0a6f2531952af26540eb7c7c1...d5abda97bfcd507f7bd1fcd5b31a876f564b5bc5

diff --git a/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java b/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java index f6d7466cd..bc5464d12 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java +++ b/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java @@ -69,7 +69,7 @@ public class HttpLogger { } Variable v = new Variable(body); String text; - if (config != null && config.isLogPrettyRequest()) { + if (config != null && needsPrettyLogging(config, request)) { text = v.getAsPrettyString(); } else { text = v.getAsString(); @@ -80,6 +80,18 @@ public class HttpLogger { sb.append(text); } + private static boolean needsPrettyLogging(Config config, boolean request) { + return logPrettyRequest(config, request) || logPrettyResponse(config, request); + } + + private static boolean logPrettyResponse(Config config, boolean request) { + return !request && config.isLogPrettyResponse(); + } + + private static boolean logPrettyRequest(Config config, boolean request) { + return request && config.isLogPrettyRequest(); + } + private static HttpLogModifier logModifier(Config config, String uri) { HttpLogModifier logModifier = config.getLogModifier(); return logModifier == null ? null : logModifier.enableForUri(uri) ? logModifier : null;

['karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java']

{'.java': 1}

Java

{'Java': 2164729, 'Gherkin': 262656, 'JavaScript': 70334, 'HTML': 44272, 'Scala': 13901, 'CSS': 7856, 'ANTLR': 4088, 'Shell': 3629, 'Dockerfile': 2919}

MIT License

karatelabs/karate/2376/2259

karatelabs

karate

https://github.com/karatelabs/karate/issues/2259

https://github.com/karatelabs/karate/pull/2376

https://github.com/karatelabs/karate/pull/2376

resolves

Double Click and Right Click in Karate Robot framework for windows app

Double click doesnt work in Karate Robot framework for windows app ``` locate('abc').doubleClick(0,0) ``` It clicks twice but does it slowly such that the double click does not really work. I found doubleClick() method in RobotBase.Java which has a 40ms delay between the clicks and i'm not sure if that is the reason behind the lag in clicks. Right Click also doesnt work as there is no method in Element.java but there is a rightClick() method in RobotBase.Java which calls Click(3) internally

7e1f3b3bb0405847722f814d4ab8fed08e7f8832

7ee8b8bd272a7e12a7e2318a193ab84b4c45da6a

https://github.com/karatelabs/karate/compare/7e1f3b3bb0405847722f814d4ab8fed08e7f8832...7ee8b8bd272a7e12a7e2318a193ab84b4c45da6a

diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java b/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java index af420922a..0ee7dfbfc 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java @@ -277,7 +277,7 @@ public abstract class RobotBase implements Robot, Plugin { @Override public Robot rightClick() { - return click(3); + return click(2); } @Override @@ -299,9 +299,20 @@ public abstract class RobotBase implements Robot, Plugin { @Override public Robot doubleClick() { - click(); - delay(40); - click(); + if (highlight) { + getLocation().highlight(highlightDuration); + int toDelay = highlightDuration; + if (toDelay > 0) { + RobotUtils.delay(toDelay); + } + } + int clickType = mask(1); + robot.mousePress(clickType); + robot.mouseRelease(clickType); + RobotUtils.delay(100); + robot.mousePress(clickType); + robot.mouseRelease(clickType); + return this; }

['karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java']

{'.java': 1}