MCL/sf/app/podcatcher: comparison application/src/PodcastFeedView.cpp

equal deleted inserted replaced

-:43e204e6ae2e
+:e7b10d6d7ba3
 void CPodcastFeedView::DoActivateL(const TVwsViewId& aPrevViewId,
 	                                  TUid aCustomMessageId,
 	                                  const TDesC8& aCustomMessage)
 	{
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
-	if (iFirstActivateAfterLaunch)
-		{
-		iFirstActivateAfterLaunch = EFalse;
-		}
 	if (aPrevViewId.iViewUid == KUidPodcastShowsViewID)
 		{
 		// back key from shows view
 		iViewingShows = EFalse;
 		}
-	UpdateListboxItemsL();
+		UpdateListboxItemsL();
-	UpdateToolbar();
+		UpdateToolbar();
+	if (iFirstActivateAfterLaunch)
+		{
+		iFirstActivateAfterLaunch = EFalse;
+		}
 	}
 void CPodcastFeedView::DoDeactivate()
 	{
 	iUpdater->StopUpdate();
 			{
 			if(aState == MFeedEngineObserver::EFeedManualUpdate)
 				{
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
-				ShowErrorMessage(message);
+				ShowErrorMessageL(message);
 				}
 			}
 			break;
 		default: // Do nothing
 			break;
 			if (queueCount > 0 && !iPodcastModel.SettingsEngine().DownloadSuspended())
 				{
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_EXIT_SHOWS_DOWNLOADING);
-				if(ShowQueryMessage(message))
+				if(ShowQueryMessageL(message))
 					{
 					// pass it on to AppUi, which will exit for us
 					CPodcastListView::HandleCommandL(aCommand);
 					}
 				}
 		default:
 			CPodcastListView::HandleCommandL(aCommand);
 			break;
 		}
-	iListContainer->SetLongTapDetected(EFalse); // in case we got here by long tapping
+	iListContainer->SetLongTapDetectedL(EFalse); // in case we got here by long tapping
 	UpdateToolbar();
 	}
 void CPodcastFeedView::UpdateToolbar(TBool aVisible)
 {
 				UpdateListboxItemsL();
 				// ask if users wants to update it now
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_ADD_FEED_SUCCESS);
-				if(ShowQueryMessage(message))
+				if(ShowQueryMessageL(message))
 					{
 					CFeedInfo *info = iPodcastModel.FeedEngine().GetFeedInfoByUid(newFeedInfo->Uid());
 					iPodcastModel.ActiveShowList().Reset();
 					iPodcastModel.SetActiveFeedInfo(info);
 				}
 			else
 				{
 				TBuf<KMaxMessageLength> message;
 				iEikonEnv->ReadResourceL(message, R_ADD_FEED_EXISTS);
-				ShowErrorMessage(message);
+				ShowErrorMessageL(message);
 				}
 			CleanupStack::PopAndDestroy(newFeedInfo);
 			}
 		}
 				{
 				TBuf<KMaxMessageLength> dlgMessage;
 				iEikonEnv->ReadResourceL(dlgMessage, R_ADD_FEED_REPLACE);
 				// Ask the user if it is OK to remove all shows
-				if ( ShowQueryMessage(dlgMessage))
+				if ( ShowQueryMessageL(dlgMessage))
 					{
 					PodcastUtils::FixProtocolsL(url);
 					//----- HACK ---- //
 					CFeedInfo* temp = CFeedInfo::NewLC();
 						UpdateListboxItemsL();
 					} else {
 						// the feed existed. Object deleted in AddFeed.
 						TBuf<KMaxMessageLength> dlgMessage;
 						iEikonEnv->ReadResourceL(dlgMessage, R_ADD_FEED_EXISTS);
-						ShowErrorMessage(dlgMessage);
+						ShowErrorMessageL(dlgMessage);
 					}
 					CleanupStack::PopAndDestroy(temp);
 				}
 			} else { // no url change, maybe title?
 				// Update the title
 				if (info->Title().Compare(title) != 0)
 				{
 					info->SetTitleL(title);
 					info->SetCustomTitle();
-					iPodcastModel.FeedEngine().UpdateFeed(info);
+					iPodcastModel.FeedEngine().UpdateFeedL(info);
 					UpdateListboxItemsL();
 				}
 			}
 		}
 		}
 			CFeedInfo *info = iPodcastModel.FeedEngine().GetFeedInfoByUid(iItemIdArray[index]);
 			TBuf<KMaxMessageLength> templ;
 			TBuf<KMaxMessageLength> message;
 			iEikonEnv->ReadResourceL(templ, R_PODCAST_REMOVE_FEED_PROMPT);
 			message.Format(templ, &info->Title());
