some mail imap changes

1 files changed, 72 insertions, 55 deletions

diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index b0dd1b8..a6688ed 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -1,135 +1,136 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #include <stdlib.h>
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include <qapplication.h>
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
 #include <qprogressbar.h>
 #include "genericwrapper.h"
 #include <kglobal.h>
 
 using namespace Opie::Core;
 int IMAPwrapper::mMax = 0;
 int IMAPwrapper::mCurrent = 0;
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
     : AbstractMail()
 {
     account = a;
     m_imap = 0;
     m_Lastmbox = "";
     mCurrent = 0;
     mMax = 0;
 }
 
 IMAPwrapper::~IMAPwrapper()
 {
     logout();
 }
 
 /* to avoid to often select statements in loops etc.
    we trust that we are logged in and connection is established!*/
 int IMAPwrapper::selectMbox(const QString&mbox)
 {
     if (mbox == m_Lastmbox) {
         return MAILIMAP_NO_ERROR;
     }
     int err = mailimap_select( m_imap, (char*)mbox.latin1());
     if ( err != MAILIMAP_NO_ERROR ) {
         m_Lastmbox = "";
         return err;
     }
     m_Lastmbox = mbox;
     return err;
 }
 
 void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
     //qDebug("imap progress %d of %d ",current,maximum  );
     //Global::statusMessage(tr("Downloading message %1 of %2").arg( current).arg(maximum));
     //qApp->processEvents()
     static int last = 0;
     if ( last != current )
         IMAPwrapper::progress();
     last = current;
 }
 void IMAPwrapper::progress( QString m )
 {
  
     static QString mProgrMess;
     if ( m != QString::null ) {
         mProgrMess = m;
-        mCurrent = 0;
+        mCurrent = 1;
         return;
     }
     QString mess;
     //qDebug("progress ");
     if (  mMax ) mess = mProgrMess +tr(" message %1 of %2").arg( mCurrent++).arg(mMax);
     else mess = mProgrMess +tr(" message %1").arg( mCurrent++);
     Global::statusMessage(mess);
+    qDebug("Progress %s %s", mess.latin1(), m.latin1());
     qApp->processEvents();
 }
 bool IMAPwrapper::start_tls(bool force_tls)
 {
     int err;
     bool try_tls;
     mailimap_capability_data * cap_data = 0;
 
     err = mailimap_capability(m_imap,&cap_data);
     if (err != MAILIMAP_NO_ERROR) {
         Global::statusMessage("error getting capabilities!");
         return false;
     }
     clistiter * cur;
     for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) {
         struct mailimap_capability * cap;
         cap  = (struct mailimap_capability *)clist_content(cur);
         if (cap->cap_type == MAILIMAP_CAPABILITY_NAME) {
             if (strcasecmp(cap->cap_data.cap_name, "STARTTLS") == 0) {
                 try_tls = true;
                 break;
             }
         }
     }
     if (cap_data) {
         mailimap_capability_data_free(cap_data);
     }
     if (try_tls) {
         err =  mailimap_starttls(m_imap);
         if (err != MAILIMAP_NO_ERROR && force_tls) {
             Global::statusMessage(tr("Server has no TLS support!"));
             try_tls = false;
         } else {
             mailstream_low * low;
             mailstream_low * new_low;
             low = mailstream_get_low(m_imap->imap_stream);
             if (!low) {
                 try_tls = false;
             } else {
                 int fd = mailstream_low_get_fd(low);
                 if (fd > -1 && (new_low = mailstream_low_ssl_open(fd))!=0) {
                     mailstream_low_free(low);
                     mailstream_set_low(m_imap->imap_stream, new_low);
                 } else {
                     try_tls = false;
                 }
             }
         }
    }
    return try_tls;
 }
 
 void IMAPwrapper::login()
 {
     QString server, user, pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     if (account->getOffline()) return;
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
         err = mailimap_noop(m_imap);
         if (err!=MAILIMAP_NO_ERROR) {
@@ -172,189 +173,205 @@ void IMAPwrapper::login()
     }
 
     if ( ssl ) {
         //qDebug("using ssl ");
         err = mailimap_ssl_connect( m_imap, (char*)server.latin1(), port );
     } else {
         err = mailimap_socket_connect( m_imap, (char*)server.latin1(), port );
     }
 
     if ( err != MAILIMAP_NO_ERROR &&
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          QString failure = "";
          if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) {
             failure="Connection refused";
          } else {
             failure="Unknown failure";
          }
          Global::statusMessage(tr("error connecting imap server: %1").arg(failure));
          mailimap_free( m_imap );
          m_imap = 0;
          return;
     }
 
     if (!ssl) {
         try_tls = start_tls(force_tls);
     }
 
     bool ok = true;
     if (force_tls && !try_tls) {
         Global::statusMessage(tr("Server has no TLS support!"));
         ok = false;
     }
 
 
     /* login */
 
     if (ok) {
         err = mailimap_login_simple( m_imap, (char*)user.latin1(), (char*)pass.latin1() );
         if ( err != MAILIMAP_NO_ERROR ) {
             Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
             ok = false;
         }
     }
     if (!ok) {
         err = mailimap_close( m_imap );
         mailimap_free( m_imap );
         m_imap = 0;
     }
 }
 
 void IMAPwrapper::logout()
 {
     int err = MAILIMAP_NO_ERROR;
     if (!m_imap) return;
     err = mailimap_logout( m_imap );
     err = mailimap_close( m_imap );
     mailimap_free( m_imap );
     m_imap = 0;
     m_Lastmbox = "";
 }
 
 void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
 {
-    int err = MAILIMAP_NO_ERROR;
-    clist *result = 0;
-    clistcell *current;
-    mailimap_fetch_type *fetchType = 0;
-    mailimap_set *set = 0;
-
-    login();
-    if (!m_imap) {
-        return;
-    }
-    /* select mailbox READONLY for operations */
-    err = selectMbox(mailbox);
-    if ( err != MAILIMAP_NO_ERROR ) {
-        return;
-    }
 
-    int last = m_imap->imap_selection_info->sel_exists;
+    int tryAgain = 1;
+    while ( tryAgain >= 0 ) {
+        int err = MAILIMAP_NO_ERROR;
+        clist *result = 0;
+        clistcell *current;
+        mailimap_fetch_type *fetchType = 0;
+        mailimap_set *set = 0;
 
-    if (last == 0) {
-        Global::statusMessage(tr("Mailbox has no mails"));
-        return;
-    } else {
-    }
-  
-    Global::statusMessage(tr("Fetching header list"));
-    qApp->processEvents();
-    /* the range has to start at 1!!! not with 0!!!! */
-    set = mailimap_set_new_interval( 1, last );
-    fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
-    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
-    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
-    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
-    mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
-
-    err = mailimap_fetch( m_imap, set, fetchType, &result );
-    mailimap_set_free( set );
-    mailimap_fetch_type_free( fetchType );
+        login();
+        if (!m_imap) {
+            return;
+        }
+        /* select mailbox READONLY for operations */
+        err = selectMbox(mailbox);
+        if ( err != MAILIMAP_NO_ERROR ) {
+            return;
+        }
 
-    QString date,subject,from;
+        int last = m_imap->imap_selection_info->sel_exists;
 
-    if ( err == MAILIMAP_NO_ERROR ) {
-        mailimap_msg_att * msg_att;
-        int i = 0;
-        for (current = clist_begin(result); current != 0; current=clist_next(current)) {
-            ++i;
-            msg_att = (mailimap_msg_att*)current->data;
-            RecMail*m = parse_list_result(msg_att);
-            if (m) {
-                if ( maxSizeInKb == 0 || m->Msgsize()<=maxSizeInKb*1024 ) { 
-                    m->setNumber(i);
-                    m->setMbox(mailbox);
-                    m->setWrapper(this);
-                    target.append(m);
+        if (last == 0) {
+            Global::statusMessage(tr("Mailbox has no mails"));
+            return;
+        } else {
+        }
+        progress( tr("Fetch "));     
+        mMax = last;
+        //qDebug("last %d ", last);
+        Global::statusMessage(tr("Fetching header list"));
+        qApp->processEvents();
+        /* the range has to start at 1!!! not with 0!!!! */
+        //LR the access to web.de imap server is no working with value 1
+        qDebug("interval %d - %d ", tryAgain, last-1+tryAgain  );
+        set = mailimap_set_new_interval( tryAgain, last );
+        fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
+        mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
+        mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
+        mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
+        mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
+
+        err = mailimap_fetch( m_imap, set, fetchType, &result );
+        mailimap_set_free( set );
+        mailimap_fetch_type_free( fetchType );
+
+        QString date,subject,from;
+
+        if ( err == MAILIMAP_NO_ERROR ) {
+            tryAgain = -1;
+            mailimap_msg_att * msg_att;
+            int i = 0;
+            for (current = clist_begin(result); current != 0; current=clist_next(current)) {
+                ++i;
+                //qDebug("iii %d ",i);
+                msg_att = (mailimap_msg_att*)current->data;
+                RecMail*m = parse_list_result(msg_att);
+                if (m) {
+                    if ( maxSizeInKb == 0 || m->Msgsize()<=maxSizeInKb*1024 ) { 
+                        m->setNumber(i);
+                        m->setMbox(mailbox);
+                        m->setWrapper(this);
+                        target.append(m);
+                    }
                 }
             }
+            Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count()));
+        } else {
+            --tryAgain;
+            --tryAgain;
+            if ( tryAgain < 0 )
+                Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
+            else
+                qDebug("try again... ");
         }
-        Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count()));
-    } else {
-        Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
+    
+        if (result) mailimap_fetch_list_free(result);
     }
-    if (result) mailimap_fetch_list_free(result);
 }
 
 QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
     int err = MAILIMAP_NO_ERROR;
     clist *result = 0;
     clistcell *current = 0;
     clistcell*cur_flag = 0;
     mailimap_mbx_list_flags*bflags = 0;
 
     QValueList<FolderP>* folders = new QValueList<FolderP>();
     login();
     if (!m_imap) {
         return folders;
     }
 
 /*
  * First we have to check for INBOX 'cause it sometimes it's not inside the path.
  * We must not forget to filter them out in next loop!
  * it seems like ugly code. and yes - it is ugly code. but the best way.
  */
     Global::statusMessage(tr("Fetching folder list"));
     qApp->processEvents();
     QString temp;
     mask = "INBOX" ;
     mailimap_mailbox_list *list;
     err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
     QString del;
     bool selectable = true;
     bool no_inferiors = false;
     if ( err == MAILIMAP_NO_ERROR ) {
         current = result->first;
         for ( int i = result->count; i > 0; i-- ) {
             list = (mailimap_mailbox_list *) current->data;
             // it is better use the deep copy mechanism of qt itself
             // instead of using strdup!
             temp = list->mb_name;
             del = list->mb_delimiter;
             current = current->next;
             if ( (bflags = list->mb_flag) ) {
                 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                             bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
                 for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
                     if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
                         no_inferiors = true;
                     }
                 }
             }
             folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
         }
     } else {
         qDebug("error fetching folders: ");
       
     }
     mailimap_list_result_free( result );
 
 /*
  * second stage - get the other then inbox folders
  */
     mask = "*" ;
     path = account->getPrefix().latin1();
     if (!path) path = "";
     err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
