Merge branch 'master' of git.savoirfairelinux.com:sflphone-android

Conflicts:
	src/com/savoirfairelinux/sflphone/client/ManagerImpl.java
	src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java

.gitignore

@@ -5,3 +5,4 @@
 /gen
 *.swp
 
+sflphoneservice*

README

@@ -12,3 +12,24 @@ export ANDROID_SDK=$HOME/path/to/android-sdk-linux
 The path to the required Android's build executable must be also specified:
 
 export PATH=$PATH:$ANDROID_NDK
+
+BUILD
+-----
+install swig-2.0 and python-2.7 or later on your system
+
+$ cd sflphone-android
+
+Check that following files are executable:
+  jni/sflphone/daemon/src/JavaJNI2CJNI_Load.py
+  make-swig.sh
+
+$ ndk-build -j4
+
+Check that no errors occurred. In particular, following files should have been generated by make-swig.sh:
+  sflphoneservice_loader.c
+  callmanager_wrap.cpp
+  sflphoneservice.java
+  sflphoneserviceJNI.java
+  ManagerImpl.java
+
+Then build android project with your favorite JDK: eclipse or ant.

sflphone @ 3183151b

-Subproject commit 4e865e91090f209967b9c1ff3735577fc58960e3
+Subproject commit 3183151b05feff145b2591d427f7f1f6186b31f1

make-swig.sh

+#!/bin/bash -
+#
+#  Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+#
+#  Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#  Additional permission under GNU GPL version 3 section 7:
+#
+#  If you modify this program, or any covered work, by linking or
+#  combining it with the OpenSSL project's OpenSSL library (or a
+#  modified version of that library), containing parts covered by the
+#  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+#  grants you additional permission to convey the resulting work.
+#  Corresponding Source for a non-source form of such a combination
+#  shall include the source code for the parts of OpenSSL used as well
+#  as that of the covered work.
+#
+
+# input: jni/sflphone/daemon/src/dbus/callmanager.i
+# output: sflphoneservice_loader.c
+#         callmanager_wrap.cpp
+#         sflphoneservice.java
+#         sflphoneserviceJNI.java
+#         ManagerImpl.java
+
+ROOT=`pwd`
+echo "in $ROOT"
+
+# FIXME
+echo "Generating callmanager_wrap.cpp..."
+swig -v -debug-tmused -c++ -java \
+-package com.savoirfairelinux.sflphone.client \
+-outdir src/com/savoirfairelinux/sflphone/client \
+-o jni/sflphone/daemon/src/dbus/callmanager_wrap.cpp jni/sflphone/daemon/src/dbus/callmanager.i
+
+pushd jni/sflphone/daemon/src
+echo "in $PWD"
+
+echo "Generating sflphoneservice_loader.c..."
+python JavaJNI2CJNI_Load.py \
+-i $ROOT/src/com/savoirfairelinux/sflphone/client/sflphoneserviceJNI.java \
+-o nativesrc/sflphoneservice_loader.c \
+-t sflphoneservice.c.template \
+-m sflphoneservice \
+-p com.savoirfairelinux.sflphone.client
+
+echo "Appending callmanager_wrap.cpp..."
+cat nativesrc/sflphoneservice_loader.c >> dbus/callmanager_wrap.cpp
+
+echo -n "in " && popd
+echo "Done"

src/com/savoirfairelinux/sflphone/client/Manager.java

