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

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 #include <apacmdln.h>
 #include <centralrepository.h>
 #include <AknUtils.h>
 #include <hal.h>
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include <SWInstLogTaskParam.h>
+#include <SWInstTask.h>
+#include <SWInstTaskManager.h>
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <apgicnfl.h>
 #else
 #include <apgicnflpartner.h>
 #endif
 #include "javacommonutils.h"
 #include "logger.h"
 // NAMESPACE DECLARATION
 using namespace java;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+using namespace SwiUI;
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+IMPORT_C HBufC* CreateHBufCFromJavaStringLC(JNIEnv* aEnv, jstring aString);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 /**
 * MIDP Stub SIS file UID. The application type Uid for MIDlets in S60
 */
 const TUid KMidletApplicationTypeUid = { 0x10210E26 };
 /**
 * Postfix for the fake application name generated only to make AppArc happy
 */
 _LIT(KAppPostfix, ".fakeapp");
+#ifdef RD_JAVA_S60_RELEASE_9_2
+const TInt KAppIconCount = 2;
+#else
+const TInt KAppIconCount = 1;
+#endif
 // ------------------------
 /**
 * Internal wrapper method that is used to make TRAPping the leaves in the
 jint aUid, HBufC16 *aGroupName, HBufC16 *aMIDletName, HBufC16 *aTargetDrive,
 HBufC16 *aIconFileName, HBufC16 *aJarFileName, jboolean aHidden,
 jboolean aBackground);
 /**
-* Internal helper method for checking whether Application Shell is already running
-* Used JNI method ...1startAppShellUi
-*
-* @return ETrue if AppShell is running
-*/
-TBool isAppShellUiRunning();
-/**
 * Internal helper method for checking whether this code is executing in
 * a device that has correctly working version of
 * RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL()
 *
 * @return ETrue if force commit works well
 */
 TBool isForceCommitSupported();
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+/**
+* Internal helper method for checking whether Application Shell is already running
+* Used JNI method ...1startAppShellUi
+*
+* @return ETrue if AppShell is running
+*/
+TBool isAppShellUiRunning();
 /**
 * Internal helper method for starting menu application
 *
 * @return KErrNone or Symbian error code
 {
 // Cannot connect to AppArc server
 return err;
 }
-#if 1
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-//#ifndef RD_JAVA_USIF_APP_REG
 // Delete any pending (un)registrations (possible if
 // e.g. device rebooted before commit).
 // This call does nothing if there is no pending registrations.
 // Ignore errors.
 (void)pApaSession->RollbackNonNativeApplicationsUpdates();
 {
 // Close session and return error
 pApaSession->Close();
 return err;
 }
-#endif // RD_JAVA_USIF_APP_REG
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 // Return handle to session. Utilize the fact that in Symbian
 // all pointer addresses are MOD 4 so the last 2 bits are 0
 // and can be shifted out. This way the returned handle is
 // always positive whereas Symbian error codes are always negative.
 * @param[in] aJarFileName The full path name of the jar file
 * @param[in] aHidden
 * @param[in] aBackground
 * @return 0 if registration succeeded or Symbian error code
 */
-#if 0
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-//#ifdef RD_JAVA_USIF_APP_REG
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1registerApplication
 (JNIEnv */*aEnv*/, jclass /*aClass*/, jint /*aSessionHandle*/, jint /*aUid*/, jstring /*aGroupName*/,
 jstring /*aMIDletName*/, jstring /*aTargetDrive*/, jstring /*aIconFileName*/,
 jstring /*aJarFileName*/, jboolean /*aHidden*/, jboolean /*aBackground*/)
 {
 return KErrNone;
 }
-#else
+#else // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1registerApplication
 (JNIEnv *aEnv, jclass aClass, jint aSessionHandle, jint aUid, jstring aGroupName,
 jstring aMIDletName, jstring aTargetDrive, jstring aIconFileName,
 jstring aJarFileName, jboolean aHidden, jboolean aBackground)
 {
 delete unicodeTargetDrive;
 delete unicodeJarFileName;
 return err;
 }
-#endif // RD_JAVA_USIF_APP_REG
 /**
 * See JNI method __1registerApplication.
 * This method makes all calls that may leave (the actual registering)
 {
 RFs         fileServ;
 RFile       appArcIcon;
 TUid        midletUid;
 TInt        err;
-TInt        numberOfIcons = 1; // Conversion results always one icon in mbm.
+TInt        numberOfIcons = KAppIconCount; // number of icons stored in MBM
 // Also default mbm has one icon.
 midletUid.iUid = aUid;
 // AppArc requires open RFile handle
 // close file server connection
 CleanupStack::PopAndDestroy(&fileServ);
 return err;
 }
+#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 /**
 * Unregisters Java Application from S60 AppArc
 *
 * @param[in] aSessionHandle
 * @param[in] aUid The Uid of the application to be unregistered..
 * @return 0 if unregistration succeeded or Symbian error code
 */
-#if 0
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-//#ifdef RD_JAVA_USIF_APP_REG
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1unregisterApplication
 (JNIEnv *, jclass, jint /*aSessionHandle*/, jint /*aUid*/)
 {
 return KErrNone;
 }
