diff options
author | Damian Minkov <damencho@jitsi.org> | 2012-12-06 16:12:51 +0000 |
---|---|---|
committer | Damian Minkov <damencho@jitsi.org> | 2012-12-06 16:12:51 +0000 |
commit | d8f7fa47cfd512af68bebd3e1ff7075907653c62 (patch) | |
tree | f4cbdd1db75ea6cc2a0e28eae348ba93f0e675cf | |
parent | 769193bd2bb410ba7701b6a4c4e663edf7b9c3b8 (diff) | |
download | jitsi-d8f7fa47cfd512af68bebd3e1ff7075907653c62.zip jitsi-d8f7fa47cfd512af68bebd3e1ff7075907653c62.tar.gz jitsi-d8f7fa47cfd512af68bebd3e1ff7075907653c62.tar.bz2 |
Changes needed for android merge. Exposing several bundle contexts. Some public constants. Changes in sound notifications to use String as resource uri, and obtaining resource input stream and stream format info from AudioSystem, so it can be overridden in different implementations.
-rw-r--r-- | lib/installer-exclude/libjitsi.jar | bin | 1308754 -> 1309031 bytes | |||
-rw-r--r-- | src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java | 19 | ||||
-rw-r--r-- | src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java | 15 |
3 files changed, 34 insertions, 0 deletions
diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar Binary files differindex 2efa823..c8b8f66 100644 --- a/lib/installer-exclude/libjitsi.jar +++ b/lib/installer-exclude/libjitsi.jar diff --git a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java index b16a91f..ce4dcb5 100644 --- a/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java +++ b/src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java @@ -17,6 +17,11 @@ import org.osgi.framework.*; public class ConfigurationActivator implements BundleActivator { + /** + * The <tt>BundleContext</tt> in which the configuration bundle has been + * started and has not been stopped yet. + */ + private static BundleContext bundleContext; /** * Starts the configuration service @@ -28,6 +33,8 @@ public class ConfigurationActivator public void start(BundleContext bundleContext) throws Exception { + ConfigurationActivator.bundleContext = bundleContext; + ConfigurationService configurationService = LibJitsi.getConfigurationService(); @@ -53,4 +60,16 @@ public class ConfigurationActivator throws Exception { } + + /** + * Gets the <tt>BundleContext</tt> in which the configuration bundle has + * been started and has not been stopped yet. + * + * @return the <tt>BundleContext</tt> in which the configuration bundle has + * been started and has not been stopped yet + */ + public static BundleContext getBundleContext() + { + return bundleContext; + } } diff --git a/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java b/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java index 923c699..665bbcb 100644 --- a/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java +++ b/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java @@ -27,6 +27,11 @@ public class SysActivityActivator private final Logger logger = Logger.getLogger(SysActivityActivator.class);
/**
+ * The OSGi <tt>BundleContext</tt>.
+ */
+ private static BundleContext bundleContext = null;
+
+ /**
* The system activity service impl.
*/
private static SystemActivityNotificationsServiceImpl
@@ -84,4 +89,14 @@ public class SysActivityActivator if (sysActivitiesServiceImpl != null)
sysActivitiesServiceImpl.stop();
}
+
+ /**
+ * Returns a reference to the bundle context that we were started with.
+ * @return a reference to the BundleContext instance that we were started
+ * with.
+ */
+ public static BundleContext getBundleContext()
+ {
+ return bundleContext;
+ }
}
|