many phone sync fixes

2 files changed, 7 insertions, 3 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index ddf9790..0ea8e06 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -429,84 +429,84 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                         if (ReadVCALText(Line, "DTSTART", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_START_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "DTEND", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_END_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "DALARM", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_SILENT_ALARM_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "AALARM", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_ALARM_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
                                 Calendar->EntriesNum++;
                         }
                         break;
                 case 2: /* ToDo note */
                         if (strstr(Line,"END:VTODO")) {
                                 if (ToDo->EntriesNum == 0) return ERR_EMPTY;
                                 return ERR_NONE;
                         }
                         if (ReadVCALText(Line, "DUE", Buff)) {
                                 ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_END_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &ToDo->Entries[ToDo->EntriesNum].Date);
                                 ToDo->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "DALARM", Buff)) {
                                 ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_SILENT_ALARM_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &ToDo->Entries[ToDo->EntriesNum].Date);
                                 ToDo->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "AALARM", Buff)) {
                                 ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_ALARM_DATETIME;
                                 ReadVCALDateTime(DecodeUnicodeString(Buff), &ToDo->Entries[ToDo->EntriesNum].Date);
                                 ToDo->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "SUMMARY", Buff)) {
                                 ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_TEXT;
                                 CopyUnicodeString(ToDo->Entries[ToDo->EntriesNum].Text,Buff);
                                 ToDo->EntriesNum++;
                         }
                         if (ReadVCALText(Line, "PRIORITY", Buff)) {
                                 if (ToDoVer == SonyEricsson_VToDo) {
-                                        ToDo->Priority = GSM_Priority_Low;
+                                        ToDo->Priority = GSM_Priority_Medium;
                                         if (atoi(DecodeUnicodeString(Buff))>3) ToDo->Priority = GSM_Priority_Low;
                                         if (atoi(DecodeUnicodeString(Buff))<3) ToDo->Priority = GSM_Priority_High;
                                         dbgprintf("atoi is %i %s\n",atoi(DecodeUnicodeString(Buff)),DecodeUnicodeString(Buff));
                                 } else if (ToDoVer == Nokia_VToDo) {
-                                        ToDo->Priority = GSM_Priority_Low;
+                                        ToDo->Priority = GSM_Priority_Medium;
                                         if (atoi(DecodeUnicodeString(Buff))>3) ToDo->Priority = GSM_Priority_Low;
                                         if (atoi(DecodeUnicodeString(Buff))<3) ToDo->Priority = GSM_Priority_High;
                                 }
                         }
                         if (strstr(Line,"PERCENT-COMPLETE:100")) {
                                 ToDo->Entries[ToDo->EntriesNum].EntryType = TODO_COMPLETED;
                                         ToDo->Entries[ToDo->EntriesNum].Number  = 1;
                                 ToDo->EntriesNum++;
                         }
                         break;
                 }
         }
 
         if (Calendar->EntriesNum == 0 && ToDo->EntriesNum == 0) return ERR_EMPTY;
         return ERR_NONE;
 }
 
 GSM_Error GSM_EncodeVNTFile(unsigned char *Buffer, int *Length, GSM_NoteEntry *Note)
 {
         *Length+=sprintf(Buffer+(*Length), "BEGIN:VNOTE%c%c",13,10);
         *Length+=sprintf(Buffer+(*Length), "VERSION:1.1%c%c",13,10);
         SaveVCALText(Buffer, Length, Note->Text, "BODY");
         *Length+=sprintf(Buffer+(*Length), "END:VNOTE%c%c",13,10);
 
         return ERR_NONE;
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index a3b93a8..997485a 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -4582,157 +4582,162 @@ static void Restore(int argc, char *argv[])
                                         if (Pbk.EntriesNum != 0) error=Phone->SetMemory(&s, &Pbk);
                                 }
                         }
                         if (Pbk.EntriesNum == 0) error=Phone->DeleteMemory(&s, &Pbk);
                         Print_Error(error);
                         printmsgerr("%cWriting: %i percent",13,(i+1)*100/(MemStatus.MemoryUsed+MemStatus.MemoryFree));
                         if (gshutdown) {
                                 GSM_Terminate();
                                 exit(0);
                         }
                 }
                 printmsgerr("\n");
         }
 
         DoRestore = false;
         if (Backup.CallerLogos[0] != NULL) {
                         Bitmap.Type = GSM_CallerGroupLogo;
                 Bitmap.Location = 1;
                 error=Phone->GetBitmap(&s,&Bitmap);
                 if (error == ERR_NONE) {
                         if (answer_yes("Restore caller groups and logos")) DoRestore = true;
                 }
         }
         if (DoRestore) {
                 max = 0;
                 while (Backup.CallerLogos[max]!=NULL) max++;
                 for (i=0;i<max;i++) {
                         error=Phone->SetBitmap(&s,Backup.CallerLogos[i]);
                         Print_Error(error);
                         printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
                         if (gshutdown) {
                                 GSM_Terminate();
                                 exit(0);
                         }
                 }
                 printmsgerr("\n");
         }
         
         if (!mystrncasecmp(s.CurrentConfig->SyncTime,"yes",0)) {
                 if (/*answer_yes("Do you want to set date/time in phone (NOTE: in some phones it's required to correctly restore calendar notes and other items)")*/ true ) {
                         GSM_GetCurrentDateTime(&date_time);
 
                         error=Phone->SetDateTime(&s, &date_time);
                         Print_Error(error);
                 }
         }
         DoRestore = false;
         if (Backup.Calendar[0] != NULL) {
+                                DoRestore = true;
                 /* N6110 doesn't support getting calendar status */
                 error = Phone->GetNextCalendar(&s,&Calendar,true);
                 if (error == ERR_NONE || error == ERR_INVALIDLOCATION || error == ERR_EMPTY) {
                         max = 0;
                         while (Backup.Calendar[max] != NULL) max++;
                         printmsgerr("%i entries in backup file\n",max);
                                 DoRestore = true;
                 /*
                         if (answer_yes("Restore calendar notes")) {
                                 Past    = answer_yes("Restore notes from the past");
                                 DoRestore = true;
                         }
                 */
                 }
         }
         if (DoRestore) {
                 printmsgerr("Deleting old notes: ");
                 error = Phone->DeleteAllCalendar(&s);
                 if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
                         while (1) {
                                 error = Phone->GetNextCalendar(&s,&Calendar,true);
                                 if (error != ERR_NONE) break;
                                 error = Phone->DeleteCalendar(&s,&Calendar);
                                         Print_Error(error);                     
                                 printmsgerr("*");
                         }
                         printmsgerr("\n");
                 } else {
                         printmsgerr("Done\n");
                         Print_Error(error);
                 }
 
                 for (i=0;i<max;i++) {
                         if (!Past && IsCalendarNoteFromThePast(Backup.Calendar[i])) continue;
 
                         Calendar = *Backup.Calendar[i];
                         error=Phone->AddCalendar(&s,&Calendar);
                         Print_Error(error);
                         printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
                         if (gshutdown) {
                                 GSM_Terminate();
                                 exit(0);
                         }
                 }
                 printmsgerr("\n");
         }
 
         DoRestore = false;
         if (Backup.ToDo[0] != NULL) {
                 error = Phone->GetToDoStatus(&s,&ToDoStatus);
                 if (error == ERR_NONE) {
+            error == ERR_NOTSUPPORTED;
+            DoRestore = true;
                         max = 0;
                         while (Backup.ToDo[max]!=NULL) max++;
                         printmsgerr("%i entries in backup file\n",max);
 
                         /*if (answer_yes("Restore ToDo")) */DoRestore = true;
                 }
         }
         if (DoRestore) {
+        if ( max > 0 ) {
                 ToDo  = *Backup.ToDo[0];
                 error = Phone->SetToDo(&s,&ToDo);
+        }
         }
         if (DoRestore && (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED)) {
                 printmsgerr("Deleting old ToDo: ");
                 error=Phone->DeleteAllToDo(&s);
                 if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
                         while (1) {
                                 error = Phone->GetNextToDo(&s,&ToDo,true);
                                 if (error != ERR_NONE) break;
                                 error = Phone->DeleteToDo(&s,&ToDo);
                                         Print_Error(error);                     
                                 printmsgerr("*");
                         }
                         printmsgerr("\n");
                 } else {
                         printmsgerr("Done\n");
                         Print_Error(error);
                 }
 
                 for (i=0;i<max;i++) {
                                 ToDo    = *Backup.ToDo[i];
                                 ToDo.Location = 0;
                         error=Phone->AddToDo(&s,&ToDo);
                         Print_Error(error);
                         printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
                         if (gshutdown) {
                                 GSM_Terminate();
                                 exit(0);
                         }
                 }
                 printmsgerr("\n");
         } else if (DoRestore) {
                 /* At first delete entries, that were deleted */
                 used  = 0;
                 error = Phone->GetNextToDo(&s,&ToDo,true);
                 while (error == ERR_NONE) {
                         used++;
                         Found = false;
                         for (i=0;i<max;i++) {
                                 if (Backup.ToDo[i]->Location == ToDo.Location) {
                                         Found = true;
                                         break;
                                 }
                         }
                         if (!Found) {
                                 error=Phone->DeleteToDo(&s,&ToDo);
                                 Print_Error(error);
                         }
                         error = Phone->GetNextToDo(&s,&ToDo,false);
@@ -8329,97 +8334,96 @@ int main(int argc, char *argv[])
                     s.Config[i].UseGlobalDebugFile = true;
                 
                 /* It makes no sense to open several debug logs... */
                 if (i != 0) {
                         strcpy(s.Config[i].DebugLevel, s.Config[0].DebugLevel);
                         free(s.Config[i].DebugFile);
                         s.Config[i].DebugFile = strdup(s.Config[0].DebugFile);
                 } else {
                         /* Just for first config */
                         /* When user gave debug level on command line */
                         if (argc > 1 + start && GSM_SetDebugLevel(argv[1 + start], &di)) {
                                 /* Debug level from command line will be used with phone too */
                                 strcpy(s.Config[i].DebugLevel,argv[1 + start]);
                                 start++;
                         } else {
                                 /* Try to set debug level from config file */
                                 GSM_SetDebugLevel(s.Config[i].DebugLevel, &di);
                         }
                         /* If user gave debug file in gammurc, we will use it */
                         error=GSM_SetDebugFile(s.Config[i].DebugFile, &di);
                         Print_Error(error);
                 }
 
                 /* We wanted to read just user specified configuration. */
                 if (only_config != -1) {break;}
          }
 #if 0
  GSM_Config *con = &s.Config[0];
 
     char* tempC;
     tempC = argv[argc-1]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using model %s \n",tempC);
                 strcpy(con->Model,tempC );
      }
     tempC = argv[argc-2]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using device %s \n",tempC);
         con->Device = strdup(tempC);
                 con->DefaultDevice = false;
      }
     tempC = argv[argc-3]+2;
     if ( *tempC != 0 ) {
         fprintf(stderr,"Using connection %s \n",tempC);
         con->Connection = strdup(tempC);
                 con->DefaultConnection = false;
      }
 #endif
