equal
deleted
inserted
replaced
73 WRITELOG( "CHarvesterQueue::CHarvesterQueue()" ); |
73 WRITELOG( "CHarvesterQueue::CHarvesterQueue()" ); |
74 iItemQueue.ResetAndDestroy(); |
74 iItemQueue.ResetAndDestroy(); |
75 iItemQueue.Close(); |
75 iItemQueue.Close(); |
76 iFs.Close(); |
76 iFs.Close(); |
77 RMediaIdUtil::ReleaseInstance(); |
77 RMediaIdUtil::ReleaseInstance(); |
|
78 |
|
79 if (iHEM) |
|
80 { |
|
81 iHEM->ReleaseInstance(); |
|
82 } |
78 } |
83 } |
79 |
84 |
80 // --------------------------------------------------------------------------- |
85 // --------------------------------------------------------------------------- |
81 // ConstructL |
86 // ConstructL |
82 // --------------------------------------------------------------------------- |
87 // --------------------------------------------------------------------------- |
84 void CHarvesterQueue::ConstructL() |
89 void CHarvesterQueue::ConstructL() |
85 { |
90 { |
86 WRITELOG( "CHarvesterQueue::ConstructL()" ); |
91 WRITELOG( "CHarvesterQueue::ConstructL()" ); |
87 User::LeaveIfError( iFs.Connect() ); |
92 User::LeaveIfError( iFs.Connect() ); |
88 iMediaIdUtil = &RMediaIdUtil::GetInstanceL(); |
93 iMediaIdUtil = &RMediaIdUtil::GetInstanceL(); |
|
94 iHEM = CHarvesterEventManager::GetInstanceL(); |
89 } |
95 } |
90 |
96 |
91 // --------------------------------------------------------------------------- |
97 // --------------------------------------------------------------------------- |
92 // ItemsInQueue |
98 // ItemsInQueue |
93 // --------------------------------------------------------------------------- |
99 // --------------------------------------------------------------------------- |
146 TTime time( 0 ); |
152 TTime time( 0 ); |
147 if ( err == KErrNone && iBlacklist->IsBlacklisted( |
153 if ( err == KErrNone && iBlacklist->IsBlacklisted( |
148 aItem->Uri(), mediaId, time ) ) |
154 aItem->Uri(), mediaId, time ) ) |
149 { |
155 { |
150 WRITELOG( "CHarvesterQueue::Append() - found a blacklisted file" ); |
156 WRITELOG( "CHarvesterQueue::Append() - found a blacklisted file" ); |
|
157 TRAP_IGNORE( iHEM->DecreaseItemCountL( EHEObserverTypePlaceholder ) ); |
|
158 TRAP_IGNORE( iHEM->DecreaseItemCountL( EHEObserverTypeMMC ) ); |
|
159 if( aItem->EventType() == EHarvesterEdit ) |
|
160 { |
|
161 // Remove possible placeholder items from DB if file was blacklisted during harvesting |
|
162 iHarvesterAO->RemoveBlacklistedFile( aItem ); |
|
163 } |
151 delete aItem; |
164 delete aItem; |
152 aItem = NULL; |
165 aItem = NULL; |
153 return; |
166 return; |
154 } |
167 } |
155 } |
168 } |