+package com.savoirfairelinux.sflphone.client;
+
+import android.os.Handler;
+import android.os.Bundle;
+import android.os.Message;
+import android.util.Log;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.widget.ImageButton;
+
+import com.savoirfairelinux.sflphone.R;
+
+public class Manager {
+	
+	private static final String TAG = "Manager";
+	private static int sipLogLevel = 6;
+	static Handler h;
+	// private static ButtonSectionFragment buttonSecFragment;
+	static String appPath;
+	static Animation animation;
+	static SFLPhoneHome uiThread;
+	static ImageButton buttonCall;
+	public static ManagerImpl managerImpl;
+	
+	static {
+		// FIXME: this is the 2nd time we call ManagerImpl's constructor.
+		//        First time was at JNI_OnLoad... 
+	    managerImpl = new ManagerImpl(sflphoneserviceJNI.instance(), true);
+		Log.i(TAG, "ManagerImpl::instance() = " + managerImpl);
+	}
+
+	public Manager() {}
+	
+	public Manager(Handler h) {
+		// Change alpha from fully visible to invisible
+	    animation = new AlphaAnimation(1, 0);
+	    // duration - half a second
+	    animation.setDuration(500);
+	    // do not alter animation rate
+	    animation.setInterpolator(new LinearInterpolator());
+	    // Repeat animation infinitely
+	    animation.setRepeatCount(Animation.INFINITE);
+	    // Reverse
+	    animation.setRepeatMode(Animation.REVERSE);
+	    
+		this.h = h;
+	}
+	
+	public static void callBack(String s) {
+		Bundle b = new Bundle();
+		Log.i(TAG, "callBack: " + s);
+		b.putString("callback_string", s);
+		Message m = Message.obtain();
+		m.setData(b);
+		m.setTarget(h);
+		m.sendToTarget();
+	}
+	
+	public static void incomingCall(String accountID, String callID, String from) {
+		Log.i(TAG, "incomingCall(" + accountID + ", " + callID + ", " + from + ")");
+		
+		// FIXME that's ugly...
+		uiThread.runOnUiThread(new Runnable() {
+		     public void run() {
+		 		try {
+					buttonCall.startAnimation(animation);
+					buttonCall.setImageResource(R.drawable.ic_incomingcall);
+				} catch (Exception e) {
+					Log.w(TAG, "exception in runOnUiThread ", e);
+				}
+		    }
+		});
+
+		uiThread.setIncomingCallID(callID);
+	}
+	
+	// FIXME
+	public static void setCallButton(ImageButton b) {
+                buttonCall = b;
+	}
+	
+	public static void setActivity(SFLPhoneHome a) {
+		uiThread = a;
+	}
+
+	public static String getAppPath() {
+		return appPath;
+	}
+	
+	public static void setAppPath(String path) {
+		appPath = path;
+	}
+
+	public static int getSipLogLevel() {
+		return sipLogLevel;
+	}
+
+	public static native void callVoid();
+	public static native Data getNewData(int i, String s);
+	public static native String getDataString(Data d);
+    public static native String getJniString();
+}

src/com/savoirfairelinux/sflphone/client/ManagerImpl.java