-    argc = argc-3;
 
 
         /* Do we have enough parameters? */
          if (argc == 1 + start) {
                 HelpGeneral();
                 printmsg("Too few parameters!\n");
                 exit(-2);
         }
 
         /* Check used version vs. compiled */
         if (!mystrncasecmp(GetGammuVersion(),VERSION,0)) {
                 printmsg("ERROR: version of installed libGammu.so (%s) is different to version of Gammu (%s)\n",
                                         GetGammuVersion(),VERSION);
                 exit(-1);
         }
 
         /* Check parameters */
         while (Parameters[z].Function != NULL) {
                 if (mystrncasecmp(Parameters[z].parameter,argv[1+start], 0)) {
                         if (argc-2-start >= Parameters[z].min_arg && argc-2-start <= Parameters[z].max_arg) {
                 fprintf(stderr,"Executing  \n");        
                                 Parameters[z].Function(argc - start, argv + start);
                                 break;
                         } else {
                                 count_failed = true;
                         }
                 }
                 z++;
         }
 
         /* Tell user when we did nothing */
         if (Parameters[z].Function == NULL) {
                 HelpGeneral();
                 if (count_failed) {
                         printmsg("Bad parameter count!\n");
                 } else {
                         printmsg("Bad option!\n");
                 }
          }
 
              /* Close debug output if opened */
              if (di.df!=stdout) fclose(di.df);
         //#endif // 0
         fprintf(stderr,"kammu: Success. End.  \n");        
         exit(0);
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.