@@ -891,129 +908,129 @@ void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_ba
 void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
     if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
         clistcell*cur;
         mailimap_single_body_fld_param*param=0;
         for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
             param = (mailimap_single_body_fld_param*)cur->data;
             if (param) {
                 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
             }
         }
     }
     mailimap_body_fld_enc*enc = which->bd_encoding;
     QString encoding("");
     switch (enc->enc_type) {
     case MAILIMAP_BODY_FLD_ENC_7BIT:
         encoding = "7bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_8BIT:
         encoding = "8bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_BINARY:
         encoding="binary";
         break;
     case MAILIMAP_BODY_FLD_ENC_BASE64:
         encoding="base64";
         break;
     case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE:
         encoding="quoted-printable";
         break;
     case MAILIMAP_BODY_FLD_ENC_OTHER:
     default:
         if (enc->enc_value) {
             char*t=enc->enc_value;
             encoding=QString(enc->enc_value);
             enc->enc_value=0L;
             free(t);
         }
     }
     if (which->bd_description) {
         target_part->setDescription(QString(which->bd_description));
     }
     target_part->setEncoding(encoding);
     target_part->setSize(which->bd_size);
 }
 void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
 {
     //#if 0
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     //#endif
     if (!m_imap) {
         return;
     }
     int iii = 0;
     int count = target.count();
     // qDebug("imap remove count %d ", count); 
 
     
     mMax = count;
-    //progress( tr("Delete")); 
+    progress( tr("Delete")); 
 
     QProgressBar wid ( count );
     wid.setCaption( tr("Deleting ..."));
     wid.show();
     while (iii < count ) {
         Global::statusMessage(tr("Delete message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
         qApp->processEvents();
         RecMailP mail = (*target.at( iii ));
         //#if 0
         //qDebug("IMAP remove %d %d ", iii, mail->getNumber() );
         err = selectMbox(mail->getMbox());
         if ( err != MAILIMAP_NO_ERROR ) {
             return;
         }
         flist = mailimap_flag_list_new_empty();
         mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
         store_flags = mailimap_store_att_flags_new_set_flags(flist);
         set = mailimap_set_new_single(mail->getNumber());
         err = mailimap_store(m_imap,set,store_flags);
         mailimap_set_free( set );
         mailimap_store_att_flags_free(store_flags);
 
         if (err != MAILIMAP_NO_ERROR) {
             // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
             return;
         }
         // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
         /* should we realy do that at this moment? */
    
         // err = mailimap_expunge(m_imap);
         //if (err != MAILIMAP_NO_ERROR) {
         //    Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
         // }
         //#endif
         //deleteMail( mail);
         ++iii;
     }
     //qDebug("Deleting imap mails... ");
         err = mailimap_expunge(m_imap);
         if (err != MAILIMAP_NO_ERROR) {
             Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
         }
 }
 void IMAPwrapper::deleteMail(const RecMailP&mail)
 {
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     if (!m_imap) {
         return;
     }
     err = selectMbox(mail->getMbox());
     if ( err != MAILIMAP_NO_ERROR ) {
         return;
     }
     flist = mailimap_flag_list_new_empty();
     mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
     store_flags = mailimap_store_att_flags_new_set_flags(flist);
     set = mailimap_set_new_single(mail->getNumber());
     err = mailimap_store(m_imap,set,store_flags);