FCL/sf/app/jrt: comparison javamanager/javainstaller/installer/javasrc.s60/com/nokia/mj/impl/installer/applicationregistrator/SifRegistrator.java

equal deleted inserted replaced

-:35baca0e7a2e
+:023eef975703
 /*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 {
 return _getUsifMode();
 }
 /**
+* Returns SIF specific error category from given error id.
+*/
+public static int getErrorCategory(int aErrorId)
+{
+return _getErrorCategory(aErrorId);
+}
+/**
 * Launches the application view. If launching application view
 * fails this method does not throw exception but produces an
 * error log entry.
 */
 public static void launchAppView()
 // negative Symbian error code if it fails.
 int ret = _startSession(aTransaction);
 if (ret < 0)
 {
 InstallerException.internalError(
-"Creating session failed with code " + ret);
+"Creating SIF session failed with code " + ret);
 }
 //Log.log("SifRegistrator session started");
 iSessionHandle = ret;
 }
 * @see startSession
 * @see SuiteInfo
 */
 public void registerSuite(SuiteInfo aSuiteInfo, boolean aIsUpdate)
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 Log.log("SifRegistrator registering application suite " +
 aSuiteInfo.getGlobalId());
-if (_getUsifMode() > 0)
+// Register suite as a component.
-{
+registerComponent(aSuiteInfo, aIsUpdate);
-// USIF Phase 2 registration.
+registerLocalizedComponentName(aSuiteInfo, -1);
-// Register suite as a component.
+// Register applications within the component.
-registerComponent(aSuiteInfo, aIsUpdate);
+Vector apps = aSuiteInfo.getApplications();
-registerLocalizedComponentName(aSuiteInfo, -1);
+for (int i = 0; i < apps.size(); i++)
-// Register applications within the component.
+{
-Vector apps = aSuiteInfo.getApplications();
+registerApplication(aSuiteInfo, i);
-for (int i = 0; i < apps.size(); i++)
-{
-registerApplication(aSuiteInfo, i);
-}
-}
-else
-{
-// USIF Phase 1 registration.
-// Register each application in the suite.
-Vector apps = aSuiteInfo.getApplications();
-for (int i = 0; i < apps.size(); i++)
-{
-registerComponent(aSuiteInfo, i, aIsUpdate);
-registerLocalizedComponentName(aSuiteInfo, i);
-}
 }
 registerLocalizedProperties(aSuiteInfo);
 }
 /**
 * @see startSession
 * @see SuiteInfo
 */
 public void unregisterSuite(SuiteInfo aSuiteInfo)
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 Log.log("SifRegistrator unregistering application suite " +
 aSuiteInfo.getGlobalId());
