FCL/sf/app/jrt: comparison javamanager/preinstaller/src.s60/silentmidletinstall.cpp

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description:  OMJ S60 preinstaller process
+* Description:  OMJ Symbian preinstaller process
 *
 */
 #include <e32base.h>
 #include <javastoragenames.h>
 #include <utf.h>
 #include "silentmidletinstall.h"
 #include "javacommonutils.h"
+#include "javauid.h"
+#include "javauids.h"
 #include "logger.h"
 #include "javaprocessconstants.h"
 #include "javasymbianoslayer.h"
 using namespace java::storage;
 const int NO_PREINSTALL = 2;
 _LIT(KMidletName, "MIDlet-Name");
 _LIT(KMidletVendor, "MIDlet-Vendor");
 _LIT(KMidletVersion, "MIDlet-Version");
+_LIT(KMidletUid, "Nokia-MIDlet-UID-1");
 _LIT(KJadExtension, "*.jad");
 // Java Installer Integrity Service journal file name
 _LIT(KISJournalFile, "\\private\\102033E6\\installer\\is\\isjournal.dat");
 *
 * @exception If the method is not able to allocate necessary buffers.
 */
 void CSilentMIDletInstall::ConstructL()
 {
-JELOG2(EJavaPreinstaller);
 iMIDletName = HBufC::NewL(KMaxBufferSize);
 iMIDletVendor = HBufC::NewL(KMaxBufferSize);
+iMIDletUid = HBufC::NewL(KMaxBufferSize);
 iPreinstallServer = new(ELeave) PreinstallCommsServer();
 iNumberOfAppsToInstall = 0;
 iISRollbackNeeded = EFalse;
 }
 * Deletes this object.
 * All allocated resources are released.
 */
 CSilentMIDletInstall::~CSilentMIDletInstall()
 {
-JELOG2(EJavaPreinstaller);
 iJadFiles.ResetAndDestroy();
 iJadFiles.Close();
 iDirs.ResetAndDestroy();
 iDirs.Close();
 iMIDletName = NULL;
 delete iMIDletVendor;
 iMIDletVendor = NULL;
+delete iMIDletUid;
+iMIDletUid = NULL;
 delete iPreinstallServer;
 iPreinstallServer = NULL;
 }
 /**
 * To start silent preinstallations.
 */
 void CSilentMIDletInstall::Start()
 {
-JELOG2(EJavaPreinstaller);
 iState = EFindOutDeviceDrives;
 // Check if an explicit roll-back of a previous installation is needed
 // in the case there is nothing to pre-install (if there is something
 // to pre-install, the potential roll-back is done automatically)
 * - iStatus == KErrNone
 * - IsActive() == ETrue
 */
 void CSilentMIDletInstall::CompleteRequest()
 {
-JELOG2(EJavaPreinstaller);
 TRequestStatus *status = &iStatus;
 User::RequestComplete(status, KErrNone);
 if (!IsActive())
 {
 SetActive();
 *  - exit
 *
 */
 void CSilentMIDletInstall::RunL()
 {
-JELOG2(EJavaPreinstaller);
 switch (iState)
 {
 case EFindOutDeviceDrives:
 {
 LOG(EJavaPreinstaller, EInfo,
 pathPtr.Append(aDirectory);
 pathPtr.Append(name);
 LOG1WSTR(EJavaPreinstaller, EInfo,
 "CSilentMIDletInstall::GetDirEntriesL Adding file %s",
 (wchar_t *)(pathPtr.PtrZ()));
-aVector.Append(path);
+aVector.AppendL(path);
 CleanupStack::Pop(path);
 }
 CleanupStack::PopAndDestroy(entries);
 }
 }
 /**
 * Parse MIDlet-Name, MIDlet-Vendor and MIDlet-Version parameters from JAD file.
 * Parameters are used to determine whether to pre-install MIDlet or not.
+* Parse also optional Nokia-MIDlet-UID-1 in case it is needed.
 *
 * @param ETrue if parsing succeeds otherwise EFalse.
 */
 TBool CSilentMIDletInstall::ParseJadL(const TDesC& aJadFileName)
 {
-JELOG2(EJavaPreinstaller);
 HBufC *jadContent = NULL;
 // Trap leave thrown if reading jad content fails
 TRAPD(err, jadContent = GetJadContentL(aJadFileName));
 if (KErrNone != err)
 {
 delete midletVersion;
 LOG3(EJavaPreinstaller, EInfo,
 "CSilentMIDletInstall::ParseJadL MIDlet-Version is %d.%d.%d",
 iMIDletVersion.iMajor, iMIDletVersion.iMinor, iMIDletVersion.iBuild);
+HBufC *midletUid = ParseAttribute(jadContent, KMidletUid);
+if (NULL == midletUid)
+{
+// Ok, all MIDlets do not predefine Symbian Uid
+iMIDletUid->Des().Zero();
+}
+else
+{
+// store midlet Uid to member variable and log it
+TPtr uidPtr(iMIDletUid->Des());
+uidPtr.Copy(*midletUid);
+LOG1WSTR(EJavaPreinstaller, EInfo,
+"CSilentMIDletInstall::ParseJadL Nokia-MIDlet-UID-1 %s",
+(wchar_t *)(uidPtr.PtrZ()));
+delete midletUid;
+}
 CleanupStack::PopAndDestroy(jadContent);
 return ETrue;
 }
 // Do not preinstall application if it is found from this table with state
 // NO_PREINSTALL.
 // Do not preinstall application if it is found from this table
 // and the version number of the application is the same or less
 // than the version number in the table.
+// If the application has been removed by javaupgradeupp or it has
+// not yet been installed, the application is not in the table at all.
+// Do not preinstall the application if there is a native application
+// with the same Uid as the predefined Uid of the first Java
+// application in the application suite.
+TBool            apaSessionConnected(EFalse);
+RApaLsSession    apaSession;
 JavaStorageEntry attribute;
 JavaStorageApplicationEntry_t findPattern;
-JavaStorageApplicationList_t foundEntries;
+JavaStorageApplicationList_t  foundEntries;
 for (TInt i = 0; i < iJadFiles.Count(); i++)
 {
 if (ParseJadL(*iJadFiles[i]))
 {
 if (installState == NO_PREINSTALL)
 {
 // This application must not be preinstalled
 LOG1WSTR(EJavaPreinstaller, EInfo,
 "CheckWhichAppsShouldBeInstalledL: User has removed application %s "
 "It must not be preinstalled again.", desToWstring(namePtr));
 }
 else
 {
 // We like to know application VERSION
 attribute.setEntry(VERSION, L"");
 }
 }
 else
 {
 skipInstall = EFalse;
 LOG(EJavaPreinstaller, EInfo,
 "CheckWhichAppsShouldBeInstalledL: Application has not "
 "been installed previously");
+// Check whether there is a native application installed
+// with the same Uid as the predefined Uid of the first
+// Java application in the suite.
+// The string value of attribute Nokia-MIDlet-UID-1 from
+// Jad file is in iMIDletUid if it was defined.
+TInt err = KErrNone;
+if (iMIDletUid->Length() > 0)
+{
+if (!apaSessionConnected)
+{
+err = apaSession.Connect();
+apaSessionConnected = ETrue;
+}
+// If the presence of a possible native app cannot be
+// determined, let Java Installer try to install
+// the Java application
+if (KErrNone == err)
+{
+skipInstall = IsNativeAppPresent(apaSession);
+}
+}
 }
 foundEntries.clear();
 }
 else
 {
 // If Jad parsing fails don't preinstall this
 skipInstall = ETrue;
 TPtr16 ptrJadName = iJadFiles[i]->Des();
 ELOG1WSTR(EJavaPreinstaller,
 "CheckWhichAppsShouldBeInstalledL: Parsing JAD %s failed",
 desToWstring(ptrJadName));
 }
 if (skipInstall)
 {
 delete iJadFiles[i];
 }
 else
 {
 iNumberOfAppsToInstall++;
 }
+}
+if (apaSessionConnected)
+{
+apaSession.Close();
 }
 js->close();
 }
 "DesToAppVersion suspicious midlet version, end has extra non number characters");
 }
 return midletVersion;
 } // DesToAppVersion
+/**
+* Parses the Uid in iMIDletUid and returns ETrue if there is a native
+* application with the same Uid installed into the device.
+* Returns EFalse in case of any error.
+*
+* @param[in] aApaSession open AppArc session
+* @return EFalse if no native application with Uid in iMIDletUid
+*/
+TBool CSilentMIDletInstall::IsNativeAppPresent(const RApaLsSession& aApaSession)
+{
+std::wstring uidValue((wchar_t *)(iMIDletUid->Ptr()), iMIDletUid->Length());
+TUid appUid;
+Uid javaUid(uidValue);
+TInt err = uidToTUid(javaUid, appUid);
+if (KErrNone != err)
+{
+WLOG1(EJavaPreinstaller,
+"CSilentMIDletInstall::IsNativeAppPresent: Cannot convert %S to TUid",
+uidValue.c_str());
+return EFalse;
+}
+TUid appTypeUid;
+err = aApaSession.GetAppType(appTypeUid, appUid);
+if (KErrNone != err)
+{
+if (KErrNotFound == err)
+{
+// No such application in device
+return EFalse;
+}
+// Cannot check presence from AppArc
+ELOG1(EJavaPreinstaller,
+"CSilentMIDletInstall::IsNativeAppPresent: RApaLsSession GetAppType error %d", err);
+return EFalse;
+}
+if (appTypeUid.iUid != KMidletApplicationTypeUid)
+{
+// The application is present and it is not a MIDlet
+return ETrue;
+}
+return EFalse;
+} // IsNativeAppPresent

branch	RCL_3
changeset 60	6c158198356e
parent 19	04becd199f91
child 77	7cee158cb8cd