FCL/sf/app/jrt: comparison javamanager/javainstaller/installer/src.s60/applicationregistrator/sifregistrator.cpp

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 #include <apgtask.h>
 #include <s32mem.h>
 #include <w32std.h>
 #include "com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator.h"
+#include "com_nokia_mj_impl_utils_InstallerErrorMessage.h"
 #include "javacommonutils.h"
 #include "javasymbianoslayer.h" // for CleanupResetAndDestroyPushL
 #include "logger.h"
 // SCR usage is enabled if this macro has been defined.
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-#include <qservicemanager.h>
-#include <qurl.h>
 #include <usif/scr/scr.h>
 #include <usif/scr/screntries.h>
-#ifdef RD_JAVA_USIF_APP_REG
 #include <usif/scr/appreginfo.h>
-#endif // RD_JAVA_USIF_APP_REG
+#include <usif/usiferror.h>
+#include <xqappmgr.h>
 // Helper macro for logging a TDesC.
 #define LOG_TDESC_L(compIdParam, logLevelParam, msgParam, tdescParam) \
-{                                                               \
+{                                                                 \
-HBufC8* tdescBuf = HBufC8::NewLC(tdescParam.Length() + 1);  \
+std::wstring ws((wchar_t*)tdescParam.Ptr(), tdescParam.Length()); \
-TPtr8 tdescPtr(tdescBuf->Des());                            \
+LOG1(compIdParam, logLevelParam, msgParam, ws.c_str());       \
-tdescPtr.Append(tdescParam);                                \
-LOG1(compIdParam, logLevelParam, msgParam, tdescPtr.PtrZ());\
-CleanupStack::PopAndDestroy(tdescBuf);                      \
 }
 // NAMESPACE DECLARATION
-QTM_USE_NAMESPACE
 using namespace java;
 using namespace Usif;
 IMPORT_C HBufC* CreateHBufCFromJavaStringLC(JNIEnv* aEnv, jstring aString);
-// Java MIME types.
-_LIT(KMimeTypeAppDescriptor, "text/vnd.sun.j2me.app-descriptor");
-_LIT(KMimeTypeJava, "application/java");
-_LIT(KMimeTypeJavaArchive, "application/java-archive");
-_LIT(KMimeTypeXJavaArchive, "application/x-java-archive");
 // Properties registered to SCR.
-_LIT(KMIDletName, "MIDlet-Name");
 _LIT(KUid, "Uid");
 _LIT(KMediaId, "Media-Id");
 _LIT(KMIDletInfoURL, "MIDlet-Info-URL");
 _LIT(KMIDletDescription, "MIDlet-Description");
 _LIT(KDownloadURL, "Download-URL");
+_LIT(KUpdateURL, "Update-URL");
 _LIT(KSettingsPlugin, "SettingsName");
 _LIT(KSettingsPluginValue, "javaapplicationsettingsview");
-#ifdef RD_JAVA_USIF_APP_REG
 // Symbian file path separator.
 _LIT(KPathSeperator, "\\");
 // Postfix for the fake application name generated for AppArc.
 _LIT(KAppPostfix, ".fakeapp");
-#endif // RD_JAVA_USIF_APP_REG
 /**
 * Internal helper method for checking if specified application
 * is already running.
 *
 /**
 * See JNI method __1notifyAppChange.
 * This method makes calls that may leave (the actual registering).
 */
-#ifdef RD_JAVA_USIF_NOTIFY_APP_ARC
 void NotifyAppChangeL(JNIEnv *aEnv, jintArray aAppUids, jint aAppChange)
 {
 RApaLsSession apaSession;
 TInt err = apaSession.Connect();
 if (KErrNone != err)
 CleanupStack::PopAndDestroy(&appUpdateInfos);
 CleanupStack::PopAndDestroy(&apaSession);
 LOG(EJavaInstaller, EInfo, "NotifyAppChangeL completed");
 }
-#else
-void NotifyAppChangeL(JNIEnv *, jintArray, jint)
-{
-}
-#endif // RD_JAVA_USIF_NOTIFY_APP_ARC
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Method:    _notifyAppChange
 * Signature: ([II)I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1notifyAppChange
 (JNIEnv *aEnv, jclass, jintArray aAppUids, jint aAppChange)
 {
 TRAPD(err, NotifyAppChangeL(aEnv, aAppUids, aAppChange));
-if (KErrNone != err)
-{
-ELOG1(EJavaInstaller,
-"notifyAppChange: notifying AppArc failed, error %d",
-err);
-}
 return err;
 }
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1launchAppView
 (JNIEnv *, jclass)
 {
 TInt err = KErrNone;
-QServiceManager serviceManager;
+CActiveScheduler* newScheduler = 0;
-QObject* activityManager =
+if (0 == CActiveScheduler::Current())
-serviceManager.loadInterface("com.nokia.qt.activities.ActivityManager");
+{
-if (!activityManager)
+// Create ActiveScheduler as it does not yet exist.
-{
+newScheduler = new CActiveScheduler;
-err = serviceManager.error();
+CActiveScheduler::Install(newScheduler);
-ELOG1(EJavaInstaller,
+}
-"launchAppView: loading ActivityManager failed, error %d", err);
-return KErrCouldNotConnect;
+QUrl openRecentView("appto://20022F35?activityname=AppLibRecentView");
-}
+XQApplicationManager applicationManager;
-// URL for launching AppLib.
+XQAiwRequest *request = applicationManager.create(openRecentView);
-QUrl url(QString("appto://20022F35?activityname=AppLibRecentView"));
+if (request)
-QMetaObject::invokeMethod(activityManager, "launchActivity",
+{
-Q_ARG(QString, url.toString()));
+LOG(EJavaInstaller, EInfo, "launchAppView: launching AppLib");
-err = serviceManager.error();
+bool result = request->send();
-delete activityManager;
+if (!result)
-if (QServiceManager::NoError != err)
+{
-{
+int error = request->lastError();
 ELOG1(EJavaInstaller,
-"launchAppView: launching AppLib activity failed, error %d",
+"launchAppView: launching AppLib failed, error %d", error);
-err);
+err = KErrGeneral;
-return KErrCouldNotConnect;
+}
-}
+else
+{
-// Start AppLib and bring it to foreground.
+LOG(EJavaInstaller, EInfo, "launchAppView: launching AppLib succeeded");
-const TUid KAppLibUid = { 0x20022F35 };
+}
-TRAP(err, StartAppL(KAppLibUid));
+delete request;
-return err;
+}
-}
+if (newScheduler)
-/**
+{
-* See JNI method __1registerJavaSoftwareType.
+delete newScheduler;
-* This method makes calls that may leave (the actual registering).
+newScheduler = 0;
-*/
+}
-void RegisterJavaSoftwareTypeL(RSoftwareComponentRegistry *aScr, TBool aRegister = ETrue)
-{
+if (KErrNone == err)
-RPointerArray<HBufC> javaMimeTypes;
+{
-CleanupResetAndDestroyPushL(javaMimeTypes);
+// Start AppLib and bring it to foreground.
-javaMimeTypes.AppendL(KMimeTypeAppDescriptor().AllocL());
+const TUid KAppLibUid = { 0x20022F35 };
-javaMimeTypes.AppendL(KMimeTypeJava().AllocL());
+TRAP(err, StartAppL(KAppLibUid));
-javaMimeTypes.AppendL(KMimeTypeJavaArchive().AllocL());
+}
-javaMimeTypes.AppendL(KMimeTypeXJavaArchive().AllocL());
-if (aRegister)
-{
-TUid javaSifPluginUid = TUid::Uid(0x2002bc70);
-_LIT_SECURE_ID(KJavaInstallerSid, 0x102033E6);
-aScr->AddSoftwareTypeL(
-Usif::KSoftwareTypeJava, javaSifPluginUid,
-KJavaInstallerSid, KJavaInstallerSid, javaMimeTypes);
-}
-else
-{
-aScr->DeleteSoftwareTypeL(Usif::KSoftwareTypeJava, javaMimeTypes);
-}
-CleanupStack::PopAndDestroy(&javaMimeTypes);
-}
-/*
-* Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
-* Method:    _registerJavaSoftwareType
-* Signature: (Z)I
-*/
-JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1registerJavaSoftwareType
-(JNIEnv *, jclass, jboolean aRegister)
-{
-RSoftwareComponentRegistry *pScr = NULL;
-TRAPD(err, pScr = CreateScrL());
-if (KErrNone != err)
-{
-return err;
-}
-TRAP(err, RegisterJavaSoftwareTypeL(pScr, aRegister));
-if (KErrNone != err)
-{
-ELOG1(EJavaInstaller,
-"registerJavaSoftwareType: registration failed, error %d",
-err);
-}
-pScr->Close();
-delete pScr;
 return err;
 }
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 RSoftwareComponentRegistry *pScr =
 reinterpret_cast<RSoftwareComponentRegistry*>(aSessionHandle<<2);
 TRAPD(err, pScr->RollbackTransactionL());
 pScr->Close();
 delete pScr;
