aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhristoterezov <hristo@jitsi.org>2014-06-16 17:52:30 +0300
committerhristoterezov <hristo@jitsi.org>2014-06-16 17:52:30 +0300
commitd86d17cd48a9300799d96d10cbb0ef36a09c505b (patch)
tree837bf64198010f56608b97cc14912914bf3be4cf
parent71812d432ffce258e81c4ddc68f7bd415a969755 (diff)
downloadjitsi-d86d17cd48a9300799d96d10cbb0ef36a09c505b.zip
jitsi-d86d17cd48a9300799d96d10cbb0ef36a09c505b.tar.gz
jitsi-d86d17cd48a9300799d96d10cbb0ef36a09c505b.tar.bz2
Adds log messages about the registry keys used by msofficecom plugin.
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java1
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java42
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/RegistryHandler.java251
-rw-r--r--src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf2
4 files changed, 293 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
index e8e5b91..843141e 100644
--- a/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java
@@ -169,6 +169,7 @@ public class Messenger
logger.error(
"Failed to load native library " + lib + ": "
+ t.getMessage());
+ RegistryHandler.checkRegistryKeys();
throw new RuntimeException(t);
}
}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java b/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java
index 598b99c..bede85d 100644
--- a/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/MsOfficeCommActivator.java
@@ -6,6 +6,9 @@
*/
package net.java.sip.communicator.plugin.msofficecomm;
+import net.java.sip.communicator.util.ServiceUtils;
+
+import org.jitsi.service.resources.*;
import org.jitsi.util.*;
import org.osgi.framework.*;
@@ -23,6 +26,16 @@ public class MsOfficeCommActivator
*/
private static final Logger logger
= Logger.getLogger(MsOfficeCommActivator.class);
+
+ /**
+ * The <tt>ResourceManagementService</tt> through which we access resources.
+ */
+ private static ResourceManagementService resourceService;
+
+ /**
+ * The <tt>BundleContext</tt> in which the msofficecomm plug-in is started.
+ */
+ private static BundleContext bundleContext;
/**
* Starts the <tt>msofficecomm</tt> bundle in a specific
@@ -42,11 +55,13 @@ public class MsOfficeCommActivator
if (logger.isInfoEnabled())
logger.info("MsOfficeComm plugin ... [STARTED]");
-
+
+ MsOfficeCommActivator.bundleContext = bundleContext;
+
Messenger.start(bundleContext);
-
+
boolean stopMessenger = true;
-
+
try
{
int hresult = OutOfProcessServer.start();
@@ -62,6 +77,7 @@ public class MsOfficeCommActivator
}
finally
{
+ RegistryHandler.checkRegistryKeys();
if (stopMessenger)
Messenger.stop(bundleContext);
}
@@ -98,4 +114,24 @@ public class MsOfficeCommActivator
if (logger.isInfoEnabled())
logger.info("MsOfficeComm plugin ... [UNREGISTERED]");
}
+
+
+ /**
+ * Gets the <tt>ResourceManagementService</tt> to be used by the
+ * functionality of the plug-in.
+ *
+ * @return the <tt>ResourceManagementService</tt> to be used by the
+ * functionality of the plug-in
+ */
+ public static ResourceManagementService getResources()
+ {
+ if (resourceService == null)
+ {
+ resourceService
+ = ServiceUtils.getService(
+ bundleContext,
+ ResourceManagementService.class);
+ }
+ return resourceService;
+ }
}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/RegistryHandler.java b/src/net/java/sip/communicator/plugin/msofficecomm/RegistryHandler.java
new file mode 100644
index 0000000..1c2c846
--- /dev/null
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/RegistryHandler.java
@@ -0,0 +1,251 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.msofficecomm;
+
+import net.java.sip.communicator.util.Logger;
+
+import com.sun.jna.platform.win32.*;
+
+/**
+ * Checks the registry keys used by
+ * Outlook.
+ *
+ * @author Hristo Terezov
+ */
+public class RegistryHandler
+{
+ /**
+ * The logger.
+ */
+ private static Logger logger = Logger.getLogger(RegistryHandler.class);
+
+ /**
+ * The key under which the IM application is placed.
+ */
+ private static String REGISTRY_IM_APPLICATION_KEY
+ = "Software\\IM Providers";
+
+ /**
+ * The value under which the default IM application is placed.
+ */
+ private static String REGISTRY_DEFAULT_IM_APPLICATION_VALUE
+ = "DefaultIMApp";
+
+ /**
+ * The key for the outlook call integration.
+ */
+ private static String REGISTRY_CALL_INTEGRATION
+ = "Software\\Microsoft\\Office\\Outlook\\Call Integration";
+
+ /**
+ * The value for the outlook call integration.
+ */
+ private static String REGISTRY_CALL_INTEGRATION_VALUE
+ = "IMApplication";
+
+ /**
+ * The key for the outlook rtc application.
+ */
+ private static String REGISTRY_OFFICE11_RTC_APPLICATION
+ = "Software\\Microsoft\\Office\\11.0\\Common\\PersonaMenu";
+
+ /**
+ * The key for the outlook rtc application.
+ */
+ private static String REGISTRY_OFFICE12_RTC_APPLICATION
+ = "Software\\Microsoft\\Office\\12.0\\Common\\PersonaMenu";
+
+ /**
+ * The value for the rtc application.
+ */
+ private static String REGISTRY_RTC_APPLICATION_VALUE = "RTCApplication";
+
+ /**
+ * The key for Communicator IM App.
+ */
+ private static String REGISTRY_COMMUNICATOR_UP
+ = "Software\\IM Providers\\Communicator";
+
+ /**
+ * Up and running value.
+ */
+ private static String REGISTRY_UP_RUNNING_VALUE = "UpAndRunning";
+
+ /**
+ * Checks the existence of the registry keys for outlook call integration.
+ */
+ private static void checkCallIntegration()
+ {
+ if(!Advapi32Util.registryKeyExists(WinReg.HKEY_LOCAL_MACHINE,
+ REGISTRY_CALL_INTEGRATION)
+ || !Advapi32Util.registryValueExists(WinReg.HKEY_LOCAL_MACHINE,
+ REGISTRY_CALL_INTEGRATION,
+ REGISTRY_CALL_INTEGRATION_VALUE))
+ {
+ logger.error(REGISTRY_CALL_INTEGRATION +
+ " doesn't exists in registry");
+ return;
+ }
+ logger.info("Call integration: " +
+ Advapi32Util.registryGetStringValue(
+ WinReg.HKEY_LOCAL_MACHINE,
+ REGISTRY_CALL_INTEGRATION,
+ REGISTRY_CALL_INTEGRATION_VALUE));
+ }
+
+ /**
+ * Checks the existence of the registry keys for outlook rtc application.
+ */
+ private static void checkRTCApplication()
+ {
+ if(!Advapi32Util.registryKeyExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_OFFICE11_RTC_APPLICATION)
+ || !Advapi32Util.registryValueExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_OFFICE11_RTC_APPLICATION,
+ REGISTRY_RTC_APPLICATION_VALUE))
+ {
+ logger.error(REGISTRY_OFFICE11_RTC_APPLICATION +
+ " doesn't exists in registry");
+ }
+ else
+ {
+ logger.info("RTC application: " +
+ Advapi32Util.registryGetIntValue(
+ WinReg.HKEY_CURRENT_USER,
+ REGISTRY_OFFICE11_RTC_APPLICATION,
+ REGISTRY_RTC_APPLICATION_VALUE));
+ }
+
+ if(!Advapi32Util.registryKeyExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_OFFICE12_RTC_APPLICATION)
+ || !Advapi32Util.registryValueExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_OFFICE12_RTC_APPLICATION,
+ REGISTRY_RTC_APPLICATION_VALUE))
+ {
+ logger.error(REGISTRY_OFFICE12_RTC_APPLICATION +
+ " doesn't exists in registry");
+ }
+ else
+ {
+ logger.info("RTC application: " +
+ Advapi32Util.registryGetIntValue(
+ WinReg.HKEY_CURRENT_USER,
+ REGISTRY_OFFICE12_RTC_APPLICATION,
+ REGISTRY_RTC_APPLICATION_VALUE));
+ }
+ }
+
+ /**
+ * Checks if the registry key for running Jitsi and Communicator.
+ */
+ private static void checkUpAndRunning()
+ {
+ if(!Advapi32Util.registryKeyExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_COMMUNICATOR_UP)
+ || !Advapi32Util.registryValueExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_COMMUNICATOR_UP,
+ REGISTRY_UP_RUNNING_VALUE))
+ {
+ logger.error(REGISTRY_COMMUNICATOR_UP +
+ " doesn't exists in registry");
+ }
+ else
+ {
+ logger.info("Communicator up and running value: " +
+ Advapi32Util.registryGetIntValue(
+ WinReg.HKEY_CURRENT_USER,
+ REGISTRY_COMMUNICATOR_UP,
+ REGISTRY_UP_RUNNING_VALUE));
+ }
+
+ if(!Advapi32Util.registryKeyExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_IM_APPLICATION_KEY + "\\" + getApplicationName())
+ || !Advapi32Util.registryValueExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_IM_APPLICATION_KEY + "\\" + getApplicationName(),
+ REGISTRY_UP_RUNNING_VALUE))
+ {
+ logger.error(REGISTRY_IM_APPLICATION_KEY +
+ " doesn't exists in registry");
+ }
+ else
+ {
+ logger.info("Up and running value: " +
+ Advapi32Util.registryGetIntValue(
+ WinReg.HKEY_CURRENT_USER,
+ REGISTRY_IM_APPLICATION_KEY + "\\"
+ + getApplicationName(),
+ REGISTRY_UP_RUNNING_VALUE));
+ }
+ }
+
+ /**
+ * Logs registry information.
+ */
+ public static void checkRegistryKeys()
+ {
+ checkDefaultIMApp();
+ checkRegisteredIMApp();
+ checkCallIntegration();
+ checkRTCApplication();
+ checkUpAndRunning();
+ }
+
+
+ /**
+ * Checks whether Jitsi is the default IM application.
+ */
+ private static void checkDefaultIMApp()
+ {
+ if(!Advapi32Util.registryKeyExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_IM_APPLICATION_KEY) ||
+ !Advapi32Util.registryValueExists(WinReg.HKEY_CURRENT_USER,
+ REGISTRY_IM_APPLICATION_KEY,
+ REGISTRY_DEFAULT_IM_APPLICATION_VALUE))
+ {
+ logger.error(REGISTRY_IM_APPLICATION_KEY
+ + " doesn't extsts");
+ return;
+ }
+
+ logger.info("Default IM App: " + Advapi32Util.registryGetStringValue(
+ WinReg.HKEY_CURRENT_USER,
+ REGISTRY_IM_APPLICATION_KEY,
+ REGISTRY_DEFAULT_IM_APPLICATION_VALUE));
+ }
+
+ /**
+ * Checks whether Jitsi is registered as IM provider.
+ */
+ private static void checkRegisteredIMApp()
+ {
+ if(!Advapi32Util.registryKeyExists(
+ WinReg.HKEY_LOCAL_MACHINE,
+ REGISTRY_IM_APPLICATION_KEY + "\\" + getApplicationName()))
+ {
+ logger.error(REGISTRY_IM_APPLICATION_KEY + "\\" +
+ getApplicationName() + " doesn;t exsts");
+ return;
+ }
+
+ logger.info("Registered IM App friendly name: "
+ + Advapi32Util.registryGetStringValue(
+ WinReg.HKEY_LOCAL_MACHINE,
+ REGISTRY_IM_APPLICATION_KEY + "\\" +
+ getApplicationName(),
+ "FriendlyName"));
+ }
+
+ /**
+ * Returns the application name.
+ * @return the application name
+ */
+ private static String getApplicationName()
+ {
+ return MsOfficeCommActivator.getResources().getSettingsString(
+ "service.gui.APPLICATION_NAME");
+ }
+}
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
index a395536..96d9dc7 100644
--- a/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
@@ -15,4 +15,6 @@ Import-Package: javax.swing,
net.java.sip.communicator.util,
org.jitsi.service.configuration,
org.jitsi.util,
+ org.jitsi.service.resources,
+ com.sun.jna.platform.win32,
org.osgi.framework