equal
deleted
inserted
replaced
221 #if defined(_DEBUG) |
221 #if defined(_DEBUG) |
222 RDebug::Printf( "%s %s (%u) res=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, res ); |
222 RDebug::Printf( "%s %s (%u) res=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, res ); |
223 RDebug::Printf( "%s %s (%u) currentLockStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, currentLockStatus ); |
223 RDebug::Printf( "%s %s (%u) currentLockStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, currentLockStatus ); |
224 #endif |
224 #endif |
225 delete repository; |
225 delete repository; |
226 if(res==0 && currentLockStatus==1) |
226 if(res==0 && currentLockStatus>=1 ) |
227 { |
227 { |
228 // code is the default one; no need to request it. |
228 // code is the default one; no need to request it. |
229 return ETrue; |
229 return ETrue; |
230 } |
230 } |
231 /* end check for default code */ |
231 /* end check for default code */ |
1246 RDebug::Print(_L("CSecurityHandler::Pin1RequiredL() Remaining Attempts query status: %d"), res); |
1246 RDebug::Print(_L("CSecurityHandler::Pin1RequiredL() Remaining Attempts query status: %d"), res); |
1247 RDebug::Print(_L("CSecurityHandler::Pin1RequiredL() Remaining Attempts: %d"), attempts); |
1247 RDebug::Print(_L("CSecurityHandler::Pin1RequiredL() Remaining Attempts: %d"), attempts); |
1248 #endif |
1248 #endif |
1249 User::LeaveIfError(res); |
1249 User::LeaveIfError(res); |
1250 |
1250 |
1251 if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts) |
1251 if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts ) |
1252 res = iSecurityDlg->ExecuteLD(R_PIN_REQUEST_QUERY); |
1252 res = iSecurityDlg->ExecuteLD(R_PIN_REQUEST_QUERY); |
1253 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1253 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1254 { |
1254 { |
1255 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_PIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts); |
1255 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_PIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts); |
1256 res = iSecurityDlg->ExecuteLD(R_PIN_REQUEST_QUERY, *queryPrompt); |
1256 res = iSecurityDlg->ExecuteLD(R_PIN_REQUEST_QUERY, *queryPrompt); |
1298 CSecUiLockObserver* deviceLockStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg); |
1298 CSecUiLockObserver* deviceLockStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg); |
1299 CleanupStack::PushL(deviceLockStatusObserver); |
1299 CleanupStack::PushL(deviceLockStatusObserver); |
1300 CSecUiLockObserver* queryStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg, ESecUiRequestStateObserver); |
1300 CSecUiLockObserver* queryStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg, ESecUiRequestStateObserver); |
1301 CleanupStack::PushL(queryStatusObserver); |
1301 CleanupStack::PushL(queryStatusObserver); |
1302 |
1302 |
1303 if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts) |
1303 if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts ) |
1304 res = iSecurityDlg->ExecuteLD(R_PIN_QUERY); |
1304 res = iSecurityDlg->ExecuteLD(R_PIN_QUERY); |
1305 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1305 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1306 { |
1306 { |
1307 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_PIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts ); |
1307 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_PIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts ); |
1308 res = iSecurityDlg->ExecuteLD(R_PIN_QUERY, *queryPrompt); |
1308 res = iSecurityDlg->ExecuteLD(R_PIN_QUERY, *queryPrompt); |
1926 wait->SetRequestType(EMobilePhoneGetSecurityCodeInfo); |
1926 wait->SetRequestType(EMobilePhoneGetSecurityCodeInfo); |
1927 iPhone.GetSecurityCodeInfo(wait->iStatus, secCodeType, codeInfoPkg); |
1927 iPhone.GetSecurityCodeInfo(wait->iStatus, secCodeType, codeInfoPkg); |
1928 res = wait->WaitForRequestL(); |
1928 res = wait->WaitForRequestL(); |
1929 User::LeaveIfError(res); |
1929 User::LeaveIfError(res); |
1930 |
1930 |
1931 if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts) |
1931 if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts ) |
1932 res = iSecurityDlg->ExecuteLD(R_UPIN_REQUEST_QUERY); |
1932 res = iSecurityDlg->ExecuteLD(R_UPIN_REQUEST_QUERY); |
1933 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1933 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1934 { |
1934 { |
1935 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_UPIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts); |
1935 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_UPIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts); |
1936 res = iSecurityDlg->ExecuteLD(R_UPIN_REQUEST_QUERY, *queryPrompt); |
1936 res = iSecurityDlg->ExecuteLD(R_UPIN_REQUEST_QUERY, *queryPrompt); |
1972 CSecUiLockObserver* deviceLockStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg); |
1972 CSecUiLockObserver* deviceLockStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg); |
1973 CleanupStack::PushL(deviceLockStatusObserver); |
1973 CleanupStack::PushL(deviceLockStatusObserver); |
1974 CSecUiLockObserver* queryStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg, ESecUiRequestStateObserver); |
1974 CSecUiLockObserver* queryStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg, ESecUiRequestStateObserver); |
1975 CleanupStack::PushL(queryStatusObserver); |
1975 CleanupStack::PushL(queryStatusObserver); |
1976 |
1976 |
1977 if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts) |
1977 if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts ) |
1978 res = iSecurityDlg->ExecuteLD(R_UPIN_QUERY); |
1978 res = iSecurityDlg->ExecuteLD(R_UPIN_QUERY); |
1979 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1979 else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt) |
1980 { |
1980 { |
1981 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_UPIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts); |
1981 HBufC* queryPrompt = StringLoader::LoadLC(R_SECUI_REMAINING_UPIN_ATTEMPTS, codeInfo.iRemainingEntryAttempts); |
1982 res = iSecurityDlg->ExecuteLD(R_UPIN_QUERY, *queryPrompt); |
1982 res = iSecurityDlg->ExecuteLD(R_UPIN_QUERY, *queryPrompt); |