Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2024-06-30 11:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug that was corrupting EMAIL.DB by using wrong idx when order reversed

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-07-07 04:15:04 -04:00
parent 3aab6c2df5
commit a8a81a4acf
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/email.c
View File

@ -4,9 +4,6 @@
// Bobbi June, July 2020 // Bobbi June, July 2020
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// - TODO: BUG - there is a bug that causes messages to get duplicated
// at top and bottom of mailbox. write_updated_headers()
// does not take account of the new reverse function.
// - TODO: See TODOs further down for error handling // - TODO: See TODOs further down for error handling
// - TODO: Editor for email composition functions // - TODO: Editor for email composition functions
@ -1380,6 +1377,16 @@ char prompt_okay(char *msg) {
return c; return c;
} }
/*
* Return index into EMAIL.DB for current selection.
*/
uint16_t get_db_index(void) {
if (!reverse)
return first_msg + selection - 1;
else
return total_msgs - (first_msg + selection - 1);
}
/* /*
* Check if there are tagged messages. If not, just call copy_to_mailbox() * Check if there are tagged messages. If not, just call copy_to_mailbox()
* on the current message. If they are, prompt the user and, if affirmative, * on the current message. If they are, prompt the user and, if affirmative,
@ -1391,7 +1398,7 @@ uint8_t copy_to_mailbox_tagged(char *mbox, uint8_t delete) {
uint16_t l; uint16_t l;
if (total_tag == 0) { if (total_tag == 0) {
h = get_headers(selection); h = get_headers(selection);
copy_to_mailbox(h, first_msg + selection - 1, mbox, delete, ' '); copy_to_mailbox(h, get_db_index(), mbox, delete, ' ');
return 0; return 0;
} }
sprintf(filename, "%u tagged - ", total_tag); sprintf(filename, "%u tagged - ", total_tag);
@ -1516,7 +1523,7 @@ void keyboard_hdlr(void) {
h->tag = 'T'; h->tag = 'T';
++total_tag; ++total_tag;
} }
write_updated_headers(h, first_msg + selection - 1); write_updated_headers(h, get_db_index());
email_summary_for(selection); email_summary_for(selection);
status_bar(); status_bar();
} }
@ -1542,7 +1549,7 @@ void keyboard_hdlr(void) {
if (h->status == 'N') if (h->status == 'N')
--total_new; --total_new;
h->status = 'R'; // Mark email read h->status = 'R'; // Mark email read
write_updated_headers(h, first_msg + selection - 1); write_updated_headers(h, get_db_index());
} }
email_pager(); email_pager();
email_summary(); email_summary();
@ -1552,7 +1559,7 @@ void keyboard_hdlr(void) {
h = get_headers(selection); h = get_headers(selection);
if (h) { if (h) {
h->status = 'D'; h->status = 'D';
write_updated_headers(h, first_msg + selection - 1); write_updated_headers(h, get_db_index());
email_summary_for(selection); email_summary_for(selection);
} }
break; break;
@ -1561,7 +1568,7 @@ void keyboard_hdlr(void) {
h = get_headers(selection); h = get_headers(selection);
if (h) { if (h) {
h->status = 'R'; h->status = 'R';
write_updated_headers(h, first_msg + selection - 1); write_updated_headers(h, get_db_index());
email_summary_for(selection); email_summary_for(selection);
} }
break; break;
@ -1604,14 +1611,13 @@ void keyboard_hdlr(void) {
case 'r': case 'r':
case 'R': case 'R':
h = get_headers(selection); h = get_headers(selection);
copy_to_mailbox(h, first_msg + selection - 1, "OUTBOX", 0, 'R'); copy_to_mailbox(h, get_db_index(), "OUTBOX", 0, 'R');
break; break;
case 'f': case 'f':
case 'F': case 'F':
h = get_headers(selection); h = get_headers(selection);
copy_to_mailbox(h, first_msg + selection - 1, "OUTBOX", 0, 'F'); copy_to_mailbox(h, get_db_index(), "OUTBOX", 0, 'F');
break; break;
#if 0
case ',': case ',':
case '<': case '<':
reverse = 1; reverse = 1;
@ -1622,7 +1628,6 @@ void keyboard_hdlr(void) {
reverse = 0; reverse = 0;
switch_mailbox(curr_mbox); switch_mailbox(curr_mbox);
break; break;
#endif
case 'q': case 'q':
case 'Q': case 'Q':
if (prompt_okay("Quit - ")) { if (prompt_okay("Quit - ")) {