-if (_getUsifMode() > 0)
+// Unregister suite as a component.
-{
+unregisterComponent(aSuiteInfo);
-// USIF Phase 2 unregistration.
-// Unregister suite as a component.
-unregisterComponent(aSuiteInfo);
-}
-else
-{
-// USIF Phase 1 unregistration.
-// Unregister each application in the suite.
-Vector apps = aSuiteInfo.getApplications();
-for (int i = 0; i < apps.size(); i++)
-{
-unregisterComponent(aSuiteInfo, i);
-}
-}
 }
 /**
 * Commits the registrations and unregistrations.
 * Ends the current session if commit is successfull.
 *
 * @throws InstallerException if session cannot be committed
 */
 public void commitSession()
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 int err = _commitSession(iSessionHandle);
 if (err < 0)
 {
-InstallerException.internalError("Commiting session failed with code " + err);
+InstallerException.internalError("Commiting SIF session failed with code " + err);
 }
 // Current session has been closed
 iSessionHandle = 0;
 //Log.log("SifRegistrator session committed");
 }
 *
 * @throws InstallerException if session cannot be rolled back.
 */
 public void rollbackSession()
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 int err = _rollbackSession(iSessionHandle);
 // Session is closed always when rollback is called
 iSessionHandle = 0;
 if (err < 0)
 {
-InstallerException.internalError("Rolling back the session failed with code " + err);
+InstallerException.internalError("Rolling back SIF session failed with code " + err);
 }
 //Log.log("SifRegistrator session rolled back");
 }
 /**
 {
 if (0 == iSessionHandle)
 {
 return;
 }
 _closeSession(iSessionHandle);
 // Current session has been closed
 iSessionHandle = 0;
 //Log.log("SifRegistrator session closed");
 }
 * application with given global id cannot be found.
 * @throws InstallerException if an error occurs
 */
 public ComponentId getComponentId(String aGlobalId)
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 ComponentId result = new ComponentId();
 int ret = _getComponentId(iSessionHandle, aGlobalId, result);
 if (-1 == ret)
 {
 // Symbian error code KErrNotFound means that the
 * application with given uid cannot be found.
 * @throws InstallerException if an error occurs
 */
 public ComponentId getComponentId(Uid aAppUid)
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 ComponentId result = new ComponentId();
 int ret = _getComponentIdForApp(
 iSessionHandle, ((PlatformUid)aAppUid).getIntValue(), result);
 if (-1 == ret)
 {
 *
 * @param aGlobalId the global id for the application.
 */
 public void logComponent(String aGlobalId)
 {
-if (0 == iSessionHandle)
+checkSession();
-{
-InstallerException.internalError("No valid SIF session.");
-}
 int ret = _logComponent(iSessionHandle, aGlobalId);
 if (ret < -1)
 {
-Log.logError("SifRegistrator logComponent failed with code " + ret);
+Log.logError("SifRegistrator logComponent for " + aGlobalId +
+" failed with code " + ret);
 }
 }
 /*** ----------------------------- PACKAGE ---------------------------- */
 /*** ----------------------------- PRIVATE ---------------------------- */
 /**
-* Registers one Java application to S60 USIF as a component.
+* Checks if SifRegistrator session has been started.
-* Used with USIF Phase 1.
+* @throws InstallerException if SifRegistrator session has not been started
-*
+*/
-* @param aSuiteInfo Information needed to register the application
+private void checkSession()
-* @param aIndex index of the application in the suite
+{
-* @param aIsUpdate true in case of an update, false in case of a new
+if (iSessionHandle == 0)
-* installation
+{
-* @throws InstallerException if registration cannot done or
+InstallerException.internalError("No valid SIF session.");
-*  startSession has not been called successfully
-* @see startSession
-* @see SuiteInfo
-*/
-private void registerComponent(
-SuiteInfo aSuiteInfo, int aIndex, boolean aIsUpdate)
-{
-String globalId = aSuiteInfo.getGlobalId(aIndex);
-if (globalId == null)
-{
-Log.logWarning("SifRegistrator: Application with index " + aIndex +
-" not found from " + aSuiteInfo.getGlobalId());
-return;
-}
-ApplicationInfo appInfo =
-(ApplicationInfo)aSuiteInfo.getApplications().elementAt(aIndex);
-String suiteName = aSuiteInfo.getName();
-String vendor = aSuiteInfo.getVendor();
-String version = aSuiteInfo.getVersion().toString();
-String name = appInfo.getName();
-int uid = ((PlatformUid)appInfo.getUid()).getIntValue();
-String[] componentFiles = getComponentFiles(aSuiteInfo);
-long componentSize = aSuiteInfo.getInitialSize();
-String attrValue = aSuiteInfo.getAttributeValue("Nokia-MIDlet-Block-Uninstall");
-boolean isRemovable = !(attrValue != null && attrValue.equalsIgnoreCase("true"));
-boolean isDrmProtected = (aSuiteInfo.getContentInfo() == aSuiteInfo.CONTENT_INFO_DRM);
-boolean isOriginVerified = aSuiteInfo.isTrusted();
-String midletInfoUrl = aSuiteInfo.getAttributeValue("MIDlet-Info-URL");
-String midletDescription = aSuiteInfo.getAttributeValue("MIDlet-Description");
-String downloadUrl = aSuiteInfo.getAttributeValue("Nokia-MIDlet-Download-URL");
-ComponentId componentId = new ComponentId();
-int err = _registerComponent(
-iSessionHandle, uid,
-getScrString(suiteName), getScrString(vendor),
-getScrString(version), getScrString(name),
-getScrString(globalId), componentFiles,
-componentSize, isRemovable, isDrmProtected,
-isOriginVerified, aIsUpdate, aSuiteInfo.getMediaId(),
-getScrString(midletInfoUrl),
-getScrString(midletDescription),
-getScrString(downloadUrl),
-componentId);
-if (err < 0)
-{
-InstallerException.internalError(
-"Registering component " + globalId +
-" failed with code " + err);
-}
-else
-{
-appInfo.setComponentId(componentId);
-Log.log("SifRegistrator registered component " + globalId +
-" with id " + componentId.getId());
-}
-}
-/**
-* Unregisters one Java application from being S60 USIF component.
-* Used with USIF Phase 1.
-*
-* @param aSuiteInfo Information needed to unregister the application,
-* @param aIndex index of the application in the suite
-* @throws InstallerException if unregistration cannot done or
-*  startSession has not been called successfully
-* @see startSession
-* @see SuiteInfo
-*/
-private void unregisterComponent(SuiteInfo aSuiteInfo, int aIndex)
-{
-String globalId = aSuiteInfo.getGlobalId(aIndex);
-if (globalId == null)
-{
-Log.logWarning("SifRegistrator: Application with index " + aIndex +
-" not found from " + aSuiteInfo.getGlobalId());
-return;
-}
-ComponentId componentId = getComponentId(globalId);
-if (componentId == null)
-{
-Log.logWarning(
-"SifRegistrator unregistration failed, application " +
-globalId + " does not exist");
-return;
-}
-// Save component id to ApplicationInfo.
-ApplicationInfo appInfo =
-(ApplicationInfo)aSuiteInfo.getApplications().elementAt(aIndex);
-appInfo.setComponentId(componentId);
-// Unregister application.
-int err = _unregisterComponent(iSessionHandle, componentId.getId());
-if (err < 0)
-{
-InstallerException.internalError(
-"Unregistering component " + globalId +
-" failed with code " + err);
-}
-else
-{
-Log.log("SifRegistrator unregistered component " + globalId +
-" with id " + componentId.getId());
 }
 }
 /**
 * Registers Java application suite to S60 USIF as a component.
-* Used with USIF Phase 2.
 *
 * @param aSuiteInfo Suite information
 * @param aIsUpdate true in case of an update, false in case of a new
 * installation
 * @throws InstallerException if registration cannot done or
 {
 String globalId = aSuiteInfo.getGlobalId();
 String suiteName = aSuiteInfo.getName();
 String vendor = aSuiteInfo.getVendor();
 String version = aSuiteInfo.getVersion().toString();
-String name = null; // Set name to null so that suite name will be used.
 int uid = ((PlatformUid)aSuiteInfo.getUid()).getIntValue();
 String[] componentFiles = getComponentFiles(aSuiteInfo);
 long componentSize = aSuiteInfo.getInitialSize();
 String attrValue = aSuiteInfo.getAttributeValue("Nokia-MIDlet-Block-Uninstall");
 boolean isRemovable = !(attrValue != null && attrValue.equalsIgnoreCase("true"));
 boolean isDrmProtected = (aSuiteInfo.getContentInfo() == aSuiteInfo.CONTENT_INFO_DRM);
 boolean isOriginVerified = aSuiteInfo.isTrusted();
 String midletInfoUrl = aSuiteInfo.getAttributeValue("MIDlet-Info-URL");
 String midletDescription = aSuiteInfo.getAttributeValue("MIDlet-Description");
 String downloadUrl = aSuiteInfo.getAttributeValue("Nokia-MIDlet-Download-URL");
+String updateUrl = aSuiteInfo.getAttributeValue("Nokia-Update");
 ComponentId componentId = new ComponentId();
 int err = _registerComponent(
 iSessionHandle, uid,
 getScrString(suiteName), getScrString(vendor),
-getScrString(version), getScrString(name),
+getScrString(version), getScrString(globalId),
-getScrString(globalId), componentFiles,
+componentFiles, componentSize,
-componentSize, isRemovable, isDrmProtected,
+isRemovable, isDrmProtected,
-isOriginVerified, aIsUpdate, aSuiteInfo.getMediaId(),
+isOriginVerified, aIsUpdate,
+aSuiteInfo.getMediaId(),
 getScrString(midletInfoUrl),
 getScrString(midletDescription),
 getScrString(downloadUrl),
+getScrString(updateUrl),
 componentId);
 if (err < 0)
 {
 InstallerException.internalError(
 "Registering component " + globalId +
 }
 }
 /**
 * Unregisters Java application suite from being S60 USIF component.
-* Used with USIF Phase 2.
 *
 * @param aSuiteInfo suite information
 * @throws InstallerException if unregistration cannot done or
 *  startSession has not been called successfully
 * @see startSession
 * Registers one Java application to S60 USIF as an S60 application.
 * The application is registered to component whose id is taken
 * from given SuiteInfo object. The SuiteInfo must already have
 * been registered to USIF as a component with registerComponent()
 * method before this method is called.
-* Used with USIF Phase 2.
 *
 * @param aSuiteInfo information needed to register the application
 * @param aIndex index of the application in the suite
 * @throws InstallerException if registration cannot done or
 *  startSession has not been called successfully
 InstallerException.internalError(
 "Adding property " + attrName + " for component " + cid +
 " failed with code " + err + " (" + nonlocalizedAttrValue + ")");
 }
 LocalizedName[] localizedAttrValues =
-getLocalizedNames(aSuite, attrName + "-");
+getLocalizedNames(aSuite, "Nokia-" + attrName + "-");
 for (int i = 0; i < localizedAttrValues.length; i++)
 {
 err = _setLocalizedComponentProperty(
 iSessionHandle, cid, getScrString(attrName),
 getScrString(localizedAttrValues[i].getName()),
 }
 // Register Domain-Category property.
 String protectionDomainProperty = "Domain-Category";
 String protectionDomainName = aSuite.getProtectionDomainName();
-if (protectionDomainName != null)
+err = _setLocalizedComponentProperty(
-{
+iSessionHandle, cid, protectionDomainProperty,
-err = _setLocalizedComponentProperty(
+getProtectionDomainPropertyValue(protectionDomainName),
-iSessionHandle, cid, protectionDomainProperty,
+UNSPECIFIED_LOCALE);
-getProtectionDomainPropertyValue(protectionDomainName),
+if (err < 0)
-UNSPECIFIED_LOCALE);
+{
-if (err < 0)
+InstallerException.internalError(
-{
+"Adding property " + protectionDomainProperty +
-InstallerException.internalError(
+" value " + protectionDomainName + " for component " +
-"Adding property " + protectionDomainProperty +
+cid + " failed with code " + err);
-" value " + protectionDomainName + " for component " +
-cid + " failed with code " + err);
-}
-}
-else
-{
-Log.logWarning(
-"SifRegistrator.registerLocalizedProperties: " +
-protectionDomainProperty + " not set");
 }
 }
 /**
 * Returns the "Domain-Category" property value which contains
 * the text id and text file name for the localized domain category
-* text.
+* text. This method must never return null.
 */
 private String getProtectionDomainPropertyValue(String aProtectionDomain)
 {
-String textId = null;
+String textId = "txt_java_inst_setlabel_cert_domain_val_untrusted_third_party";
-if (aProtectionDomain.equals("Manufacturer"))
+if (aProtectionDomain != null)
 {
-textId = "txt_java_inst_setlabel_cert_domain_val_manufacturer";
+if (aProtectionDomain.equals("Manufacturer"))
-}
+{
-else if (aProtectionDomain.equals("Operator"))
+textId = "txt_java_inst_setlabel_cert_domain_val_manufacturer";
-{
+}
-textId = "txt_java_inst_setlabel_cert_domain_val_operator";
+else if (aProtectionDomain.equals("Operator"))
-}
+{
-else if (aProtectionDomain.equals("IdentifiedThirdParty"))
+textId = "txt_java_inst_setlabel_cert_domain_val_operator";
-{
+}
-textId = "txt_java_inst_setlabel_cert_domain_val_trusted_third_party";
+else if (aProtectionDomain.equals("IdentifiedThirdParty"))
-}
+{
-else if (aProtectionDomain.equals("UnidentifiedThirdParty"))
+textId = "txt_java_inst_setlabel_cert_domain_val_trusted_third_party";
-{
+}
-textId = "txt_java_inst_setlabel_cert_domain_val_untrusted_third_party";
 }
 return textId + ",javaapplicationinstaller";
 }
 /**
 {
 Log.logWarning(
 "SifRegistrator ignored unknown locale: " +
 name + ": " + localizedName);
 }
+else if (localizedName.getName() == null ||
+localizedName.getName().length() == 0)
+{
+Log.logWarning(
+"SifRegistrator ignored empty localized text: " +
+name + ": " + localizedName);
+}
 else
 {
 Log.log("SifRegistrator found localized text " +
 name + ": " + localizedName);
 localizedNames.put(
 * @param aSessionHandle
 * @param aUid
 * @param aSuiteName
 * @param aVendor
 * @param aVersion
-* @param aName
 * @param aGlobalId
 * @param aComponentFiles
 * @param aComponentSize
 * @param aIsRemovable
 * @param aIsDrmProtected
 * @param aIsUpdate
 * @param aMediaId
 * @param aMidletInfoUrl
 * @param aMidletDescription
 * @param aDownloadUrl
+* @param aUpdateUrl
 * @param aComponentId upon successful execution contains the
 * component id for the registered component
 * @return 0 if registration succeeded or Symbian error code
 */
 private static native int _registerComponent(
 int aSessionHandle, int aUid, String aSuiteName, String aVendor,
-String aVersion, String aName, String aGlobalId,
+String aVersion, String aGlobalId,
 String[] aComponentFiles, long aComponentSize,
 boolean aIsRemovable, boolean aIsDrmProtected,
 boolean aIsOriginVerified, boolean aIsUpdate, int aMediaId,
-String aMidletInfoUrl, String aMidletDescription, String aDownloadUrl,
+String aMidletInfoUrl, String aMidletDescription,
+String aDownloadUrl, String aUpdateUrl,
 ComponentId aComponentId);
 /**
 * Unregisters Java application from S60 USIF.
 *
 * Checks if USIF is enabled.
 *
 * @return 1 if application data should be registered to USIF, 0 otherwise
 */
 private static native int _getUsifMode();
+/**
+* Returns SIF specific error category from given error id.
+*/
+private static native int _getErrorCategory(int aErrorId);
 }

changeset 50	023eef975703
parent 35	85266cc22c7f
child 87	1627c337e51e