FCL/sf/mw/securitysrv: comparison cpsecplugins/cpadvancedsecplugin/src/cpcertview.cpp

equal deleted inserted replaced

-:aad866c37519
+:cc1cea6aabaf
 #include <hblistview.h>
 #include <QStandardItemModel>
 #include <QModelIndexList>
 #include <hbmessagebox.h>
 #include <memory>
+#include <../../inc/cpsecplugins.h>
 #include "cpcertdetailview.h"
 #include "cpcertview.h"
 #include "cpcertdatacontainer.h"
 #include "cpcerttrustview.h"
 #include "cpcertmanuisyncwrapper.h"
 	  mListView(NULL),
 	  mSelectAllView(NULL),
 	  mOriginalView(NULL),
 	  mNote(NULL)
 	{
+	RDEBUG("0", 0);
 	mOriginalView = mainWindow()->currentView();
 	HbMenu* menu = this->menu();
 	std::auto_ptr<HbAction> deleteAction(new HbAction(hbTrId("txt_common_menu_delete")));
 	connect(deleteAction.get(), SIGNAL(triggered()), this, SLOT(deleteList()));
 		}
 	else if(currentView == EDeviceView)
 		{
 		title = "Move to Personal";
 		}
-	std::auto_ptr<HbAction> moveToDeviceAction(q_check_ptr(new HbAction(title)));
+	RDEBUG("0", 0);
-	connect(moveToDeviceAction.get(), SIGNAL(triggered()), this, SLOT(moveCert()));
+	if(currentView == EPersonalView || currentView == EDeviceView)
-	menu->addAction(moveToDeviceAction.get());
+		{
-	moveToDeviceAction.release();
+		std::auto_ptr<HbAction> moveToDeviceAction(q_check_ptr(new HbAction(title)));
+		connect(moveToDeviceAction.get(), SIGNAL(triggered()), this, SLOT(moveCert()));
+		menu->addAction(moveToDeviceAction.get());
+		moveToDeviceAction.release();
+		}
 	setDetails(currentView);
 	TInt count = 0;
 	try
 		{
 		QT_TRAP_THROWING(mCertDataContainer = CpCertDataContainer::NewL());
 	catch(const std::exception& exception)
 		{
 		HbMessageBox::information(exception.what());
 		throw(exception);
 		}
+	RDEBUG("0", 0);
 	for(int index = 0; index< count; index++)
 		{
 		QString certificateLabel = certLabel(index);
 		std::auto_ptr<HbListWidgetItem> singleCert(q_check_ptr(new HbListWidgetItem()));
 		singleCert->setText(certificateLabel);
 	connect(certificateList, SIGNAL(longPressed(HbAbstractViewItem*, QPointF )), this, SLOT(indicateLongPress(HbAbstractViewItem*, QPointF)));
 	layout->addItem(certificateList);
 	setLayout(layout.get());
 	layout.release();
+	mPopup = q_check_ptr(new HbDialog());
+	mContextMenu = q_check_ptr(new HbMenu());
+	RDEBUG("0", 0);
 	}
 CpCertView::~CpCertView()
 	{
 	delete mCertDataContainer;
 	mCertDataContainer = NULL;
+	RDEBUG("0", 0);
 	if(mPrevView)
 		{
 		mPrevView->deleteLater();
 		mPrevView= NULL;
 		}
 	delete mPopup;
 	delete mNote;
 	mNote = NULL;
+	delete mContextMenu;
 	}
 void CpCertView::setDetails(CpCertView::TCertificateViews currentView)
 	{
+	RDEBUG("0", 0);
 	switch(currentView)
 		{
 		case EAuthorityView:
 		setTitle(hbTrId("txt_certificate_manager_list_authority_certificate"));
 		mCertView = EAuthorityView;
 		}
 	}
 void CpCertView::indicateLongPress(HbAbstractViewItem *item,QPointF coords)
 	{
-	std::auto_ptr<HbMenu> contextMenu(q_check_ptr(new HbMenu()));
+	RDEBUG("0", 0);
 	mPos = item->modelIndex().row();   // Pos will tell you what is the certificate clicked in particular view.
-	std::auto_ptr<HbAction> open(q_check_ptr(new HbAction(hbTrId("txt_common_menu_open"))));
+	mContextMenu->clearActions();
-	connect(open.get(), SIGNAL(triggered()), this, SLOT( openCertificate()));
+	std::auto_ptr<HbAction> open(q_check_ptr(new HbAction(hbTrId("txt_common_menu_open"))));
-	contextMenu->addAction(open.get());
+	connect(open.get(), SIGNAL(triggered()), this, SLOT( openCertificate()));
+	mContextMenu->addAction(open.get());
 	open.release();
 	QString moveTitle;
 	if(mCertView == EAuthorityView)
 		{
 		std::auto_ptr<HbAction> trustSettings(q_check_ptr(new HbAction(hbTrId("txt_certificate_manager_menu_trust_settings"))));
 		connect(trustSettings.get(), SIGNAL(triggered()), this, SLOT(showTrustSettings()));
-		contextMenu->addAction(trustSettings.get());
+		mContextMenu->addAction(trustSettings.get());
 		trustSettings.release();
 		}
 	else if(mCertView == EPersonalView)
 		{
 		moveTitle = hbTrId("txt_certificate_manager_menu_move_to_device_certif");
 		}
 	else if(mCertView == EDeviceView)
 		{
 		moveTitle = hbTrId("txt_certificate_manager_menu_move_to_personal_cert");
 		}
-	std::auto_ptr<HbAction> moveCert(q_check_ptr(new HbAction(moveTitle)));
-	connect(moveCert.get(), SIGNAL(triggered()), this, SLOT(moveSelectedCert()));
+	if(mCertView == EPersonalView || mCertView == EDeviceView )
-	contextMenu->addAction(moveCert.get());
+		{
-	moveCert.release();
+		std::auto_ptr<HbAction> moveCert(q_check_ptr(new HbAction(moveTitle)));
+		connect(moveCert.get(), SIGNAL(triggered()), this, SLOT(moveSelectedCert()));
+		mContextMenu->addAction(moveCert.get());
+		moveCert.release();
+		}
+	RDEBUG("0", 0);
 	if( certAt(mPos)->IsDeletable() )
 		{
 		std::auto_ptr<HbAction> menuDelete(q_check_ptr(new HbAction(hbTrId("txt_common_menu_delete"))));
 		connect(menuDelete.get(), SIGNAL(triggered()), this, SLOT(deleteCertificate()));
-		contextMenu->addAction(menuDelete.get());
+		mContextMenu->addAction(menuDelete.get());
 		menuDelete.release();
 		}
-	contextMenu->open();
+	mContextMenu->setPreferredPos(coords);
-	contextMenu->setPreferredPos(coords);
+	mContextMenu->open();
 	}
 void CpCertView::openCertFromList(const QModelIndex& modelIndex)
 	{
+	RDEBUG("0", 0);
 	// Pos will tell you what is the certificate clicked in particular view.
 	mPos = modelIndex.row();
 	openCertificate();
 	}
 void CpCertView::openCertificate()
 	{
+	RDEBUG("0", 0);
 	mCurrentView = q_check_ptr(new CpCertDetailView(mCertView,mPos,*mCertDataContainer));
 	connect(mCurrentView, SIGNAL(aboutToClose()), this, SLOT(displayPreviousView()));
 	mPrevView = mainWindow()->currentView();
 	mainWindow()->addView(mCurrentView);
 	mainWindow()->setCurrentView(mCurrentView);
 	}
 void CpCertView::displayPreviousView()
 	{
+	RDEBUG("0", 0);
 	mainWindow()->removeView(mCurrentView);
 	mCurrentView->deleteLater();
 	mCurrentView= NULL;
 	mainWindow()->setCurrentView(mPrevView);
 	}
 void CpCertView::deleteCertificate()
 	{
+	RDEBUG("0", 0);
 	RArray<TInt> pos;
 	pos.Append(mPos);
-	QT_TRAP_THROWING(deleteCerts(pos));
+	QT_TRAP_THROWING(deleteCertsL(pos));
 	}
 void CpCertView::deleteList()
 	{
+	RDEBUG("0", 0);
 	mSelectAll = EFalse;
-	mPopup = new HbDialog();
 	mPopup->setDismissPolicy(HbDialog::NoDismiss);
 	// Set the label as heading widget
 	mPopup->setHeadingWidget(q_check_ptr(new HbLabel(hbTrId("txt_certificate_manager_setlabel_certificates"))));
 	std::auto_ptr<QGraphicsLinearLayout> layout(q_check_ptr(new QGraphicsLinearLayout(Qt::Vertical)));
 	// Create a model
 	QStandardItemModel* model = q_check_ptr(new QStandardItemModel(this));
 	TInt count=0;
 	QT_TRAP_THROWING( count = refreshListL());
+	RDEBUG("0", 0);
 	for(TInt index = 0; index < count ; ++index)
 		{
 		const CCTCertInfo* cert = certAt(index);
 		if( cert->IsDeletable() )
 			{
 	widget.release();
 	mPopup->setPrimaryAction(q_check_ptr(new HbAction(hbTrId("txt_common_opt_delete"))));
 	mPopup->setSecondaryAction(q_check_ptr(new HbAction(hbTrId("txt_common_button_cancel"))));
 	mPopup->setTimeout(HbPopup::NoTimeout);
+	RDEBUG("0", 0);
 	// Launch popup syncronously
 	mPopup->open(this, SLOT(handleMultipleDelete(HbAction*)));
 }
 void CpCertView::handleMultipleDelete(HbAction* action)
 {
+	RDEBUG("0", 0);
 	if(action == mPopup->primaryAction())
 		{
 		QItemSelectionModel *selectionModel = mListView->selectionModel();
 		QModelIndexList mWidgetItemsToRemove = selectionModel->selectedIndexes();
 		TInt deleteCount = mWidgetItemsToRemove.count();
 		// start deleting from end of array so that the indexes do not changes of the ones
 		// at the front.
 		RArray<TInt> actualIndex;
-		QT_TRAP_THROWING(CleanupClosePushL(actualIndex));
+		QT_TRAP_THROWING
-		for (TInt index = deleteCount-1; index>= 0 ; --index)
+			(
-			{
+			CleanupClosePushL(actualIndex);
-			TInt selectedItemIndex = mWidgetItemsToRemove[index].row();
+			for (TInt index = deleteCount-1; index>= 0 ; --index)
-			actualIndex.Append( mSelectionIndex[selectedItemIndex] );
+				{
-			}
+				TInt selectedItemIndex = mWidgetItemsToRemove[index].row();
-		deleteCerts(actualIndex);
+				actualIndex.Append( mSelectionIndex[selectedItemIndex] );
-		 CleanupStack::PopAndDestroy(&actualIndex);
+				}
-		}
+			deleteCertsL(actualIndex);
+			CleanupStack::PopAndDestroy(&actualIndex);
+			) // QT_TRAP_THROWING
+		}
+	RDEBUG("0", 0);
 	mListView->deleteLater();
 	mListView = NULL;
 	mSelectAllView->deleteLater();
 	mSelectAllView = NULL;
-	delete mPopup;
-	mPopup = NULL;
 	}
 void CpCertView::moveCert()
 	{
+	RDEBUG("0", 0);
 	mSelectAll = EFalse;
-	mPopup = new HbDialog();
 	mPopup->setDismissPolicy(HbDialog::NoDismiss);
 	// Set the label as heading widget
 	if(mCertView == EPersonalView)
 		{
 		mPopup->setHeadingWidget(q_check_ptr(new HbLabel(tr("Move To Device"))));
 	connect(mListView, SIGNAL(activated(QModelIndex)), this, SLOT(itemActivated(QModelIndex)));
 	// Create a model
 	QStandardItemModel* model = q_check_ptr(new QStandardItemModel(this));
 	TInt count =0;
+	RDEBUG("0", 0);
 	QT_TRAP_THROWING(count = refreshListL());
 	for(TInt index = 0; index < count ; ++index)
 		{
 		// Populate the model with content
 		std::auto_ptr<QStandardItem> certItem(q_check_ptr(new QStandardItem()));
 	std::auto_ptr<HbWidget> widget(q_check_ptr(new HbWidget()));
 	widget->setLayout(layout.get());
 	layout.release();
 	mPopup->setContentWidget(widget.get());
 	widget.release();
+	RDEBUG("0", 0);
 	mPopup->setPrimaryAction(q_check_ptr(new HbAction(tr("Yes"))));
 	mPopup->setSecondaryAction(q_check_ptr(new HbAction(tr("No"))));
 	mPopup->setTimeout(HbPopup::NoTimeout);
 	// Launch popup syncronously
 	 mPopup->open(this, SLOT(handleMoveCertDialog(HbAction*)));
+	 RDEBUG("0", 0);
 }
 void CpCertView::handleMoveCertDialog(HbAction* action)
 {
+	RDEBUG("0", 0);
 	if(action == mPopup->primaryAction())
 		{
 		QItemSelectionModel *selectionModel = mListView->selectionModel();
 		QModelIndexList mWidgetItemsToRemove = selectionModel->selectedIndexes();
 		TInt deleteCount = mWidgetItemsToRemove.count();
 		// start deleting from end of array so that the indexes do not changes of the ones
 		// at the front.
 		RArray<TInt> actualIndex;
-		QT_TRAP_THROWING(CleanupClosePushL(actualIndex));
+		RDEBUG("0", 0);
-		 for (TInt index = deleteCount-1; index>= 0 ; --index)
+		QT_TRAP_THROWING
-			 {
+			(
-			 TInt selectedItemIndex = mWidgetItemsToRemove[index].row();
+			CleanupClosePushL(actualIndex);
-			 actualIndex.Append(mSelectionIndex[selectedItemIndex]);
+			 for (TInt index = deleteCount-1; index>= 0 ; --index)
-			 }
+				 {
-		 moveCertList(actualIndex);
+				 TInt selectedItemIndex = mWidgetItemsToRemove[index].row();
-		 CleanupStack::PopAndDestroy(&actualIndex);
+				 actualIndex.Append(mSelectionIndex[selectedItemIndex]);
+				 }
+			 moveCertList(actualIndex);
+			 CleanupStack::PopAndDestroy(&actualIndex);
+			 )
 		}
 	mListView->deleteLater();
 	mListView = NULL;
 	mSelectAllView->deleteLater();
 	mSelectAllView = NULL;
-	delete mPopup;
+	RDEBUG("0", 0);
-	mPopup = NULL;
 	}
 void CpCertView::selectAll()
 	{
+	RDEBUG("0", 0);
 	if(mSelectAll == EFalse)
 		{
 		mListView->selectAll();
 		mSelectAll= ETrue;
 		}
 		mListView->clearSelection();
 		mSelectAll= EFalse;
 		}
 	}
-void CpCertView::deleteCerts( RArray<TInt>& indexList )
+void CpCertView::deleteCertsL( RArray<TInt>& indexList )
 {
-	mIndexList = indexList;
+RDEBUG("0", 0);
-	TInt count = indexList.Count();
+TInt count = indexList.Count();
+for(int index = 0;index <count;++index )
-	mNote = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+	{
+		mIndexList.Append(indexList[index]);
+	}
+	mNote = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 	QString deleteMsg;
 	QString sCount;
 	if(count == 1)
 		{
 		deleteMsg = "Delete %1?";
 	else
 		{
 		deleteMsg = "Delete %1 items?";
 		sCount.setNum(count);
 		}
+	RDEBUG("0", 0);
 	deleteMsg = deleteMsg.arg(sCount);
 	mNote->setText(deleteMsg);
-	mNote->setPrimaryAction(q_check_ptr(new HbAction("Yes")));
-	mNote->setSecondaryAction(q_check_ptr(new HbAction("No")));
 	mNote->setTimeout(HbPopup::NoTimeout);
 	mNote->open(this,SLOT(handleDeleteDialog(HbAction*)));
 }
 void CpCertView::handleDeleteDialog(HbAction* action)
 {
+	RDEBUG("0", 0);
 	TInt count = mIndexList.Count();
 	if (action != mNote->primaryAction() || count == 0 )
 		{
 		return;
 		}
 RPointerArray<CCTCertInfo> errCerts;
-QT_TRAP_THROWING(CleanupClosePushL(errCerts));
+QT_TRAP_THROWING(
+		CleanupClosePushL(errCerts);
-for(TInt index = 0; index < count; ++index)
+		for(TInt index = 0; index < count; ++index)
-	{
+			{
-		const CCTCertInfo* entry = certAt(mIndexList[index]);
+			const CCTCertInfo* entry = certAt(mIndexList[index]);
+			if( mCertView == EPersonalView || mCertView == EAuthorityView )
+				{
+				mCertDataContainer->iWrapper->DeleteCertL(
+							mCertDataContainer->CertManager(), *entry );
+				}
+			else if( mCertView == ETrustedView )
+				{
+				mCertDataContainer->iWrapper->DeleteCertL(
+							mCertDataContainer->CertManager(),*entry, KCMTrustedServerTokenUid );
+				}
+			else if( mCertView == EDeviceView )
+				{
+				mCertDataContainer->iWrapper->DeleteCertL(
+							mCertDataContainer->CertManager(), *entry, KCMDeviceCertStoreTokenUid );
+				}
+			errCerts.AppendL(entry);
+			}
+		RDEBUG("0", 0);
+		if(errCerts.Count() > 0)
+			{
+			QString message("Unable to delete the following certificate: \n");
+			TInt count = errCerts.Count();
+			for(TInt index=0;index<count;++index)
+				{
+				const TDesC& certLabel = errCerts[index]->Label();
+				QString certName = QString((QChar*)certLabel.Ptr(),certLabel.Length());
+				message.append(certName).append("\n");
+				}
+			HbMessageBox::warning(message);
+			}
+		count = refreshListL();
+		refreshView(count);
-		if( mCertView == EPersonalView || mCertView == EAuthorityView )
+		CleanupStack::PopAndDestroy(&errCerts);
-			{
+		) // QT_TRAP_THROWING
-			QT_TRAP_THROWING( mCertDataContainer->iWrapper->DeleteCertL(
-						mCertDataContainer->CertManager(), *entry ));
-			}
-		else if( mCertView == ETrustedView )
-			{
-			QT_TRAP_THROWING( mCertDataContainer->iWrapper->DeleteCertL(
-						mCertDataContainer->CertManager(),*entry, KCMTrustedServerTokenUid ));
-			}
-		else if( mCertView == EDeviceView )
-			{
-			QT_TRAP_THROWING( mCertDataContainer->iWrapper->DeleteCertL(
-						mCertDataContainer->CertManager(), *entry, KCMDeviceCertStoreTokenUid ));
-			}
-		QT_TRAP_THROWING( errCerts.AppendL(entry));
-	}
-if(errCerts.Count() > 0)
-	{
-		QString message("Unable to delete the following certificate: \n");
-		TInt count = errCerts.Count();
-		for(TInt index=0;index<count;++index)
-			{
-			const TDesC& certLabel = errCerts[index]->Label();
-			QString certName = QString((QChar*)certLabel.Ptr(),certLabel.Length());
-			message.append(certName).append("\n");
-			}
-		HbMessageBox::warning(message);
-	}
-QT_TRAP_THROWING( count = refreshListL());
-	refreshView(count);
-	CleanupStack::PopAndDestroy(&errCerts);
 	delete mNote;
 	mNote = NULL;
+	RDEBUG("0", 0);
 }
 const CCTCertInfo* CpCertView::certAt(TInt index) const
 	{
+	RDEBUG("0", 0);
 	CCTCertInfo* currentCert = NULL;
 	switch(mCertView)
 		{
 		case EAuthorityView:
 			{
 	return currentCert;
 	}
 QString CpCertView::certLabel(TInt index) const
 	{
+	RDEBUG("0", 0);
 	CpCertManUICertData* certData = NULL;
 	HBufC* label = NULL;
 	TInt length = 0;
 	switch(mCertView)
 		{
 	return QString((QChar*)label->Des().Ptr(), length);
 	}
 TInt CpCertView::refreshListL()
 	{
+	RDEBUG("0", 0);
 	TInt count = 0;
 	switch(mCertView)
 		{
 		case EAuthorityView:
 			mCertDataContainer->RefreshCAEntriesL();
 	}
 void CpCertView::refreshView( TInt count )
 	{
+	RDEBUG("0", 0);
 	if(mRefreshedView)
 		{
 		mRefreshedView->deleteLater();
 		mRefreshedView = NULL;
 		}
 			break;
 			}
 		}
 	HbMenu* menu = mRefreshedView->menu();
+	RDEBUG("0", 0);
 	std::auto_ptr<HbAction> endAction( q_check_ptr(new HbAction(hbTrId("txt_common_opt_delete"))) );
 	connect(endAction.get(), SIGNAL(triggered()), this, SLOT(deleteList()));
 	menu->addAction(endAction.get());
 	endAction.release();
 		}
 	std::auto_ptr<HbAction> moveAction(q_check_ptr(new HbAction(title)));
 	connect(moveAction.get(), SIGNAL(triggered()), this, SLOT(moveCert()));
 	menu->addAction(moveAction.get());
 	moveAction.release();
+	RDEBUG("0", 0);
 	std::auto_ptr<QGraphicsLinearLayout> layout(q_check_ptr(new QGraphicsLinearLayout(Qt::Vertical)));
 	HbListWidget* mCertificateList = q_check_ptr(new HbListWidget(this));
 	for(int index = 0; index< count; index++)
 	connect(mCertificateList, SIGNAL(activated(QModelIndex)), this, SLOT(openCertFromList(QModelIndex)));
 	connect(mCertificateList, SIGNAL(longPressed(HbAbstractViewItem*, QPointF )), this, SLOT(indicateLongPress(HbAbstractViewItem*, QPointF)));
 	layout->addItem(mCertificateList);
+	RDEBUG("0", 0);
 	// Refresh current view
 	QObject::connect(mRefreshedView , SIGNAL(aboutToClose()), this, SLOT(viewDone()));
 	mPrevView = mainWindow()->currentView();
 	mainWindow()->addView(mRefreshedView);
 	mainWindow()->setCurrentView(mRefreshedView);
 	mRefreshedView->setLayout(layout.get());
 	layout.release();
+	RDEBUG("0", 0);
 	}
 void CpCertView::viewDone()
 	{
+	RDEBUG("0", 0);
 	mCurrentView = mainWindow()->currentView();
 	mCurrentView->deleteLater();
 	mCurrentView= NULL;
 	mainWindow()->setCurrentView(mOriginalView);
 	}
 void CpCertView::showTrustSettings()
 	{
+	RDEBUG("0", 0);
 	mCurrentView = q_check_ptr(new CpCertTrustView(mPos, *mCertDataContainer));
 	connect(mCurrentView , SIGNAL(aboutToClose()), this, SLOT(saveTrustSettings()));
 	mPrevView = mainWindow()->currentView();
 	mainWindow()->addView(mCurrentView);
 	mainWindow()->setCurrentView(mCurrentView);
 	displayPreviousView();
 	}
 void CpCertView::moveSelectedCert()
 	{
+	RDEBUG("0", 0);
 	RArray<TInt> pos;
 	pos.Append(mPos);
 	moveCertList(pos);
 	}
 void CpCertView::moveCertList(RArray<TInt>& indexList)
 	{
+	RDEBUG("0", 0);
 	mIndexList = indexList;
 	mNote = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 	mNote->setHeadingWidget(q_check_ptr(new HbLabel(hbTrId("txt_certificate_manager_info_move"))));
 	if( mCertView == EPersonalView )
 		{
 	else if( mCertView == EDeviceView )
 		{
 		mNote->setText("Use of Personal certificates may require user confirmation. Proceed?");
 		}
-	mNote->setPrimaryAction(q_check_ptr(new HbAction("Yes")));
-	mNote->setSecondaryAction(q_check_ptr(new HbAction("No")));
 	mNote->setTimeout(HbPopup::NoTimeout);
 	mNote->setIconVisible (EFalse);
 	mNote->open(this,SLOT(handleMoveDialog(HbAction*)));
+	RDEBUG("0", 0);
 }
 void CpCertView::handleMoveDialog(HbAction* action)
 {
+	RDEBUG("0", 0);
 	if (action != mNote->primaryAction())
 	    {
 		return;
 	    }
 		// Move key first
 		TCTKeyAttributeFilter keyFilter;
 		keyFilter.iKeyId = entry->SubjectKeyId();
 		keyFilter.iPolicyFilter =  TCTKeyAttributeFilter::EAllKeys;
+		RDEBUG("0", 0);
 		TUid sourceCertStoreUid = TUid::Uid(0);
 		TUid targetCertStoreUid = TUid::Uid(0);
 		TUid sourceKeyStoreUid = TUid::Uid(0);
 		TUid targetKeyStoreUid = TUid::Uid(0);
 			sourceKeyStoreUid = KCMDeviceKeyStoreTokenUid;
 			targetKeyStoreUid = KCMFileKeyStoreTokenUid;
 			sourceCertStoreUid = KCMDeviceCertStoreTokenUid;
 			targetCertStoreUid = KCMFileCertStoreTokenUid;
 			}
+		RDEBUG("0", 0);
 		try
 			{
 			QT_TRAP_THROWING( mCertDataContainer->iWrapper->MoveKeyL(
 					mCertDataContainer->KeyManager(), keyFilter, sourceKeyStoreUid, targetKeyStoreUid ));
 			{
 			QString error(exception.what());
 			QT_TRAP_THROWING(mCertDataContainer->ShowErrorNoteL( error.toInt() ));
 			User::Exit( KErrNone );
 			}
+		RDEBUG("0", 0);
 		try
 			{
 			if(mCertView == EPersonalView)
 				{
 				QT_TRAP_THROWING( mCertDataContainer->RefreshUserCertEntriesL() );
 		} // for
 	// Refresh current view
 	QT_TRAP_THROWING(refreshView(refreshListL()));
 	delete mNote;
 	mNote = NULL;
-	}
+	RDEBUG("0", 0);
+	}

changeset 30	cc1cea6aabaf
parent 26	aad866c37519
child 59	881d92421467