-if (KErrNone != err)
-{
-ELOG1(EJavaInstaller,
-"rollbackSession: Rolling back transaction failed, error %d",
-err);
-}
 return err;
 }
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 if (NULL != aValue)
 {
 HBufC *valueBuf = CreateHBufCFromJavaStringLC(aEnv, aValue);
 aScr->SetComponentPropertyL(aComponentId, aName, *valueBuf);
 //LOG_TDESC_L(EJavaInstaller, EInfo,
-//            "SetComponentPropertyL: name %s", aName);
+//            "SetComponentPropertyL: name %S", aName);
 //LOG_TDESC_L(EJavaInstaller, EInfo,
-//            "SetComponentPropertyL: value %s", valueBuf->Des());
+//            "SetComponentPropertyL: value %S", valueBuf->Des());
 CleanupStack::PopAndDestroy(valueBuf);
 }
 }
 /**
 * See JNI method __1registerComponent.
 * This method makes calls that may leave (the actual registering).
 */
 TComponentId RegisterComponentL(
 JNIEnv *aEnv, RSoftwareComponentRegistry *aScr, jint aUid,
-jstring aSuiteName, jstring aVendor, jstring aVersion,
+jstring aSuiteName, jstring aVendor, jstring aVersion, jstring aGlobalId,
-jstring aName, jstring aGlobalId,
 jobjectArray aComponentFiles, TInt64 aComponentSize,
 TBool aIsRemovable, TBool aIsDrmProtected,
 TBool aIsOriginVerified, TBool aIsUpdate, jint aMediaId,
-jstring aMidletInfoUrl, jstring aMidletDescription, jstring aDownloadUrl)
+jstring aMidletInfoUrl, jstring aMidletDescription,
-{
+jstring aDownloadUrl, jstring aUpdateUrl)
-HBufC *name = NULL;
+{
-if (NULL == aName)
+HBufC *name = CreateHBufCFromJavaStringLC(aEnv, aSuiteName);
-{
-// If name is not specified, use suite name.
-name = CreateHBufCFromJavaStringLC(aEnv, aSuiteName);
-}
-else
-{
-name = CreateHBufCFromJavaStringLC(aEnv, aName);
-}
 HBufC *vendor = CreateHBufCFromJavaStringLC(aEnv, aVendor);
 HBufC *version = CreateHBufCFromJavaStringLC(aEnv, aVersion);
 HBufC *globalId = CreateHBufCFromJavaStringLC(aEnv, aGlobalId);
 TComponentId componentId = aScr->AddComponentL(
 aScr->SetComponentPropertyL(componentId, KMediaId(), aMediaId);
 //LOG(EJavaInstaller, EInfo, "RegisterComponentL: Media-Id property set");
 aScr->SetComponentPropertyL(componentId, KSettingsPlugin(), KSettingsPluginValue());
 //LOG(EJavaInstaller, EInfo, "RegisterComponentL: Settings plugin property set");
-if (NULL != aName)
-{
-// If name is specified, store suite name as property.
-SetComponentPropertyL(aEnv, aScr, componentId, KMIDletName(), aSuiteName);
-}
 SetComponentPropertyL(aEnv, aScr, componentId, KMIDletInfoURL(), aMidletInfoUrl);
 SetComponentPropertyL(aEnv, aScr, componentId, KMIDletDescription(), aMidletDescription);
 SetComponentPropertyL(aEnv, aScr, componentId, KDownloadURL(), aDownloadUrl);
+SetComponentPropertyL(aEnv, aScr, componentId, KUpdateURL(), aUpdateUrl);
 CleanupStack::PopAndDestroy(globalId);
 CleanupStack::PopAndDestroy(version);
 CleanupStack::PopAndDestroy(vendor);
 CleanupStack::PopAndDestroy(name);
 * Method:    _registerComponent
 * Signature: (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;JZZZZLcom/nokia/mj/impl/installer/applicationregistrator/ComponentId;)I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1registerComponent
 (JNIEnv *aEnv, jclass, jint aSessionHandle, jint aUid, jstring aSuiteName,
-jstring aVendor, jstring aVersion, jstring aName, jstring aGlobalId,
+jstring aVendor, jstring aVersion, jstring aGlobalId,
 jobjectArray aComponentFiles, jlong aComponentSize, jboolean aIsRemovable,
 jboolean aIsDrmProtected, jboolean aIsOriginVerified, jboolean aIsUpdate,
 jint aMediaId, jstring aMidletInfoUrl, jstring aMidletDescription,
-jstring aDownloadUrl, jobject aComponentId)
+jstring aDownloadUrl, jstring aUpdateUrl, jobject aComponentId)
 {
-//__UHEAP_MARK;
+__UHEAP_MARK;
 RSoftwareComponentRegistry *pScr =
 reinterpret_cast<RSoftwareComponentRegistry*>(aSessionHandle<<2);
 TComponentId componentId = -1;
 TRAPD(err, componentId = RegisterComponentL(
-aEnv, pScr, aUid, aSuiteName, aVendor, aVersion, aName, aGlobalId,
+aEnv, pScr, aUid, aSuiteName, aVendor, aVersion, aGlobalId,
 aComponentFiles, aComponentSize, aIsRemovable,
 aIsDrmProtected, aIsOriginVerified, aIsUpdate, aMediaId,
-aMidletInfoUrl, aMidletDescription, aDownloadUrl));
+aMidletInfoUrl, aMidletDescription,
-//__UHEAP_MARKEND;
+aDownloadUrl, aUpdateUrl));
+__UHEAP_MARKEND;
 if (KErrNone == err)
 {
 jclass clazz = aEnv->GetObjectClass(aComponentId);
 jmethodID methodSetId = aEnv->GetMethodID(clazz, "setId", "(I)V");
 aEnv->CallVoidMethod(aComponentId, methodSetId, componentId);
 * Signature: (II)I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1unregisterComponent
 (JNIEnv *, jclass, jint aSessionHandle, jint aComponentId)
 {
-//__UHEAP_MARK;
+__UHEAP_MARK;
 RSoftwareComponentRegistry *pScr =
 reinterpret_cast<RSoftwareComponentRegistry*>(aSessionHandle<<2);
 TInt err = KErrNone;
-#ifdef RD_JAVA_USIF_APP_REG
 TRAP(err, pScr->DeleteApplicationEntriesL(aComponentId));
-#endif // RD_JAVA_USIF_APP_REG
 if (KErrNone == err)
 {
 TRAP(err, pScr->DeleteComponentL(aComponentId));
 }
-//__UHEAP_MARKEND;
+__UHEAP_MARKEND;
 return err;
 }
 /**
 * See JNI method __1registerApplication.
 * This method makes calls that may leave.
 */
-#ifdef RD_JAVA_USIF_APP_REG
 void RegisterApplicationL(
 JNIEnv *aEnv, RSoftwareComponentRegistry *aScr,
 jint aComponentId, jint aAppUid,
 jstring aAppName, jstring aAppFilename, jstring aGroupName,
 jstring aIconFilename, jint aNumberOfIcons,
 // Add localized application names (captions).
 RPointerArray<HBufC> captionsArray;
 CleanupResetAndDestroyPushL(captionsArray);
 TInt langCount = aEnv->GetArrayLength(aLanguages);
-TInt captionCount = aEnv->GetArrayLength(aAppNames);
+jint* languages = aEnv->GetIntArrayElements(aLanguages, NULL);
-if (langCount == captionCount)
+for (TInt i = 0; i < langCount; i++)
 {
-jint* languages = aEnv->GetIntArrayElements(aLanguages, NULL);
+TLanguage tmpLanguage = (TLanguage)languages[i];
-for (TInt i = 0; i < langCount; i++)
+HBufC *tmpCaption =
-{
+CreateHBufCFromJavaStringLC(
-TLanguage tmpLanguage = (TLanguage)languages[i];
+aEnv, (jstring)aEnv->GetObjectArrayElement(aAppNames, i));
-HBufC *tmpCaption =
+captionsArray.AppendL(tmpCaption);
-CreateHBufCFromJavaStringLC(
+CleanupStack::Pop(tmpCaption);
-aEnv, (jstring)aEnv->GetObjectArrayElement(aAppNames, i));
+//LOG1(EJavaInstaller, EInfo,
-captionsArray.AppendL(tmpCaption);
+//     "RegisterApplicationL: language %d", tmpLanguage);
-CleanupStack::Pop(tmpCaption);
+//LOG_TDESC_L(EJavaInstaller, EInfo,
-//LOG1(EJavaInstaller, EInfo,
+//            "RegisterApplicationL: caption %S", tmpCaption->Des());
-//     "RegisterApplicationL: language %d", tmpLanguage);
+CCaptionAndIconInfo *tmpCaptionAndIconInfo =
-//LOG_TDESC_L(EJavaInstaller, EInfo,
+CCaptionAndIconInfo::NewLC(
-//            "RegisterApplicationL: caption %s", tmpCaption->Des());
+/*aCaption=*/ *tmpCaption,
-CCaptionAndIconInfo *tmpCaptionAndIconInfo =
+/*aIconFileName=*/ KNullDesC,
-CCaptionAndIconInfo::NewLC(
+/*aNumOfAppIcons=*/ 0);
-/*aCaption=*/ *tmpCaption,
+CLocalizableAppInfo *tmpLocAppInfo =
-/*aIconFileName=*/ KNullDesC,
+CLocalizableAppInfo::NewLC(
-/*aNumOfAppIcons=*/ 0);
+/*aShortCaption=*/ KNullDesC,
-CLocalizableAppInfo *tmpLocAppInfo =
+/*aApplicationLanguage=*/ tmpLanguage,
-CLocalizableAppInfo::NewLC(
+/*aGroupName=*/ KNullDesC,
-/*aShortCaption=*/ KNullDesC,
+/*aCaptionAndIconInfo=*/ tmpCaptionAndIconInfo,
-/*aApplicationLanguage=*/ tmpLanguage,
+/*aViewDataList=*/ viewDataList);
-/*aGroupName=*/ KNullDesC,
+localizableAppInfoList.AppendL(tmpLocAppInfo);
-/*aCaptionAndIconInfo=*/ tmpCaptionAndIconInfo,
+CleanupStack::Pop(tmpLocAppInfo);
-/*aViewDataList=*/ viewDataList);
+CleanupStack::Pop(tmpCaptionAndIconInfo);
-localizableAppInfoList.AppendL(tmpLocAppInfo);
+}
-CleanupStack::Pop(tmpLocAppInfo);
+aEnv->ReleaseIntArrayElements(aLanguages, languages, 0);
-CleanupStack::Pop(tmpCaptionAndIconInfo);
-}
-aEnv->ReleaseIntArrayElements(aLanguages, languages, 0);
-}
-else
-{
-WLOG2(EJavaInstaller,
-"RegisterApplicationL: localisation not made because language " \
-"count does not match to caption count (%d != %d)",
-langCount, captionCount);
-}
 // Create application registration data objects.
 TApplicationCharacteristics appCharacteristics;
 appCharacteristics.iAttributes = TApaAppCapability::ENonNative;
 appCharacteristics.iEmbeddability = TApplicationCharacteristics::ENotEmbeddable;
 CleanupStack::PopAndDestroy(groupName);
 CleanupStack::PopAndDestroy(appFilename);
 CleanupStack::PopAndDestroy(caption);
 __UHEAP_MARKEND;
 }
