equal
deleted
inserted
replaced
354 if (iDLProgressDlg->iNoteType == EConnectingNote) |
354 if (iDLProgressDlg->iNoteType == EConnectingNote) |
355 { |
355 { |
356 iDLState.iState = RFotaEngineSession::EDownloadProgressingWithResume; |
356 iDLState.iState = RFotaEngineSession::EDownloadProgressingWithResume; |
357 |
357 |
358 TInt active (KErrNotFound); |
358 TInt active (KErrNotFound); |
359 RProperty::Get( TUid::Uid(KOmaDMAppUid), KFotaDownloadActive, active ); |
359 RProperty::Get( TUid::Uid(KFotaServerUid), KFotaDownloadActive, active ); |
360 FLOG(_L("active = %d"),active); |
360 FLOG(_L("active = %d"),active); |
361 |
361 |
362 if (active) //Resume operation has just begun and download request is submitted to dlmgr. Hence need to suspend. |
362 if (active) //Resume operation has just begun and download request is submitted to dlmgr. Hence need to suspend. |
363 { |
363 { |
364 RunDownloadSuspendL(RFotaEngineSession::EResUserCancelled, ETrue); |
364 RunDownloadSuspendL(RFotaEngineSession::EResUserCancelled, ETrue); |
949 iDLState.iResult = RFotaEngineSession::EResUndefinedError; |
949 iDLState.iResult = RFotaEngineSession::EResUndefinedError; |
950 } |
950 } |
951 else if ( adlErrorId == EObjectNotFound) |
951 else if ( adlErrorId == EObjectNotFound) |
952 { |
952 { |
953 FLOG(_L("Reason: error EObjectNotFound")); |
953 FLOG(_L("Reason: error EObjectNotFound")); |
954 iDLState.iResult = RFotaEngineSession::EResUndefinedError; |
954 iDLState.iResult = RFotaEngineSession::EResAlternateDLServerUnavailable; |
955 } |
955 } |
956 else if ( adlErrorId == EPartialContentModified) |
956 else if ( adlErrorId == EPartialContentModified) |
957 { |
957 { |
958 FLOG(_L("Reason: error EPartialContentModified")); |
958 FLOG(_L("Reason: error EPartialContentModified")); |
959 iDLState.iResult = RFotaEngineSession::EResUndefinedError; |
959 iDLState.iResult = RFotaEngineSession::EResUndefinedError; |
1462 * 2. If IAP is always ask in DM profile, query user for IAP during user trigger |
1462 * 2. If IAP is always ask in DM profile, query user for IAP during user trigger |
1463 * 3. If IAP has changed in DM profile after suspend, use the newer one during resume |
1463 * 3. If IAP has changed in DM profile after suspend, use the newer one during resume |
1464 * 4. |
1464 * 4. |
1465 */ |
1465 */ |
1466 TInt active (KErrNotFound); |
1466 TInt active (KErrNotFound); |
1467 RProperty::Get( TUid::Uid(KOmaDMAppUid), KFotaDownloadActive, active ); |
1467 RProperty::Get(TUid::Uid(KFotaServerUid), KFotaDownloadActive, active ); |
1468 FLOG(_L("active = %d"),active); |
1468 FLOG(_L("active = %d"),active); |
1469 if (active==EFalse && iDLState.iState == RFotaEngineSession::EDownloadProgressingWithResume) |
1469 if (active==EFalse && iDLState.iState == RFotaEngineSession::EDownloadProgressingWithResume) |
1470 { |
1470 { |
1471 //Actual resume only |
1471 //Actual resume only |
1472 if (!iUserInitiatedResume && (profIapid == KErrNotFound || profIapid == KErrGeneral ) ) |
1472 if (!iUserInitiatedResume && (profIapid == KErrNotFound || profIapid == KErrGeneral ) ) |
1717 void CFotaDownload::SetDownloadActive(TBool aValue) |
1717 void CFotaDownload::SetDownloadActive(TBool aValue) |
1718 { |
1718 { |
1719 FLOG(_L("CFotaDownload::SetDownloadActive, aValue = %d"),aValue); |
1719 FLOG(_L("CFotaDownload::SetDownloadActive, aValue = %d"),aValue); |
1720 iDownloadActive = aValue; |
1720 iDownloadActive = aValue; |
1721 TBool val (EFalse); |
1721 TBool val (EFalse); |
1722 TInt err = RProperty::Get(TUid::Uid(KOmaDMAppUid), KFotaDownloadActive, val ); |
1722 TInt err = RProperty::Get(TUid::Uid(KFotaServerUid), KFotaDownloadActive, val ); |
1723 |
1723 |
1724 if (err == KErrNone && val != aValue) |
1724 if (err == KErrNone && val != aValue) |
1725 { |
1725 { |
1726 err = RProperty::Set(TUid::Uid(KOmaDMAppUid), KFotaDownloadActive, aValue ); |
1726 err = RProperty::Set(TUid::Uid(KFotaServerUid), KFotaDownloadActive, aValue ); |
1727 FLOG(_L("RProperty KFotaDownloadActive Set %d, err = %d"), aValue, err); |
1727 FLOG(_L("RProperty KFotaDownloadActive Set %d, err = %d"), aValue, err); |
1728 } |
1728 } |
1729 |
1729 |
1730 FLOG(_L("CFotaDownload::SetDownloadActive <<")); |
1730 FLOG(_L("CFotaDownload::SetDownloadActive <<")); |
1731 } |
1731 } |