diff --git a/.gitignore b/.gitignore
index b325bc9c215f85da50f8633aa02762e624927a84..166090d90160f4ca71a900f66ec797f64ac77886 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,2 @@
-/jni/libcutils
-/obj
-/jni/obj
-/libs
-/bin
-/gen
-/out
/sflphone
-/.idea
-*.swp
-tags
-TAGS.LST
-ID
-
-AndroidUnusedResources1.6.2.jar
-.classpath
-.project
-.settings/org.eclipse.jdt.core.prefs
-.settings/org.eclipse.jdt.ui.prefs
-local.properties
-.externalToolBuilders/
-.settings/org.eclipse.ltk.core.refactoring.prefs
-SFLPhone.iml
-
-
env.sh
-ant.properties
-*.keystore
-SFLPhoneservice*
-CallManager.java
-CallManagerCallback.java
-ConfigurationManager.java
-ConfigurationCallback.java
-ManagerImpl.java
-SWIGTYPE*
-StringMap.java
-StringVect.java
-IntVect.java
-Callback.java
-VectMap.java
-*.o
-tests/bin
diff --git a/configure.sh b/configure.sh
index ccc18e43e6916f73f53da597c1e2def078920214..f97a37188b837f6cdabcc93baaeb1ea5b58d7545 100755
--- a/configure.sh
+++ b/configure.sh
@@ -49,7 +49,7 @@ NM="${CROSS_COMPILE}nm" \
STRIP="${CROSS_COMPILE}strip" \
RANLIB="${CROSS_COMPILE}ranlib" \
AR="${CROSS_COMPILE}ar" \
-PKG_CONFIG_LIBDIR=$SFLPHONE_SOURCEDIR/contrib/$TARGET_TUPLE/lib/pkgconfig \
+PKG_CONFIG_LIBDIR=$SFLPHONE_SOURCEDIR/daemon/contrib/$TARGET_TUPLE/lib/pkgconfig \
./configure --host=$TARGET_TUPLE $EXTRA_PARAMS \
- --disable-video --without-zrtp --without-dbus --without-alsa --without-pulse --with-iax2 --without-tls --with-contrib="../contrib/${TARGET_TUPLE}" \
+ --disable-video --without-zrtp --without-dbus --without-alsa --without-pulse --with-iax2 --without-tls --with-contrib="contrib/${TARGET_TUPLE}" \
$*
diff --git a/sflphone-android/.gitignore b/sflphone-android/.gitignore
index d3317a063771008c40487fd402de67d19e01af9e..b949a83ca665a1da6a90624c82a3eab9f383b9e1 100644
--- a/sflphone-android/.gitignore
+++ b/sflphone-android/.gitignore
@@ -1,18 +1,14 @@
-/jni/libcutils
/obj
-/jni/obj
-/libs
/bin
gen/
/out
-/.idea
*.swp
tags
TAGS.LST
ID
-src/org/sflphone/views/paralloidviews/
-src/org/sflphone/views/paralloid
+**/.idea/workspace.xml
+**/.idea/tasks.xml
AndroidUnusedResources1.6.2.jar
@@ -23,14 +19,12 @@ AndroidUnusedResources1.6.2.jar
local.properties
.externalToolBuilders/
.settings/org.eclipse.ltk.core.refactoring.prefs
-SFLPhone.iml
jni/sflphone_wrapper.cpp
jni/sflphone_wrapper.h
jni/sflphoneservice_loader.c
-.ant-targets-build.xml
ant.properties
*.keystore
SFLPhoneservice*
diff --git a/sflphone-android/.idea/compiler.xml b/sflphone-android/.idea/compiler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..217af471a9e60576e8c36373fa22c50a63a00b2c
--- /dev/null
+++ b/sflphone-android/.idea/compiler.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
+ </component>
+</project>
+
diff --git a/sflphone-android/.idea/copyright/profiles_settings.xml b/sflphone-android/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e7bedf3377d40335424fd605124d4761390218bb
--- /dev/null
+++ b/sflphone-android/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
diff --git a/sflphone-android/.idea/encodings.xml b/sflphone-android/.idea/encodings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e206d70d8595e2a50675ba11de48efcfa012497d
--- /dev/null
+++ b/sflphone-android/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/sflphone-android/.idea/libraries/libs.xml b/sflphone-android/.idea/libraries/libs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94ec99d50fcade127a891eb509b854b707c3b5f6
--- /dev/null
+++ b/sflphone-android/.idea/libraries/libs.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="libs">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/libs/robotium-solo-5.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/libs/ormlite-android-4.48.jar!/" />
+ <root url="jar://$PROJECT_DIR$/libs/ormlite-core-4.48.jar!/" />
+ <root url="jar://$PROJECT_DIR$/libs/android-support-v13.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/sflphone-android/.idea/misc.xml b/sflphone-android/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..28b71f5654883685715d9728576b08191dfb8229
--- /dev/null
+++ b/sflphone-android/.idea/misc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" />
+</project>
+
diff --git a/sflphone-android/.idea/modules.xml b/sflphone-android/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..684f7493b4f788f24a325ec93ad4e9bb51739530
--- /dev/null
+++ b/sflphone-android/.idea/modules.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules />
+ </component>
+</project>
+
diff --git a/sflphone-android/.idea/scopes/scope_settings.xml b/sflphone-android/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..922003b8433bcad6ce9778a37628d738faa26389
--- /dev/null
+++ b/sflphone-android/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+ <state>
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </state>
+</component>
\ No newline at end of file
diff --git a/sflphone-android/.idea/uiDesigner.xml b/sflphone-android/.idea/uiDesigner.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b0002030884f78f1562177d81eb2f42c5acbd43
--- /dev/null
+++ b/sflphone-android/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
+
diff --git a/sflphone-android/.idea/vcs.xml b/sflphone-android/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..def6a6a18457989c7d18825c7c1bbfeefc8b261d
--- /dev/null
+++ b/sflphone-android/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="" />
+ </component>
+</project>
+