-#else
-void RegisterApplicationL(
-JNIEnv *, RSoftwareComponentRegistry *, jint, jint, jstring,
-jstring, jstring, jstring, jint, jintArray, jobjectArray)
-{
-}
-#endif // RD_JAVA_USIF_APP_REG
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Method:    _registerApplication
 * Signature: (IIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I[I[Ljava/lang/String;)I
 */
 void RegisterLocalizedComponentNameL(
 JNIEnv *aEnv, RSoftwareComponentRegistry *aScr, jint aComponentId,
 jstring aName, jstring aVendor, jint aLanguage)
 {
-if (NULL != aName)
+HBufC *name = CreateHBufCFromJavaStringLC(aEnv, aName);
-{
+aScr->SetComponentNameL(aComponentId, *name, (TLanguage)aLanguage);
-HBufC *name = CreateHBufCFromJavaStringLC(aEnv, aName);
+CleanupStack::PopAndDestroy(name);
-aScr->SetComponentNameL(aComponentId, *name, (TLanguage)aLanguage);
-CleanupStack::PopAndDestroy(name);
+HBufC *vendor = CreateHBufCFromJavaStringLC(aEnv, aVendor);
-}
+aScr->SetVendorNameL(aComponentId, *vendor, (TLanguage)aLanguage);
+CleanupStack::PopAndDestroy(vendor);
-if (NULL != aVendor)
-{
-HBufC *vendor = CreateHBufCFromJavaStringLC(aEnv, aVendor);
-aScr->SetVendorNameL(aComponentId, *vendor, (TLanguage)aLanguage);
-CleanupStack::PopAndDestroy(vendor);
-}
 }
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Method:    _registerLocalizedComponentName
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Method:    _getComponentIdForApp
 * Signature: (IILcom/nokia/mj/impl/installer/applicationregistrator/ComponentId;)I
 */
-#ifdef RD_JAVA_USIF_APP_REG
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1getComponentIdForApp
 (JNIEnv *aEnv, jclass, jint aSessionHandle, jint aAppUid, jobject aComponentId)
 {
 TInt err = KErrNone;
 __UHEAP_MARK;
 jmethodID methodSetId = aEnv->GetMethodID(clazz, "setId", "(I)V");
 aEnv->CallVoidMethod(aComponentId, methodSetId, componentId);
 }
 return err;
 }
-#else
-JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1getComponentIdForApp
-(JNIEnv *, jclass, jint, jint, jobject)
-{
-return KErrNone;
-}
-#endif // RD_JAVA_USIF_APP_REG
 /**
 * See JNI method __1getuid.
 * This method makes calls that may leave.
 */
 // Create a new tmporary instance of RSoftwareComponentRegistry.
 RSoftwareComponentRegistry *pScr = CreateScrL();
 CleanupClosePushL(*pScr);
 TInt uid = 0;
 CPropertyEntry *property = pScr->GetComponentPropertyL(aCid, KUid());
-if (NULL != property)
+uid = ((CIntPropertyEntry*)property)->IntValue();
-{
+delete property;
-if (property->PropertyType() == CPropertyEntry::EIntProperty)
-{
-uid = ((CIntPropertyEntry*)property)->IntValue();
-}
-else
-{
-ELOG2(EJavaInstaller,
-"GetUidL: Incorrect property type %d for cid %d",
-property->PropertyType(), aCid);
-}
-delete property;
-}
 // Close and delete the temporary RSoftwareComponentRegistry.
 CleanupStack::PopAndDestroy(pScr);
 delete pScr; // For some reason PopAndDestroy does not delete this.
 return uid;
 }
 void LogComponentL(JNIEnv *aEnv, RSoftwareComponentRegistry *aScr, jstring aGlobalId, TLanguage aLanguage)
 {
 HBufC *globalId = CreateHBufCFromJavaStringLC(aEnv, aGlobalId);
 CComponentEntry *componentEntry =
 aScr->GetComponentL(*globalId, Usif::KSoftwareTypeJava, aLanguage);
-if (NULL == componentEntry)
-{
-//LOG_TDESC_L(EJavaInstaller, EInfo,
-//            "Component not found for GlobalId %s", globalId->Des());
-CleanupStack::PopAndDestroy(globalId);
-return;
-}
 CleanupStack::PopAndDestroy(globalId);
 // Log component entry.
 TComponentId componentId = componentEntry->ComponentId();
-LOG_TDESC_L(EJavaInstaller, EInfo, "GlobalId: %s", componentEntry->GlobalId());
+LOG_TDESC_L(EJavaInstaller, EInfo, "GlobalId: %S", componentEntry->GlobalId());
 LOG1(EJavaInstaller, EInfo, "ComponentId: %d", componentId);
-LOG_TDESC_L(EJavaInstaller, EInfo, "SoftwareType: %s", componentEntry->SoftwareType());
+LOG_TDESC_L(EJavaInstaller, EInfo, "SoftwareType: %S", componentEntry->SoftwareType());
-LOG_TDESC_L(EJavaInstaller, EInfo, "Name: %s", componentEntry->Name());
+LOG_TDESC_L(EJavaInstaller, EInfo, "Name: %S", componentEntry->Name());
-LOG_TDESC_L(EJavaInstaller, EInfo, "Vendor: %s", componentEntry->Vendor());
+LOG_TDESC_L(EJavaInstaller, EInfo, "Vendor: %S", componentEntry->Vendor());
-LOG_TDESC_L(EJavaInstaller, EInfo, "Version: %s", componentEntry->Version());
+LOG_TDESC_L(EJavaInstaller, EInfo, "Version: %S", componentEntry->Version());
 LOG1(EJavaInstaller, EInfo, "ComponentSize: %d", componentEntry->ComponentSize());
 LOG1(EJavaInstaller, EInfo, "ScomoState: %d", componentEntry->ScomoState());
 LOG1(EJavaInstaller, EInfo, "IsDrmProtected: %d", componentEntry->IsDrmProtected());
 LOG1(EJavaInstaller, EInfo, "IsHidden: %d", componentEntry->IsHidden());
 LOG1(EJavaInstaller, EInfo, "IsKnownRevoked: %d", componentEntry->IsKnownRevoked());
 {
 CPropertyEntry *propertyEntry = properties[i];
 switch (propertyEntry->PropertyType())
 {
 case CPropertyEntry::EBinaryProperty:
-LOG_TDESC_L(EJavaInstaller, EInfo, "BinaryProperty: %s",
+LOG_TDESC_L(EJavaInstaller, EInfo, "BinaryProperty: %S",
 propertyEntry->PropertyName());
 break;
 case CPropertyEntry::EIntProperty:
-LOG_TDESC_L(EJavaInstaller, EInfo, "IntProperty: %s",
+LOG_TDESC_L(EJavaInstaller, EInfo, "IntProperty: %S",
 propertyEntry->PropertyName());
 LOG2(EJavaInstaller, EInfo, "  = 0x%x (%d)",
 ((CIntPropertyEntry*)propertyEntry)->IntValue(),
 ((CIntPropertyEntry*)propertyEntry)->IntValue());
 break;
 case CPropertyEntry::ELocalizedProperty:
-LOG_TDESC_L(EJavaInstaller, EInfo, "LocalizedProperty: %s",
+LOG_TDESC_L(EJavaInstaller, EInfo, "LocalizedProperty: %S",
 propertyEntry->PropertyName());
-LOG_TDESC_L(EJavaInstaller, EInfo, " = %s",
+LOG_TDESC_L(EJavaInstaller, EInfo, " = %S",
 ((CLocalizablePropertyEntry*)propertyEntry)->StrValue());
 break;
 }
 }
 CleanupStack::PopAndDestroy(&properties);
-#ifdef RD_JAVA_USIF_APP_REG
 // Log uids of applications associated to component.
 RArray<TUid> appUids;
 CleanupClosePushL(appUids);
 aScr->GetAppUidsForComponentL(componentId, appUids);
-if (appUids.Count() == 0)
+LOG1(EJavaInstaller, EInfo, "Number of AppUids found: %d", appUids.Count());
-{
-LOG(EJavaInstaller, EInfo, "No component appUids found from SCR");
-}
 for (TInt i = 0; i < appUids.Count(); i++)
 {
 LOG2(EJavaInstaller, EInfo, "AppUid [%x] (%d)",
 appUids[i].iUid, appUids[i].iUid);
 }
 CleanupStack::PopAndDestroy(&appUids);
-#endif // RD_JAVA_USIF_APP_REG
 }
 /**
 * See JNI method __1logComponent.
 * This method makes calls that may leave.
 * Signature: (ILjava/lang/String;)I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1logComponent
 (JNIEnv *aEnv, jclass, jint aSessionHandle, jstring aGlobalId)
 {
-__UHEAP_MARK;
+//__UHEAP_MARK;
 RSoftwareComponentRegistry *pScr =
 reinterpret_cast<RSoftwareComponentRegistry*>(aSessionHandle<<2);
 TRAPD(err, LogComponentL(aEnv, pScr, aGlobalId));
-__UHEAP_MARKEND;
+//__UHEAP_MARKEND;
 return err;
 }
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1getUsifMode
 (JNIEnv *, jclass)
 {
-#ifdef RD_JAVA_USIF_APP_REG
 return 1;
-#else
+}
-return 0;
-#endif // RD_JAVA_USIF_APP_REG
+/*
+* Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
+* Method:    _getErrorCategory
+* Signature: (I)I
+*/
+JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1getErrorCategory
+(JNIEnv *, jclass, jint aErrorId)
+{
+int errorCategory = Usif::EUnexpectedError;
+switch (aErrorId)
+{
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_NO_MEM:
+errorCategory = Usif::ELowDiskSpace;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_NO_NET:
+errorCategory = Usif::ENetworkUnavailable;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_CORRUPT_PKG:
+errorCategory = Usif::ECorruptedPackage;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_COMPAT_ERR:
+errorCategory = Usif::EApplicationNotCompatible;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_AUTHORIZATION_ERR:
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_AUTHENTICATION_ERR:
+errorCategory = Usif::ESecurityError;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_PUSH_REG_ERR:
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_UNEXPECTED_ERR:
+case com_nokia_mj_impl_utils_InstallerErrorMessage_UNINST_UNEXPECTED_ERR:
+case com_nokia_mj_impl_utils_InstallerErrorMessage_OTHER_UNEXPECTED_ERR:
+errorCategory = Usif::EUnexpectedError;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_INST_CANCEL:
+case com_nokia_mj_impl_utils_InstallerErrorMessage_UNINST_CANCEL:
+errorCategory = Usif::EUserCancelled;
+break;
+case com_nokia_mj_impl_utils_InstallerErrorMessage_UNINST_NOT_ALLOWED:
+errorCategory = Usif::EUninstallationBlocked;
+break;
+}
+return errorCategory;
 }
 #else // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 /*
 return KErrNone;
 }
 /*
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
-* Method:    _registerJavaSoftwareType
-* Signature: (Z)I
-*/
-JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1registerJavaSoftwareType
-(JNIEnv *, jclass, jboolean)
-{
-return KErrNone;
-}
-/*
-* Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Method:    _startSession
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1startSession
 (JNIEnv *, jclass, jboolean)
 * Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
 * Method:    _registerComponent
 * Signature: (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;JZZZZLcom/nokia/mj/impl/installer/applicationregistrator/ComponentId;)I
 */
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1registerComponent
-(JNIEnv *, jclass, jint, jint, jstring, jstring, jstring, jstring, jstring,
+(JNIEnv *, jclass, jint, jint, jstring, jstring, jstring, jstring,
-jobjectArray, jlong, jboolean, jboolean, jboolean, jboolean, jint, jstring,
+jobjectArray, jlong, jboolean, jboolean, jboolean, jboolean, jint,
-jstring, jstring, jobject)
+jstring, jstring, jstring, jstring, jobject)
 {
 return KErrNone;
 }
 /*
 (JNIEnv *, jclass)
 {
 return 0;
 }
+/*
+* Class:     com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator
+* Method:    _getErrorCategory
+* Signature: (I)I
+*/
+JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_SifRegistrator__1getErrorCategory
+(JNIEnv *, jclass, jint)
+{
+return 0;
+}
 #endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK

branch	RCL_3
changeset 60	6c158198356e
parent 25	9ac0a0a7da70
child 83	26b2b12093af