-			if(ShowQueryMessage(message))
+			if(ShowQueryMessageL(message))
 				{
 				iPodcastModel.FeedEngine().RemoveFeedL(iItemIdArray[index]);
 				iItemArray->Delete(index);
 				iItemIdArray.Remove(index);
 				iListContainer->Listbox()->HandleItemRemovalL();
 				TRAPD(err, iPodcastModel.FeedEngine().ImportFeedsL(importName));
 				if (err != KErrNone) {
 					TBuf<KMaxMessageLength> message;
 					iEikonEnv->ReadResourceL(message, R_IMPORT_FEED_FAILURE);
-					ShowErrorMessage(message);
+					ShowErrorMessageL(message);
 					}
 				}
 			}
 		CleanupStack::PopAndDestroy(dlg);
 					TBuf<KMaxMessageLength> message;
 					TBuf<KMaxMessageLength> templ;
 					iEikonEnv->ReadResourceL(templ, R_EXPORT_FEED_SUCCESS);
 					message.Format(templ, numFeeds);
-					ShowOkMessage(message);
+					ShowOkMessageL(message);
 					}
 				else
 					{
 					TBuf<KMaxMessageLength> message;
 					iEikonEnv->ReadResourceL(message, R_EXPORT_FEED_FAILURE);
-					ShowErrorMessage(message);
+					ShowErrorMessageL(message);
 					}
 				}
 			CleanupStack::PopAndDestroy(fileDlg);
 			}
 		CleanupStack::PopAndDestroy(dlg);
 	}
 	CleanupStack::PopAndDestroy(memDlg);
 	}
-void CPodcastFeedView::CheckResumeDownload()
+void CPodcastFeedView::CheckResumeDownloadL()
 	{
 	// if there are shows queued for downloading, ask if we should resume now
 	RShowInfoArray showsDownloading;
 	iPodcastModel.ShowEngine().GetShowsDownloadingL(showsDownloading);
 	if (showsDownloading.Count() > 0)
 		{
 		TBuf<KMaxMessageLength> msg;
 		iEikonEnv->ReadResourceL(msg, R_PODCAST_ENABLE_DOWNLOADS_PROMPT);
-		if (ShowQueryMessage(msg))
+		if (ShowQueryMessageL(msg))
 			{
 			// need to suspend downloads before ResumeDownloadL will work :)
 			iPodcastModel.SettingsEngine().SetDownloadSuspended(ETrue);
 			// resume downloading if user says yes
 			iPodcastModel.ShowEngine().ResumeDownloadsL();
 		{
 		case KErrCouldNotConnect:
 			{
 			TBuf<KMaxMessageLength> message;
 			iEikonEnv->ReadResourceL(message, R_PODCAST_CONNECTION_ERROR);
-			ShowErrorMessage(message);
+			ShowErrorMessageL(message);
 			}
 			break;
 		case KErrNone:
 		default:			// we don't do more error handling here, just show 0 imported feeds
 		switch (iOpmlState)
 				TBuf<KMaxMessageLength> message;
 				TBuf<KMaxMessageLength> templ;
 				iEikonEnv->ReadResourceL(templ, R_IMPORT_FEED_SUCCESS);
 				message.Format(templ, aNumFeedsImported);
-				if(ShowQueryMessage(message))
+				if(ShowQueryMessageL(message))
 					{
 					HandleCommandL(EPodcastUpdateAllFeeds);
 					}
 				}
 				break;
 			case EOpmlSearching:
 				delete iWaitDialog;
+				iWaitDialog = NULL;
 				if (iPodcastModel.FeedEngine().GetSearchResults().Count() == 0)
 					{
 					TBuf<KMaxMessageLength> message;
 					iEikonEnv->ReadResourceL(message, R_SEARCH_NORESULTS);
-					ShowErrorMessage(message);
+					ShowErrorMessageL(message);
 					}
 				else
 					{
 					AppUi()->ActivateLocalViewL(KUidPodcastSearchViewID,  TUid::Uid(0), KNullDesC8());
 					}
 	if (iUpdatingAllRunning) {
 		return; // we don't allow feed manipulation while update is running
 	}
-	iListContainer->SetLongTapDetected(ETrue);
+	iListContainer->SetLongTapDetectedL(ETrue);
 	const TInt KListboxDefaultHeight = 19; // for some reason it returns 19 for an empty listbox in S^1
 	TInt lbHeight = iListContainer->Listbox()->CalcHeightBasedOnNumOfItems(
 			iListContainer->Listbox()->Model()->NumberOfItems()) - KListboxDefaultHeight;

changeset 50	e7b10d6d7ba3
parent 49	43e204e6ae2e
parent 45	56d4e0784e5d
child 51	15f885e4eb92