+/* ----------------------------------------------------------------------------
+ * 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.client;
 
-import android.os.Handler;
-import android.os.Bundle;
-import android.os.Message;
-import android.util.Log;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.LinearInterpolator;
-import android.widget.ImageButton;
+public class ManagerImpl {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
 
-import com.savoirfairelinux.sflphone.R;
+  protected ManagerImpl(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
 
-public class ManagerImpl {
-	
-	private static final String TAG = "ManagerImpl";
-	private static int sipLogLevel = 6;
-	static Handler h;
-	private static ButtonSectionFragment buttonSecFragment;
-	static String appPath;
-	static Animation animation;
-	static SFLPhoneHome uiThread;
-	static ImageButton buttonCall;
-	
-	public ManagerImpl () {}
-	
-	public ManagerImpl(Handler h) {		
-		// Change alpha from fully visible to invisible
-	    animation = new AlphaAnimation(1, 0);
-	    // duration - half a second
-	    animation.setDuration(500);
-	    // do not alter animation rate
-	    animation.setInterpolator(new LinearInterpolator());
-	    // Repeat animation infinitely
-	    animation.setRepeatCount(Animation.INFINITE);
-	    // Reverse
-	    animation.setRepeatMode(Animation.REVERSE);
-	    
-		this.h = h;
-	}
-	
-	public static void callBack(String s) {
-		Bundle b = new Bundle();
-		Log.i(TAG, "callBack: " + s);
-		b.putString("callback_string", s);
-		Message m = Message.obtain();
-		m.setData(b);
-		m.setTarget(h);
-		m.sendToTarget();
-	}
-	
-	public static void incomingCall(String accountID, String callID, String from) {
-		Log.i(TAG, "incomingCall(" + accountID + ", " + callID + ", " + from + ")");
-		
-		// FIXME that's ugly...
-		uiThread.runOnUiThread(new Runnable() {
-		     public void run() {
-		 		try {
-					buttonCall.startAnimation(animation);
-					buttonCall.setImageResource(R.drawable.ic_incomingcall);
-				} catch (Exception e) {
-					Log.w(TAG, "exception in runOnUiThread ", e);;
-				}
-		    }
-		});
+  protected static long getCPtr(ManagerImpl obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        sflphoneserviceJNI.delete_ManagerImpl(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public void init(String config_file) {
+    sflphoneserviceJNI.ManagerImpl_init(swigCPtr, this, config_file);
+  }
+
+  public void setPath(String path) {
+    sflphoneserviceJNI.ManagerImpl_setPath(swigCPtr, this, path);
+  }
+
+  public boolean outgoingCall(String arg0, String arg1, String arg2, String arg3) {
+    return sflphoneserviceJNI.ManagerImpl_outgoingCall__SWIG_0(swigCPtr, this, arg0, arg1, arg2, arg3);
+  }
+
+  public boolean outgoingCall(String arg0, String arg1, String arg2) {
+    return sflphoneserviceJNI.ManagerImpl_outgoingCall__SWIG_1(swigCPtr, this, arg0, arg1, arg2);
+  }
+
+  public void refuseCall(String id) {
+    sflphoneserviceJNI.ManagerImpl_refuseCall(swigCPtr, this, id);
+  }
 
-		uiThread.setIncomingCallID(callID);
-	}
-	
-	// FIXME
-	public static void setCallButton(ImageButton b) {
-		buttonCall = b;
-	}
-	
-	public static void setActivity(SFLPhoneHome a) {
-		uiThread = a;
-	}
+  public boolean answerCall(String id) {
+    return sflphoneserviceJNI.ManagerImpl_answerCall(swigCPtr, this, id);
+  }
 
-	public static String getAppPath() {
-		return appPath;
-	}
-	
-	public static void setAppPath(String path) {
-		appPath = path;
-	}
+  public void hangupCall(String id) {
+    sflphoneserviceJNI.ManagerImpl_hangupCall(swigCPtr, this, id);
+  }
 
-	public static int getSipLogLevel() {
-		return sipLogLevel;
-	}
+  public ManagerImpl() {
+    this(sflphoneserviceJNI.new_ManagerImpl(), true);
+  }
 
-	public static native void callVoid();
-	public static native Data getNewData(int i, String s);
-	public static native String getDataString(Data d);
-	
-	public static native void setSipLogLevel(String level);
-    public static native String getJniString();
-	public static native void initN(String config_file);
-	public static native void placeCall(String accountID, String callID, String to);
-	public static native void hangUp(String callID);
-	public static native void answerCall(String callID);
-	public static native void refuseCall(String callID);
 }

src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java

@@ -69,7 +69,7 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
 	static final String TAG = "SFLPhoneHome";
 	private ButtonSectionFragment buttonFragment;
 	Handler callbackHandler;
-	static ManagerImpl managerImpl;
+	private Manager manager;
 	/* default callID */
 	static String callID = "007";
 	static boolean callOnGoing = false;
@@ -141,11 +141,13 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
 		buttonHangup = (ImageButton) findViewById(R.id.buttonHangUp);
 		buttonIncomingCall = (ImageButton) findViewById(R.id.buttonIncomingCall);
 