-#else
+#else // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1unregisterApplication
 (JNIEnv *, jclass, jint aSessionHandle, jint aUid)
 {
 // Convert session handle to pointer.
 RApaLsSession *pApaSession =
 TUid appUid;
 appUid.iUid = aUid;
 TRAPD(err, pApaSession->DeregisterNonNativeApplicationL(appUid));
 return err;
 }
-#endif // RD_JAVA_USIF_APP_REG
+#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 /**
 * Commits native application registration session.
 * If commit succeeds the native session is closed.
 RApaLsSession *pApaSession =
 reinterpret_cast<RApaLsSession*>(aSessionHandle<<2);
 TInt err = KErrNone;
-#if 1
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-//#ifndef RD_JAVA_USIF_APP_REG
 if (aSynchronous)
 {
 // Make synchronous commit
 TRAP(err, pApaSession->CommitNonNativeApplicationsUpdatesL());
 if (KErrNone == err)
 {
 #ifdef __WINS__
 // Use always this synchronous commit when running in emulator
 // to make writing autotest cases easier.
 TRAP(err, pApaSession->CommitNonNativeApplicationsUpdatesL());
-#else
+#else // __WINS__
 // asynchronous commit
 TRAP(err, pApaSession->ForceCommitNonNativeApplicationsUpdatesL());
 #endif // __WINS__
 }
-#endif // RD_JAVA_USIF_APP_REG
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 if (KErrNone == err)
 {
 pApaSession->Close();
 delete pApaSession;
 // Convert session handle to pointer.
 RApaLsSession *pApaSession =
 reinterpret_cast<RApaLsSession*>(aSessionHandle<<2);
 TInt err = KErrNone;
-#if 1
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-//#ifndef RD_JAVA_USIF_APP_REG
 err = pApaSession->RollbackNonNativeApplicationsUpdates();
-#endif // RD_JAVA_USIF_APP_REG
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 pApaSession->Close();
 delete pApaSession;
 return err;
 }
 return JNI_FALSE;
 #endif
 }
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 /**
 * Internal helper method for checking whether this code is executing in
 * a device that has correctly working version of
 * RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL()
 *
 else
 {
 return EFalse;
 }
 }
+#endif // !SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+/**
+* See JNI method __1logComponent.
+* This method makes calls that may leave.
+*/
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+void AddInstallLogEntryL(
+JNIEnv */*aEnv*/, jint /*aAction*/, jint /*aUid*/,
+jstring /*aName*/, jstring /*aVendor*/,
+jint /*aMajorVersion*/, jint /*aMinorVersion*/, jint /*aMicroVersion*/)
+{
+}
+#else
+void AddInstallLogEntryL(
+JNIEnv *aEnv, jint aAction, jint aUid, jstring aName, jstring aVendor,
+jint aMajorVersion, jint aMinorVersion, jint aMicroVersion)
+{
+TUid uid = TUid::Uid(aUid);
+HBufC *name = CreateHBufCFromJavaStringLC(aEnv, aName);
+HBufC *vendor = CreateHBufCFromJavaStringLC(aEnv, aVendor);
+TVersion version(aMajorVersion, aMinorVersion, aMicroVersion);
+// Create log task object.
+CTask* task = CTask::NewL(KLogTaskImplUid, EFalse);
+CleanupStack::PushL(task);
+// Initalize log task parameters.
+TLogTaskParam params;
+params.iName.Copy(name->Left(KMaxLogNameLength));
+params.iVendor.Copy(vendor->Left(KMaxLogVendorLength));
+params.iVersion = version;
+params.iUid = uid;
+// Time must be universal time.
+TTime time;
+time.UniversalTime();
+params.iTime = time;
+params.iAction = (TLogTaskAction)aAction;
+params.iIsStartup = EFalse; // Startup list was not modified.
+TLogTaskParamPckg pckg(params);
+task->SetParameterL(pckg, 0);
+// Create log task manager.
+CTaskManager* taskManager = CTaskManager::NewL();
+CleanupStack::PushL(taskManager);
+// Add the log task to the task list.
+taskManager->AddTaskL(task);
+taskManager->ExecutePendingTasksL();
+// Cleanup.
+CleanupStack::PopAndDestroy(taskManager);
+CleanupStack::Pop(task);
+CleanupStack::PopAndDestroy(vendor);
+CleanupStack::PopAndDestroy(name);
+}
+#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+/**
+* Adds an entry to platform installation log.
+*/
+JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1addInstallLogEntry
+(JNIEnv *aEnv, jclass, jint aAction, jint aUid, jstring aName, jstring aVendor,
+jint aMajorVersion, jint aMinorVersion, jint aMicroVersion)
+{
+TRAPD(err, AddInstallLogEntryL(
+aEnv, aAction, aUid, aName, aVendor,
+aMajorVersion, aMinorVersion, aMicroVersion));
+return err;
+}

branch	RCL_3
changeset 60	6c158198356e
parent 24	0fd27995241b
child 83	26b2b12093af