FCL/sf/mw/appinstall: comparison appinstaller/AppMngr2/Sisx/src/appmngr2sisxappinfo.cpp

equal deleted inserted replaced

-:5cc91383ab1e
+:7333d7932ef7
 /*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <appmngr2drmutils.h>           // TAppMngr2DRMUtils
 #include <appmngr2cleanuputils.h>       // CleanupResetAndDestroyPushL
 #include <appmngr2debugutils.h>         // FLOG macros
 #include <x509cert.h>                   // CX509Certificate
 #include <swi/sisregistrypackage.h>     // CSisRegistryPackage
-#include <DRMHelper.h>
-#include <drmutility.h>
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 delete iSWInstLauncherCustomUninstallParams;
 delete iName;
 delete iDetails;
 delete iVendor;
 iCertificates.ResetAndDestroy();
-if ( iRegSessionOpen )
-{
-iSisRegSession.Close();
-}
 }
 // ---------------------------------------------------------------------------
 // CAppMngr2SisxAppInfo::IconIndex()
 // ---------------------------------------------------------------------------
 //
 void CAppMngr2SisxAppInfo::ConstructL( Swi::RSisRegistryEntry& aEntry )
 {
 FLOG( "CAppMngr2SisxAppInfo::ConstructL()" );
 CAppMngr2AppInfo::ConstructL();     // base construct
 iAppUid = aEntry.UidL();
 FLOG( "CAppMngr2SisxAppInfo::ConstructL, iAppUid = 0x%08x", iAppUid.iUid );
 iName = aEntry.PackageNameL();
 FLOG( "CAppMngr2SisxAppInfo::ConstructL, iName = %S", iName );
 iDetails = SizeStringWithUnitsL( aEntry.SizeL() );
-FLOG( "CAppMngr2SisxAppInfo::ConstructL, aEntry.SizeL() = %Ld, iDetails = %S",
+FLOG( "CAppMngr2SisxAppInfo::ConstructL, iDetails = %S", iDetails );
-aEntry.SizeL(), iDetails );
 TUint drivesMask = aEntry.InstalledDrivesL();
 if( drivesMask )
 {
 // Select the highest drive as location drive
 }
 iLocation = TAppMngr2DriveUtils::LocationFromDriveL( iLocationDrive, iFs );
 iVersion = aEntry.VersionL();
 iVendor = aEntry.LocalizedVendorNameL();
 iIsAugmentation = aEntry.IsAugmentationL();
 if( iIsAugmentation )
 {
 Swi::CSisRegistryPackage* pkg = aEntry.PackageL();
 iAugmentationIndex = pkg->Index();
 delete pkg;
 }
 Swi::TSisPackageTrust trustLevel = aEntry.TrustL();
 if( trustLevel >= Swi::ESisPackageCertificateChainValidatedToTrustAnchor )
 {
 iIsTrusted = ETrue;
 }
-iRegSessionOpen = EFalse;
+// If installed SIS package is DRM protected, find the protected file and
-// iProtectedFile is allocated only in ShowDetails function.
+// save it's full name in iProtectedFile member variable for later use.
-iProtectedFile = NULL;
+// Full name of the protected file is needed in ShowDetailsL() function
+// to show the licence information.
+RPointerArray<HBufC> files;
+TRAPD( err, aEntry.FilesL( files ) );
+if( err == KErrNone )
+{
+CleanupResetAndDestroyPushL( files );
+for( TInt fileIndex = 0; fileIndex < files.Count() && !iIsDRMProtected; fileIndex++ )
+{
+HBufC* fileName = files[ fileIndex ];
+iIsDRMProtected = TAppMngr2DRMUtils::IsDRMProtected( *fileName );
+if( iIsDRMProtected )
+{
+FLOG( "CAppMngr2SisxAppInfo::ConstructL, protected file %S", fileName );
+iProtectedFile = fileName;  // takes ownership
+files.Remove( fileIndex );
+iIsRightsObjectMissingOrExpired =
+TAppMngr2DRMUtils::IsDRMRightsObjectExpiredOrMissingL( *fileName );
+}
+}
+CleanupStack::PopAndDestroy( &files );
+}
 FLOG( "CAppMngr2SisxAppInfo::ConstructL, loc=%d, aug=%d, trust=%d, drm=%d, RO=%d",
 iLocation, iIsAugmentation, iIsTrusted, iIsDRMProtected,
 iIsRightsObjectMissingOrExpired );
 }
 //
 void CAppMngr2SisxAppInfo::ShowDetailsL()
 {
 FLOG( "CAppMngr2SisxAppInfo::ShowDetailsL()" );
 TRAP_IGNORE( ReadCertificatesL() );
-CAppMngr2SisxInfoIterator* iterator =
+CAppMngr2SisxInfoIterator* iterator = CAppMngr2SisxInfoIterator::NewL( *this,
-CAppMngr2SisxInfoIterator::NewL( *this,
+EAppMngr2StatusInstalled );
-EAppMngr2StatusInstalled );
 CleanupStack::PushL( iterator );
-// Let's check if installed SIS package is DRM protected.
+SwiUI::CommonUI::CCUIDetailsDialog* details = SwiUI::CommonUI::CCUIDetailsDialog::NewL();
-// This check has been in constructor but it takes long time to check all
-// files for all installed packages so overall delay in UI is too long.
-// So we have move the DRM check into here.
-CheckDRMContentL();
 FLOG( "CAppMngr2SisxAppInfo::ShowDetailsL, isDRM %d, noRightsObj %d, CertCount %d",
 iIsDRMProtected, iIsRightsObjectMissingOrExpired, iCertificates.Count() );
-RFile fileHandle;
-TInt fileOpenError = KErrNone;
 if( iIsDRMProtected && !iIsRightsObjectMissingOrExpired )
 {
-if ( iProtectedFile )
+RFile fileHandle;
-{
+TInt err = fileHandle.Open( iFs, *iProtectedFile, EFileShareReadersOnly | EFileRead );
-FLOG( "ShowDetailsL, iProtecteFile %S", iProtectedFile );
+CleanupClosePushL( fileHandle );
-fileOpenError = fileHandle.Open( iFs,
-*iProtectedFile,
-EFileShareReadersOnly | EFileRead );
-FLOG( "ShowDetailsL, fileOpenError %d", fileOpenError );
-if( !fileOpenError )
-{
-CleanupClosePushL( fileHandle );
-}
-}
-}
-SwiUI::CommonUI::CCUIDetailsDialog* details = SwiUI::CommonUI::CCUIDetailsDialog::NewL();
-if( iIsDRMProtected && !iIsRightsObjectMissingOrExpired && !fileOpenError )
-{
 if( iCertificates.Count() )
 {
 details->ExecuteLD( *iterator, iCertificates, fileHandle );
 }
 else
 {
 details->ExecuteLD( *iterator, fileHandle );
 }
+CleanupStack::PopAndDestroy( &fileHandle );
 }
 else
 {
 if( iCertificates.Count() )
 {
 else
 {
 details->ExecuteLD( *iterator );
 }
 }
-if( iIsDRMProtected && !iIsRightsObjectMissingOrExpired && !fileOpenError )
-{
-CleanupStack::PopAndDestroy( &fileHandle );
-}
 CleanupStack::PopAndDestroy( iterator );
 }
 // ---------------------------------------------------------------------------
 // CAppMngr2SisxAppInfo::ReadCertificatesL()
 void CAppMngr2SisxAppInfo::ReadCertificatesL()
 {
 if( !iCertsRead )
 {
 FLOG_PERF_STATIC_BEGIN( SisxAppInfo_ReadCerts );
 Swi::RSisRegistrySession regSession;
 CleanupClosePushL( regSession );
 User::LeaveIfError( regSession.Connect() );
 Swi::RSisRegistryEntry entry;
 CleanupStack::PopAndDestroy( &certificateChain );
 CleanupStack::PopAndDestroy( &entry );
 CleanupStack::PopAndDestroy( &regSession );
 iCertsRead = ETrue;
 FLOG_PERF_STATIC_END( SisxAppInfo_ReadCerts )
 }
 }
 // ---------------------------------------------------------------------------
 }
 else
 {
 User::Leave( KErrInUse );
 }
 if( iIsAugmentation )
 {
 FLOG( "CAppMngr2SisxAppInfo::HandleUninstallL, is augmentation" );
 SwiUI::TOpUninstallIndexParam params;
 params.iUid = iAppUid;
 params.iIndex = iAugmentationIndex;
 SwiUI::TOpUninstallIndexParamPckg pckg( params );
 if( iSWInstLauncherCustomUninstallParams )
 {
 delete iSWInstLauncherCustomUninstallParams;
 iSWInstLauncherCustomUninstallParams = NULL;
 FLOG( "CAppMngr2SisxAppInfo::HandleUninstallL, calling Uninstall" );
 iSWInstLauncher->Uninstall( aStatus, iAppUid, SwiUI::KSisxMimeType() );
 }
 }
-// ---------------------------------------------------------------------------
-// CAppMngr2SisxAppInfo::CheckDRMContentL()
-// ---------------------------------------------------------------------------
-//
-void CAppMngr2SisxAppInfo::CheckDRMContentL()
-{
-FLOG( "CAppMngr2SisxAppInfo::CheckDRMContentL");
-TInt err = KErrNone;
-if ( !iRegSessionOpen )
-{
-err = iSisRegSession.Connect();
-FLOG( "CheckDRMContentL, iSisRegSession.Connect err %d", err );
-if ( err )
-{
-iRegSessionOpen = EFalse;
-}
-else
-{
-iRegSessionOpen = ETrue;
-}
-}
-FLOG( "CheckDRMContentL, iRegSessionOpen = %d", err );
-if ( iRegSessionOpen )
-{
-Swi::RSisRegistryEntry entry;
-err = entry.Open( iSisRegSession, iAppUid );
-FLOG( "CheckDRMContentL, entry.Open err = %d", err );
-if ( !err )
-{
-CleanupClosePushL( entry );
-RPointerArray<HBufC> files;
-TRAP( err, entry.FilesL( files ) );
-FLOG( "CheckDRMContentL, entry.FilesL err = %d", err );
-if( !err )
-{
-CleanupResetAndDestroyPushL( files );
-// Use DRMUtility for DRM check. Utility class is much faster
-// then IsDRMProtected function.
-DRM::CDrmUtility* utility = DRM::CDrmUtility::NewLC();
-for ( TInt index = 0; index < files.Count(); index++ )
-{
-RFile fileHandle;
-TInt error = fileHandle.Open( iFs,
-*files[ index ],
-EFileRead );
-FLOG( "CheckDRMContentL, File open error %d", error );
-if ( error == KErrNone )
-{
-CleanupClosePushL( fileHandle );
-err = KErrNone;
-// We need to tarp this function since it may leave with
-// some files which do not have enough data. If ConstrucL
-// leaves package is not shown in UI.
-TRAP( err, iIsDRMProtected =
-utility->IsProtectedL( fileHandle ) );
-if ( err )
-{
-// If we have leave let's handle this as not DRM
-// procteded.
-iIsDRMProtected = EFalse;
-FLOG("CheckDRMContentL, IsProtectedL err %d",err);
-}
-CleanupStack::PopAndDestroy( &fileHandle );
-if ( iIsDRMProtected )
-{
-FLOG("CheckDRMContentL: File is DRM protected");
-HBufC* fileName = files[ index ];
-// Let's alloc this only when DRM package is found.
-// KMaxFileName (256) sould be enoug for all
-// file names.
-if ( iProtectedFile == NULL )
-{
-iProtectedFile = HBufC::NewL( KMaxFileName );
-}
-// Let's copy filename to member because we dont know
-// for sure that pointer to sis registry entry is valid
-// after entry delete.
-if ( iProtectedFile )
-{
-TPtr ptr = iProtectedFile->Des();
-ptr.Copy( *fileName );
-}
-FLOG( "CheckDRMContentL: iProtecteFile %S",
-iProtectedFile );
-files.Remove( index );
-CDRMHelper* helper = CDRMHelper::NewLC();
-CDRMHelperRightsConstraints* playconst = NULL;
-CDRMHelperRightsConstraints* dispconst = NULL;
-CDRMHelperRightsConstraints* execconst = NULL;
-CDRMHelperRightsConstraints* printconst = NULL;
-TBool sendingallowed = EFalse;
-FLOG( "CheckDRMContentL: GetRightsDetailsL" );
-error = KErrNone;
-TRAP( error, helper->GetRightsDetailsL(
-*fileName,
-ContentAccess::EView,
-iIsRightsObjectMissingOrExpired,
-sendingallowed,
-playconst,
-dispconst,
-execconst,
-printconst ) );
-FLOG( "GetRightsDetailsL TRAP err = %d", error );
-FLOG( "iIsRightsObjectMissingOrExpired = %d",
-iIsRightsObjectMissingOrExpired );
-delete playconst;
-delete dispconst;
-delete execconst;
-delete printconst;
-CleanupStack::PopAndDestroy( helper );
-}
-}
-}
-CleanupStack::PopAndDestroy( utility );
-CleanupStack::PopAndDestroy( &files );
-}
-CleanupStack::PopAndDestroy( &entry );
-}
-}
-}
-// EOF

branch	RCL_3
changeset 65	7333d7932ef7
parent 61	cd189dac02f7
child 66	8b7f4e561641