-		ManagerImpl.setAppPath(getAppPath());
-		managerImpl = new ManagerImpl(callbackHandler);
-		managerImpl.setActivity(this);
-                // managerImpl.setCallButton(buttonCall);
-		Log.i(TAG, "managerImpl created with callbackHandler " + callbackHandler);
+		manager = new Manager(callbackHandler);
+		Log.i(TAG, "ManagerImpl::instance() = " + manager.managerImpl);
+		manager.setActivity(this);
+		/* set static AppPath before calling manager.init */
+		manager.managerImpl.setPath(getAppPath());
+		Log.i(TAG, "manager created with callbackHandler " + callbackHandler);
+
 	}
 
 	// FIXME
@@ -202,7 +204,6 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
 	public void onTabReselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction)
 	{
 //		Log.d(TAG, "onTabReselected");
-//		ManagerImpl.initN("");
 	}
 
 	public void setIncomingCallID(String id) {
@@ -324,7 +325,7 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
 
     		if (incomingCallID != "") {
     			buttonCall.clearAnimation();
-    			ManagerImpl.answerCall(incomingCallID);
+    			manager.managerImpl.answerCall(incomingCallID);
     			callID = incomingCallID;
     			incomingCallID="";
     			callOnGoing = true;
@@ -341,8 +342,8 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
 
     				callID = Integer.toString(random.nextInt());
 
-    				Log.d(TAG, "ManagerImpl.placeCall(" + accountID + ", " + callID + ", " + to + ");");
-    				ManagerImpl.placeCall(accountID, callID, to);
+    				Log.d(TAG, "manager.managerImpl.placeCall(" + accountID + ", " + callID + ", " + to + ");");
+    				manager.managerImpl.outgoingCall(accountID, callID, to);
     				callOnGoing = true;
     				buttonCall.setEnabled(false);
     				buttonHangup.setEnabled(true);
@@ -352,14 +353,14 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
     	case R.id.buttonHangUp:
     		if (incomingCallID != "") {
     			buttonCall.clearAnimation();
-    			ManagerImpl.refuseCall(incomingCallID);
+    			manager.managerImpl.refuseCall(incomingCallID);
     			incomingCallID="";
 				buttonCall.setEnabled(true);
 				buttonHangup.setEnabled(true);
     		} else {
     			if (callOnGoing == true) {
-    				Log.d(TAG, "ManagerImpl.hangUp(" + callID + ");");
-    				ManagerImpl.hangUp(callID);
+    				Log.d(TAG, "manager.managerImpl.hangUp(" + callID + ");");
+    				manager.managerImpl.hangupCall(callID);
     				callOnGoing = false;
     				buttonCall.setEnabled(true);
     				buttonHangup.setEnabled(false);
@@ -369,19 +370,20 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
 			buttonCall.setImageResource(R.drawable.ic_call);
     		break;
     	case R.id.buttonInit:
-    		ManagerImpl.initN("");
+    		Manager.managerImpl.setPath("");
+    		Manager.managerImpl.init("");
     		break;
     	case R.id.buttonCallVoid:
-    		ManagerImpl.callVoid();
+    		Manager.callVoid();
         	break;
     	case R.id.buttonGetNewData:
-    		Data d = ManagerImpl.getNewData(42, "foo");
+    		Data d = Manager.getNewData(42, "foo");
     		if (d != null)
     			buttonFragment.getNewDataText().setText("getNewData(42, \"foo\") == Data(" + d.i + ", \"" + d.s + "\")");
     		break;
     	case R.id.buttonGetDataString:
     		Data daita = new Data(43, "bar");
-    		String s = ManagerImpl.getDataString(daita);
+    		String s = Manager.getDataString(daita);
     		if (s != "") {
     			buttonFragment.getDataStringText().setText("getDataString(Data(43, \"bar\")) == \"" + s + "\"");
     		}