Skip to content
Snippets Groups Projects
Commit 3ea8f3cf authored by alision's avatar alision
Browse files

* #27232: Added ssl modules to Android.mk

parent 5cfc35d6
No related branches found
No related tags found
No related merge requests found
...@@ -17,11 +17,14 @@ local.properties ...@@ -17,11 +17,14 @@ local.properties
SFLPhoneservice* SFLPhoneservice*
CallManagerJNI.java CallManager.java
Callback.java CallManagerCallback.java
ConfigurationCallback.java ConfigurationManager.java
ConfigurationManagerCallback.java
ManagerImpl.java ManagerImpl.java
SWIGTYPE* SWIGTYPE*
StringMap.java StringMap.java
StringVect.java StringVect.java
IntVect.java
/jni/libcutils
/obj
/libs
/bin
/gen
*.swp
tags
TAGS.LST
ID
.classpath
.project
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.jdt.ui.prefs
local.properties
SFLPhoneservice*
CallManagerJNI.java
Callback.java
ConfigurationCallback.java
ManagerImpl.java
SWIGTYPE*
StringMap.java
StringVect.java
This diff is collapsed.
APP_OPTIM := debug APP_OPTIM := debug
APP_MODULES := libccgnu2 APP_MODULES := libccgnu2
APP_MODULES += libyaml
APP_MODULES += libsamplerate
APP_MODULES += libsamplerate
APP_MODULES += libexpat_static APP_MODULES += libexpat_static
APP_MODULES += libexpat_shared APP_MODULES += libexpat_shared
APP_MODULES += libccrtp1 APP_MODULES += libccrtp1
#APP_MODULES += libcutils-static #APP_MODULES += libcutils-static
#APP_MODULES += libcutils-shared #APP_MODULES += libcutils-shared
APP_MODULES += libdbus #APP_MODULES += libdbus
APP_MODULES += libdbus-tools-common #APP_MODULES += libdbus-tools-common
APP_MODULES += dbus-daemon #APP_MODULES += dbus-daemon
APP_MODULES += dbus-monitor #APP_MODULES += dbus-monitor
APP_MODULES += dbus-send #APP_MODULES += dbus-send
APP_MODULES += libdbus
APP_MODULES += libdbus-tools-common #APP_MODULES += libdbus-c++-1
APP_MODULES += libdbus-c++-1
# APP_MODULES += libdbus-glue # APP_MODULES += libdbus-glue
# APP_MODULES += libsiplink # APP_MODULES += libsiplink
# APP_MODULES += libconfig # APP_MODULES += libconfig
...@@ -38,7 +35,7 @@ APP_MODULES += libcodec_g722 ...@@ -38,7 +35,7 @@ APP_MODULES += libcodec_g722
#APP_MODULES += libcodec_speex_nb #APP_MODULES += libcodec_speex_nb
#APP_MODULES += libcodec_speex_ub #APP_MODULES += libcodec_speex_ub
#APP_MODULES += libcodec_speex_wb #APP_MODULES += libcodec_speex_wb
APP_MODULES += libcodecfactory #APP_MODULES += libcodecfactory
# APP_MODULES += librtp # APP_MODULES += librtp
# APP_MODULES += libaudio # APP_MODULES += libaudio
# APP_MODULES += libhistory # APP_MODULES += libhistory
......
sflphone @ a772e58d
Subproject commit e9c5bd7b07791d7fe52fe627f80108eefb3baaee Subproject commit a772e58db1efdbd5e38085d17c592c5b22e9276c
...@@ -3,14 +3,14 @@ SRCDIR=jni/sflphone/daemon/src ...@@ -3,14 +3,14 @@ SRCDIR=jni/sflphone/daemon/src
# Fix a problem with dbusxx generating *const introspect() instead of introspect() # Fix a problem with dbusxx generating *const introspect() instead of introspect()
echo "Generating callmanager glue..." echo "Generating callmanager glue..."
dbusxx-xml2cpp $SRCDIR/dbus/callmanager-introspec.xml --adaptor=$SRCDIR/dbus/callmanager-glue-tmp.h dbusxx-xml2cpp $SRCDIR/client/callmanager-introspec.xml --adaptor=$SRCDIR/client/android/callmanager-glue-tmp.h
sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/callmanager-glue-tmp.h >$SRCDIR/dbus/callmanager-glue.h sed -e 's/const introspect()/introspect()/' <$SRCDIR/client/android/callmanager-glue-tmp.h >$SRCDIR/client/android/callmanager-glue.h
rm $SRCDIR/dbus/callmanager-glue-tmp.h rm $SRCDIR/client/android/callmanager-glue-tmp.h
echo "Generating configurationmanager glue..." echo "Generating configurationmanager glue..."
dbusxx-xml2cpp $SRCDIR/dbus/configurationmanager-introspec.xml --adaptor=$SRCDIR/dbus/configurationmanager-glue-tmp.h dbusxx-xml2cpp $SRCDIR/client/configurationmanager-introspec.xml --adaptor=$SRCDIR/client/android/configurationmanager-glue-tmp.h
sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/configurationmanager-glue-tmp.h >$SRCDIR/dbus/configurationmanager-glue.h sed -e 's/const introspect()/introspect()/' <$SRCDIR/client/android/configurationmanager-glue-tmp.h >$SRCDIR/client/android/configurationmanager-glue.h
rm $SRCDIR/dbus/configurationmanager-glue-tmp.h rm $SRCDIR/client/android/configurationmanager-glue-tmp.h
#echo "Generating contactmanager glue..." #echo "Generating contactmanager glue..."
#dbusxx-xml2cpp $SRCDIR/dbus/contactmanager-introspec.xml --adaptor=$SRCDIR/dbus/contactmanager-glue-tmp.h #dbusxx-xml2cpp $SRCDIR/dbus/contactmanager-introspec.xml --adaptor=$SRCDIR/dbus/contactmanager-glue-tmp.h
...@@ -18,6 +18,6 @@ rm $SRCDIR/dbus/configurationmanager-glue-tmp.h ...@@ -18,6 +18,6 @@ rm $SRCDIR/dbus/configurationmanager-glue-tmp.h
#rm $SRCDIR/dbus/contactmanager-glue-tmp.h #rm $SRCDIR/dbus/contactmanager-glue-tmp.h
echo "Generating instance glue..." echo "Generating instance glue..."
dbusxx-xml2cpp $SRCDIR/dbus/instance-introspec.xml --adaptor=$SRCDIR/dbus/instance-glue-tmp.h dbusxx-xml2cpp $SRCDIR/client/instance-introspec.xml --adaptor=$SRCDIR/client/android/instance-glue-tmp.h
sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/instance-glue-tmp.h >$SRCDIR/dbus/instance-glue.h sed -e 's/const introspect()/introspect()/' <$SRCDIR/client/android/instance-glue-tmp.h >$SRCDIR/client/android/instance-glue.h
rm $SRCDIR/dbus/instance-glue-tmp.h rm $SRCDIR/client/android/instance-glue-tmp.h
\ No newline at end of file \ No newline at end of file
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
# ManagerImpl.java # ManagerImpl.java
SRCDIR=jni/sflphone/daemon/src SRCDIR=jni/sflphone/daemon/src
NATIVE=nativesrc NATIVE=client/android
NATIVEDIR=$SRCDIR/$NATIVE NATIVEDIR=$SRCDIR/$NATIVE
PACKAGE=com.savoirfairelinux.sflphone.service PACKAGE=com.savoirfairelinux.sflphone.service
PACKAGEDIR=src/com/savoirfairelinux/sflphone/service PACKAGEDIR=src/com/savoirfairelinux/sflphone/service
...@@ -88,25 +88,25 @@ fi ...@@ -88,25 +88,25 @@ fi
# FIXME # FIXME
echo "Generating callmanager_wrap.cpp..." echo "Generating callmanager_wrap.cpp..."
mkdir -p $NATIVEDIR
swig -v -c++ -java \ swig -v -c++ -java \
-package $PACKAGE \ -package $PACKAGE \
-outdir $PACKAGEDIR \ -outdir $PACKAGEDIR \
-o $SRCDIR/dbus/callmanager_wrap.cpp $SRCDIR/dbus/jni_interface.i -o $SRCDIR/client/android/callmanager_wrap.cpp $SRCDIR/client/android/jni_interface.i
pushd $SRCDIR pushd $SRCDIR
echo "in $PWD" echo "in $PWD"
echo "Generating sflphoneservice_loader.c..." echo "Generating sflphoneservice_loader.c..."
python JavaJNI2CJNI_Load.py \ python client/android/JavaJNI2CJNI_Load.py \
-i $ROOT/$PACKAGEDIR/SFLPhoneserviceJNI.java \ -i $ROOT/$PACKAGEDIR/SFLPhoneserviceJNI.java \
-o $NATIVE/sflphoneservice_loader.c \ -o $NATIVE/sflphoneservice_loader.c \
-t sflphoneservice.c.template \ -t client/android/sflphoneservice.c.template \
-m SFLPhoneservice \ -m SFLPhoneservice \
-p $PACKAGE -p $PACKAGE
echo "Appending callmanager_wrap.cpp..." echo "Appending callmanager_wrap.cpp..."
cat $NATIVE/sflphoneservice_loader.c >> dbus/callmanager_wrap.cpp cat $NATIVE/sflphoneservice_loader.c >> client/android/callmanager_wrap.cpp
#if [ "" != "$(find -iname sflphoneservice_loader.c)" ]; then #if [ "" != "$(find -iname sflphoneservice_loader.c)" ]; then
......
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.8
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package com.savoirfairelinux.sflphone.service;
public class Callback {
private long swigCPtr;
protected boolean swigCMemOwn;
protected Callback(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(Callback obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
SFLPhoneserviceJNI.delete_Callback(swigCPtr);
}
swigCPtr = 0;
}
}
protected void swigDirectorDisconnect() {
swigCMemOwn = false;
delete();
}
public void swigReleaseOwnership() {
swigCMemOwn = false;
SFLPhoneserviceJNI.Callback_change_ownership(this, swigCPtr, false);
}
public void swigTakeOwnership() {
swigCMemOwn = true;
SFLPhoneserviceJNI.Callback_change_ownership(this, swigCPtr, true);
}
public void on_new_call_created(String arg1, String arg2, String arg3) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_new_call_created(swigCPtr, this, arg1, arg2, arg3); else SFLPhoneserviceJNI.Callback_on_new_call_createdSwigExplicitCallback(swigCPtr, this, arg1, arg2, arg3);
}
public void on_call_state_changed(String arg1, String arg2) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_call_state_changed(swigCPtr, this, arg1, arg2); else SFLPhoneserviceJNI.Callback_on_call_state_changedSwigExplicitCallback(swigCPtr, this, arg1, arg2);
}
public void on_incoming_call(String arg1, String arg2, String arg3) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_incoming_call(swigCPtr, this, arg1, arg2, arg3); else SFLPhoneserviceJNI.Callback_on_incoming_callSwigExplicitCallback(swigCPtr, this, arg1, arg2, arg3);
}
public void on_transfer_state_changed(String arg1) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_transfer_state_changed(swigCPtr, this, arg1); else SFLPhoneserviceJNI.Callback_on_transfer_state_changedSwigExplicitCallback(swigCPtr, this, arg1);
}
public void on_conference_created(String arg1) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_conference_created(swigCPtr, this, arg1); else SFLPhoneserviceJNI.Callback_on_conference_createdSwigExplicitCallback(swigCPtr, this, arg1);
}
public void on_conference_removed(String arg1) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_conference_removed(swigCPtr, this, arg1); else SFLPhoneserviceJNI.Callback_on_conference_removedSwigExplicitCallback(swigCPtr, this, arg1);
}
public void on_conference_state_changed(String arg1, String arg2) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_conference_state_changed(swigCPtr, this, arg1, arg2); else SFLPhoneserviceJNI.Callback_on_conference_state_changedSwigExplicitCallback(swigCPtr, this, arg1, arg2);
}
public void on_incoming_message(String ID, String from, String msg) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_incoming_message(swigCPtr, this, ID, from, msg); else SFLPhoneserviceJNI.Callback_on_incoming_messageSwigExplicitCallback(swigCPtr, this, ID, from, msg);
}
public void on_record_playback_filepath(String id, String filename) {
if (getClass() == Callback.class) SFLPhoneserviceJNI.Callback_on_record_playback_filepath(swigCPtr, this, id, filename); else SFLPhoneserviceJNI.Callback_on_record_playback_filepathSwigExplicitCallback(swigCPtr, this, id, filename);
}
public Callback() {
this(SFLPhoneserviceJNI.new_Callback(), true);
SFLPhoneserviceJNI.Callback_director_connect(this, swigCPtr, swigCMemOwn, true);
}
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.8
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package com.savoirfairelinux.sflphone.service;
public class ConfigurationCallback {
private long swigCPtr;
protected boolean swigCMemOwn;
protected ConfigurationCallback(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(ConfigurationCallback obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
SFLPhoneserviceJNI.delete_ConfigurationCallback(swigCPtr);
}
swigCPtr = 0;
}
}
protected void swigDirectorDisconnect() {
swigCMemOwn = false;
delete();
}
public void swigReleaseOwnership() {
swigCMemOwn = false;
SFLPhoneserviceJNI.ConfigurationCallback_change_ownership(this, swigCPtr, false);
}
public void swigTakeOwnership() {
swigCMemOwn = true;
SFLPhoneserviceJNI.ConfigurationCallback_change_ownership(this, swigCPtr, true);
}
public void on_accounts_changed() {
if (getClass() == ConfigurationCallback.class) SFLPhoneserviceJNI.ConfigurationCallback_on_accounts_changed(swigCPtr, this); else SFLPhoneserviceJNI.ConfigurationCallback_on_accounts_changedSwigExplicitConfigurationCallback(swigCPtr, this);
}
public void on_account_state_changed(String accoundID, int state) {
if (getClass() == ConfigurationCallback.class) SFLPhoneserviceJNI.ConfigurationCallback_on_account_state_changed(swigCPtr, this, accoundID, state); else SFLPhoneserviceJNI.ConfigurationCallback_on_account_state_changedSwigExplicitConfigurationCallback(swigCPtr, this, accoundID, state);
}
public void on_account_state_changed_with_code(String accoundID, String state, int code) {
if (getClass() == ConfigurationCallback.class) SFLPhoneserviceJNI.ConfigurationCallback_on_account_state_changed_with_code(swigCPtr, this, accoundID, state, code); else SFLPhoneserviceJNI.ConfigurationCallback_on_account_state_changed_with_codeSwigExplicitConfigurationCallback(swigCPtr, this, accoundID, state, code);
}
public ConfigurationCallback() {
this(SFLPhoneserviceJNI.new_ConfigurationCallback(), true);
SFLPhoneserviceJNI.ConfigurationCallback_director_connect(this, swigCPtr, swigCMemOwn, true);
}
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.8
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package com.savoirfairelinux.sflphone.service;
public class ConfigurationManagerJNI {
private long swigCPtr;
protected boolean swigCMemOwn;
protected ConfigurationManagerJNI(long cPtr, boolean cMemoryOwn) {
swigCMemOwn = cMemoryOwn;
swigCPtr = cPtr;
}
protected static long getCPtr(ConfigurationManagerJNI obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
protected void finalize() {
delete();
}
public synchronized void delete() {
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
SFLPhoneserviceJNI.delete_ConfigurationManagerJNI(swigCPtr);
}
swigCPtr = 0;
}
}
public StringMap getIp2IpDetails() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getIp2IpDetails(swigCPtr, this), true);
}
public StringMap getAccountDetails(String accountID) {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAccountDetails(swigCPtr, this, accountID), true);
}
public StringMap getTlsSettingsDefault() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getTlsSettingsDefault(swigCPtr, this), true);
}
public StringMap getTlsSettings() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getTlsSettings(swigCPtr, this), true);
}
public void setTlsSettings(StringMap details) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setTlsSettings(swigCPtr, this, StringMap.getCPtr(details), details);
}
public void setAccountDetails(String accountID, StringMap details) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAccountDetails(swigCPtr, this, accountID, StringMap.getCPtr(details), details);
}
public void sendRegister(String accountID, boolean enable) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_sendRegister(swigCPtr, this, accountID, enable);
}
public void registerAllAccounts() {
SFLPhoneserviceJNI.ConfigurationManagerJNI_registerAllAccounts(swigCPtr, this);
}
public StringMap getAccountTemplate() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAccountTemplate(swigCPtr, this), true);
}
public String addAccount(StringMap details) {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_addAccount(swigCPtr, this, StringMap.getCPtr(details), details);
}
public void removeAccount(String accoundID) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_removeAccount(swigCPtr, this, accoundID);
}
public StringVect getAccountList() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAccountList(swigCPtr, this), true);
}
public StringVect getSupportedTlsMethod() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getSupportedTlsMethod(swigCPtr, this), true);
}
public StringVect getAudioCodecDetails(int payload) {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioCodecDetails(swigCPtr, this, payload), true);
}
public IntVect getActiveAudioCodecList(String accountID) {
return new IntVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getActiveAudioCodecList(swigCPtr, this, accountID), true);
}
public void setActiveAudioCodecList(StringVect list, String accountID) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setActiveAudioCodecList(swigCPtr, this, StringVect.getCPtr(list), list, accountID);
}
public StringVect getAudioPluginList() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioPluginList(swigCPtr, this), true);
}
public void setAudioPlugin(String audioPlugin) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAudioPlugin(swigCPtr, this, audioPlugin);
}
public StringVect getAudioOutputDeviceList() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioOutputDeviceList(swigCPtr, this), true);
}
public StringVect getAudioInputDeviceList() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioInputDeviceList(swigCPtr, this), true);
}
public void setAudioOutputDevice(int index) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAudioOutputDevice(swigCPtr, this, index);
}
public void setAudioInputDevice(int index) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAudioInputDevice(swigCPtr, this, index);
}
public void setAudioRingtoneDevice(int index) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAudioRingtoneDevice(swigCPtr, this, index);
}
public StringVect getCurrentAudioDevicesIndex() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getCurrentAudioDevicesIndex(swigCPtr, this), true);
}
public int getAudioDeviceIndex(String name) {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioDeviceIndex(swigCPtr, this, name);
}
public String getCurrentAudioOutputPlugin() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getCurrentAudioOutputPlugin(swigCPtr, this);
}
public String getNoiseSuppressState() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getNoiseSuppressState(swigCPtr, this);
}
public void setNoiseSuppressState(String state) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setNoiseSuppressState(swigCPtr, this, state);
}
public String getEchoCancelState() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getEchoCancelState(swigCPtr, this);
}
public StringMap getRingtoneList() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getRingtoneList(swigCPtr, this), true);
}
public void setEchoCancelState(String state) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setEchoCancelState(swigCPtr, this, state);
}
public int isIax2Enabled() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_isIax2Enabled(swigCPtr, this);
}
public String getRecordPath() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getRecordPath(swigCPtr, this);
}
public void setRecordPath(String recPath) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setRecordPath(swigCPtr, this, recPath);
}
public boolean getIsAlwaysRecording() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getIsAlwaysRecording(swigCPtr, this);
}
public void setIsAlwaysRecording(boolean rec) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setIsAlwaysRecording(swigCPtr, this, rec);
}
public void setRecordingCall(String id) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setRecordingCall(swigCPtr, this, id);
}
public int getHistoryLimit() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getHistoryLimit(swigCPtr, this);
}
public void clearHistory() {
SFLPhoneserviceJNI.ConfigurationManagerJNI_clearHistory(swigCPtr, this);
}
public void setHistoryLimit(int days) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setHistoryLimit(swigCPtr, this, days);
}
public void setAudioManager(String api) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAudioManager(swigCPtr, this, api);
}
public String getAudioManager() {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getAudioManager(swigCPtr, this);
}
public StringMap getHookSettings() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getHookSettings(swigCPtr, this), true);
}
public void setHookSettings(StringMap settings) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setHookSettings(swigCPtr, this, StringMap.getCPtr(settings), settings);
}
public void setAccountsOrder(String order) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setAccountsOrder(swigCPtr, this, order);
}
public VectMap getHistory() {
return new VectMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getHistory(swigCPtr, this), true);
}
public String getAddrFromInterfaceName(String arg0) {
return SFLPhoneserviceJNI.ConfigurationManagerJNI_getAddrFromInterfaceName(swigCPtr, this, arg0);
}
public StringVect getAllIpInterface() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAllIpInterface(swigCPtr, this), true);
}
public StringVect getAllIpInterfaceByName() {
return new StringVect(SFLPhoneserviceJNI.ConfigurationManagerJNI_getAllIpInterfaceByName(swigCPtr, this), true);
}
public StringMap getShortcuts() {
return new StringMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getShortcuts(swigCPtr, this), true);
}
public void setShortcuts(StringMap shortcutsMap) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setShortcuts(swigCPtr, this, StringMap.getCPtr(shortcutsMap), shortcutsMap);
}
public VectMap getCredentials(String accountID) {
return new VectMap(SFLPhoneserviceJNI.ConfigurationManagerJNI_getCredentials(swigCPtr, this, accountID), true);
}
public void setCredentials(String accountID, VectMap details) {
SFLPhoneserviceJNI.ConfigurationManagerJNI_setCredentials(swigCPtr, this, accountID, VectMap.getCPtr(details), details);
}
public ConfigurationManagerJNI() {
this(SFLPhoneserviceJNI.new_ConfigurationManagerJNI(), true);
}
}
...@@ -71,9 +71,9 @@ public class SipService extends Service { ...@@ -71,9 +71,9 @@ public class SipService extends Service {
private SFLphoneApplication sflphoneApp; private SFLphoneApplication sflphoneApp;
private SipServiceExecutor mExecutor; private SipServiceExecutor mExecutor;
private static HandlerThread executorThread; private static HandlerThread executorThread;
private CallManagerJNI callManagerJNI; private CallManager callManagerJNI;
private CallManagerCallBack callManagerCallBack; private CallManagerCallBack callManagerCallBack;
private ConfigurationManagerJNI configurationManagerJNI; private ConfigurationManager configurationManagerJNI;
private ConfigurationManagerCallback configurationManagerCallback; private ConfigurationManagerCallback configurationManagerCallback;
private ManagerImpl managerImpl; private ManagerImpl managerImpl;
private boolean isPjSipStackStarted = false; private boolean isPjSipStackStarted = false;
...@@ -246,11 +246,11 @@ public class SipService extends Service { ...@@ -246,11 +246,11 @@ public class SipService extends Service {
/* set static AppPath before calling manager.init */ /* set static AppPath before calling manager.init */
managerImpl.setPath(sflphoneApp.getAppPath()); managerImpl.setPath(sflphoneApp.getAppPath());
callManagerJNI = new CallManagerJNI(); callManagerJNI = new CallManager();
callManagerCallBack = new CallManagerCallBack(this); callManagerCallBack = new CallManagerCallBack(this);
SFLPhoneservice.setCallbackObject(callManagerCallBack); SFLPhoneservice.setCallbackObject(callManagerCallBack);
configurationManagerJNI = new ConfigurationManagerJNI(); configurationManagerJNI = new ConfigurationManager();
configurationManagerCallback = new ConfigurationManagerCallback(this); configurationManagerCallback = new ConfigurationManagerCallback(this);
SFLPhoneservice.setConfigurationCallbackObject(configurationManagerCallback); SFLPhoneservice.setConfigurationCallbackObject(configurationManagerCallback);
...@@ -875,7 +875,8 @@ public class SipService extends Service { ...@@ -875,7 +875,8 @@ public class SipService extends Service {
@Override @Override
protected String doRun() throws SameThreadException { protected String doRun() throws SameThreadException {
Log.i(TAG, "SipService.getRecordPath() thread running..."); Log.i(TAG, "SipService.getRecordPath() thread running...");
return configurationManagerJNI.getRecordPath(); // return configurationManager.getRecordPath();
return "";
} }
} }
...@@ -895,7 +896,7 @@ public class SipService extends Service { ...@@ -895,7 +896,7 @@ public class SipService extends Service {
@Override @Override
protected void doRun() throws SameThreadException, RemoteException { protected void doRun() throws SameThreadException, RemoteException {
Log.i(TAG, "SipService.setRecordingCall() thread running..."); Log.i(TAG, "SipService.setRecordingCall() thread running...");
callManagerJNI.setRecordingCall(id); callManagerJNI.toggleRecordingCall(id);
} }
}); });
...@@ -950,7 +951,7 @@ public class SipService extends Service { ...@@ -950,7 +951,7 @@ public class SipService extends Service {
@Override @Override
protected void doRun() throws SameThreadException, RemoteException { protected void doRun() throws SameThreadException, RemoteException {
Log.i(TAG, "SipService.setRecordingCall() thread running..."); Log.i(TAG, "SipService.setRecordingCall() thread running...");
configurationManagerJNI.setRecordPath(path); // configurationManagerJNI.setRecordPath(path);
} }
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment