Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 1 | /** |
| 2 | * Copyright (C) 2010-2012 Regis Montoya (aka r3gis - www.r3gis.fr) |
alision | b176388 | 2013-06-18 17:30:51 -0400 | [diff] [blame] | 3 | * Copyright (C) 2004-2013 Savoir-Faire Linux Inc. |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 4 | * |
| 5 | * Author: Regis Montoya <r3gis.3R@gmail.com> |
| 6 | * Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com> |
alision | 11e8e16 | 2013-05-28 10:33:14 -0400 | [diff] [blame] | 7 | * Alexandre Lision <alexandre.lision@savoirfairelinux.com> |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 8 | * |
| 9 | * This program is free software: you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License as published by |
| 11 | * the Free Software Foundation, either version 3 of the License, or |
| 12 | * (at your option) any later version. |
| 13 | * If you own a pjsip commercial license you can also redistribute it |
| 14 | * and/or modify it under the terms of the GNU Lesser General Public License |
| 15 | * as an android library. |
| 16 | * |
| 17 | * This program is distributed in the hope that it will be useful, |
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 | * GNU General Public License for more details. |
| 21 | * |
| 22 | * You should have received a copy of the GNU General Public License |
| 23 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 24 | */ |
Alexandre Lision | 064e1e0 | 2013-10-01 16:18:42 -0400 | [diff] [blame] | 25 | package org.sflphone.service; |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 26 | |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 27 | import java.lang.ref.WeakReference; |
alision | 17052d4 | 2013-04-22 10:39:38 -0400 | [diff] [blame] | 28 | import java.util.ArrayList; |
| 29 | import java.util.HashMap; |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 30 | import java.util.Iterator; |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 31 | import java.util.List; |
alision | 17052d4 | 2013-04-22 10:39:38 -0400 | [diff] [blame] | 32 | import java.util.Map; |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 33 | import java.util.Map.Entry; |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 34 | import java.util.Random; |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 35 | |
Alexandre Lision | 3ccccf0 | 2013-10-07 14:10:46 -0400 | [diff] [blame] | 36 | import org.sflphone.R; |
Alexandre Lision | 4ab5397 | 2013-11-04 16:59:18 -0500 | [diff] [blame] | 37 | import org.sflphone.client.HomeActivity; |
Alexandre Lision | 933ef0a | 2013-10-15 17:28:40 -0400 | [diff] [blame] | 38 | import org.sflphone.model.Codec; |
Alexandre Lision | 064e1e0 | 2013-10-01 16:18:42 -0400 | [diff] [blame] | 39 | import org.sflphone.model.Conference; |
| 40 | import org.sflphone.model.SipCall; |
Alexandre Lision | d568603 | 2013-10-29 11:09:21 -0400 | [diff] [blame] | 41 | import org.sflphone.model.SipMessage; |
Alexandre Lision | 064e1e0 | 2013-10-01 16:18:42 -0400 | [diff] [blame] | 42 | import org.sflphone.receivers.IncomingReceiver; |
Alexandre Lision | 6d867b9 | 2013-10-25 15:36:28 -0400 | [diff] [blame] | 43 | import org.sflphone.utils.MediaManager; |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 44 | import org.sflphone.utils.SipNotifications; |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 45 | import org.sflphone.utils.SwigNativeConverter; |
Alexandre Lision | 064e1e0 | 2013-10-01 16:18:42 -0400 | [diff] [blame] | 46 | |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 47 | import android.app.Notification; |
| 48 | import android.app.NotificationManager; |
| 49 | import android.app.PendingIntent; |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 50 | import android.app.Service; |
alision | 17052d4 | 2013-04-22 10:39:38 -0400 | [diff] [blame] | 51 | import android.content.Context; |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 52 | import android.content.Intent; |
alision | 17052d4 | 2013-04-22 10:39:38 -0400 | [diff] [blame] | 53 | import android.content.IntentFilter; |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 54 | import android.os.Bundle; |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 55 | import android.os.Handler; |
| 56 | import android.os.HandlerThread; |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 57 | import android.os.IBinder; |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 58 | import android.os.Looper; |
| 59 | import android.os.Message; |
alision | 5f89963 | 2013-04-22 17:26:56 -0400 | [diff] [blame] | 60 | import android.os.RemoteException; |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 61 | import android.support.v4.app.NotificationCompat; |
alision | 17052d4 | 2013-04-22 10:39:38 -0400 | [diff] [blame] | 62 | import android.support.v4.content.LocalBroadcastManager; |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 63 | import android.util.Log; |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 64 | |
Emeric Vigier | eaf2c49 | 2012-09-19 14:38:20 -0400 | [diff] [blame] | 65 | public class SipService extends Service { |
| 66 | |
| 67 | static final String TAG = "SipService"; |
| 68 | static final int DELAY = 5000; /* 5 sec */ |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 69 | private SipServiceExecutor mExecutor; |
| 70 | private static HandlerThread executorThread; |
alision | 3ea8f3c | 2013-07-16 17:35:35 -0400 | [diff] [blame] | 71 | private CallManager callManagerJNI; |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 72 | private ManagerImpl managerImpl; |
Emeric Vigier | 0007dee | 2012-09-24 11:35:58 -0400 | [diff] [blame] | 73 | private CallManagerCallBack callManagerCallBack; |
alision | 3ea8f3c | 2013-07-16 17:35:35 -0400 | [diff] [blame] | 74 | private ConfigurationManager configurationManagerJNI; |
Alexandre Savard | fccd1dc | 2012-10-17 17:31:38 -0400 | [diff] [blame] | 75 | private ConfigurationManagerCallback configurationManagerCallback; |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 76 | private boolean isPjSipStackStarted = false; |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 77 | |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 78 | public SipNotifications notificationManager; |
Alexandre Lision | 6d867b9 | 2013-10-25 15:36:28 -0400 | [diff] [blame] | 79 | public MediaManager mediaManager; |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 80 | |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 81 | private HashMap<String, SipCall> current_calls = new HashMap<String, SipCall>(); |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 82 | private HashMap<String, Conference> current_confs = new HashMap<String, Conference>(); |
| 83 | private IncomingReceiver receiver; |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 84 | |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 85 | public HashMap<String, Conference> getCurrent_confs() { |
| 86 | return current_confs; |
| 87 | } |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 88 | |
| 89 | @Override |
| 90 | public boolean onUnbind(Intent i) { |
| 91 | super.onUnbind(i); |
| 92 | Log.i(TAG, "onUnbind(intent)"); |
Alexandre Lision | 0f550ee | 2013-10-25 15:34:38 -0400 | [diff] [blame] | 93 | return true; |
| 94 | } |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 95 | |
Alexandre Lision | 0f550ee | 2013-10-25 15:34:38 -0400 | [diff] [blame] | 96 | @Override |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 97 | public void onRebind(Intent i) { |
Alexandre Lision | 0f550ee | 2013-10-25 15:34:38 -0400 | [diff] [blame] | 98 | super.onRebind(i); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 99 | } |
| 100 | |
| 101 | /* called once by startService() */ |
| 102 | @Override |
| 103 | public void onCreate() { |
| 104 | Log.i(TAG, "onCreated"); |
| 105 | super.onCreate(); |
| 106 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 107 | IntentFilter callFilter = new IntentFilter(CallManagerCallBack.CALL_STATE_CHANGED); |
| 108 | callFilter.addAction(CallManagerCallBack.INCOMING_CALL); |
| 109 | callFilter.addAction(CallManagerCallBack.NEW_CALL_CREATED); |
alision | 4a0eb09 | 2013-05-07 13:52:03 -0400 | [diff] [blame] | 110 | callFilter.addAction(ConfigurationManagerCallback.ACCOUNT_STATE_CHANGED); |
| 111 | callFilter.addAction(ConfigurationManagerCallback.ACCOUNTS_CHANGED); |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 112 | callFilter.addAction(CallManagerCallBack.INCOMING_TEXT); |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 113 | callFilter.addAction(CallManagerCallBack.CONF_CREATED); |
| 114 | callFilter.addAction(CallManagerCallBack.CONF_REMOVED); |
| 115 | callFilter.addAction(CallManagerCallBack.CONF_CHANGED); |
alision | df1dac9 | 2013-06-27 17:35:53 -0400 | [diff] [blame] | 116 | callFilter.addAction(CallManagerCallBack.RECORD_STATE_CHANGED); |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 117 | receiver = new IncomingReceiver(this, mBinder); |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 118 | LocalBroadcastManager.getInstance(this).registerReceiver(receiver, callFilter); |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 119 | |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 120 | getExecutor().execute(new StartRunnable()); |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 121 | |
| 122 | notificationManager = new SipNotifications(this); |
Alexandre Lision | 6d867b9 | 2013-10-25 15:36:28 -0400 | [diff] [blame] | 123 | mediaManager = new MediaManager(this); |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 124 | |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 125 | notificationManager.onServiceCreate(); |
Alexandre Lision | 6d867b9 | 2013-10-25 15:36:28 -0400 | [diff] [blame] | 126 | mediaManager.startService(); |
Alexandre Lision | 3e2a1d0 | 2013-11-19 17:23:00 -0500 | [diff] [blame] | 127 | |
| 128 | |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 129 | |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 130 | } |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 131 | |
| 132 | /* called for each startService() */ |
| 133 | @Override |
| 134 | public int onStartCommand(Intent intent, int flags, int startId) { |
| 135 | Log.i(TAG, "onStarted"); |
| 136 | super.onStartCommand(intent, flags, startId); |
| 137 | |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 138 | receiver = new IncomingReceiver(this, mBinder); |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 139 | |
Alexandre Lision | 0f550ee | 2013-10-25 15:34:38 -0400 | [diff] [blame] | 140 | return START_STICKY; /* started and stopped explicitly */ |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 141 | } |
| 142 | |
| 143 | @Override |
| 144 | public void onDestroy() { |
Alexandre Lision | 5221499 | 2013-10-28 17:41:23 -0400 | [diff] [blame] | 145 | Log.i(TAG, "onDestroy"); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 146 | /* called once by stopService() */ |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 147 | |
Alexandre Lision | 0a300ff | 2013-09-23 14:22:34 -0400 | [diff] [blame] | 148 | LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver); |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 149 | notificationManager.onServiceDestroy(); |
Alexandre Lision | afbe8f6 | 2013-10-25 15:52:44 -0400 | [diff] [blame] | 150 | |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 151 | getExecutor().execute(new FinalizeRunnable()); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 152 | super.onDestroy(); |
| 153 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 154 | } |
| 155 | |
| 156 | @Override |
| 157 | public IBinder onBind(Intent arg0) { |
| 158 | Log.i(TAG, "onBound"); |
| 159 | return mBinder; |
| 160 | } |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 161 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 162 | private static Looper createLooper() { |
| 163 | if (executorThread == null) { |
| 164 | Log.d(TAG, "Creating new handler thread"); |
| 165 | // ADT gives a fake warning due to bad parse rule. |
| 166 | executorThread = new HandlerThread("SipService.Executor"); |
| 167 | executorThread.start(); |
| 168 | } |
| 169 | return executorThread.getLooper(); |
| 170 | } |
| 171 | |
| 172 | public SipServiceExecutor getExecutor() { |
| 173 | // create mExecutor lazily |
| 174 | if (mExecutor == null) { |
| 175 | mExecutor = new SipServiceExecutor(this); |
| 176 | } |
| 177 | return mExecutor; |
| 178 | } |
| 179 | |
| 180 | // Executes immediate tasks in a single executorThread. |
| 181 | public static class SipServiceExecutor extends Handler { |
| 182 | WeakReference<SipService> handlerService; |
| 183 | |
| 184 | SipServiceExecutor(SipService s) { |
| 185 | super(createLooper()); |
| 186 | handlerService = new WeakReference<SipService>(s); |
| 187 | } |
| 188 | |
| 189 | public void execute(Runnable task) { |
| 190 | // TODO: add wakelock |
| 191 | Message.obtain(this, 0/* don't care */, task).sendToTarget(); |
Alexandre Lision | cdec595 | 2013-07-17 14:18:22 -0400 | [diff] [blame] | 192 | Log.w(TAG, "SenT!"); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 193 | } |
| 194 | |
| 195 | @Override |
| 196 | public void handleMessage(Message msg) { |
| 197 | if (msg.obj instanceof Runnable) { |
| 198 | executeInternal((Runnable) msg.obj); |
| 199 | } else { |
| 200 | Log.w(TAG, "can't handle msg: " + msg); |
| 201 | } |
| 202 | } |
| 203 | |
| 204 | private void executeInternal(Runnable task) { |
| 205 | try { |
| 206 | task.run(); |
| 207 | } catch (Throwable t) { |
| 208 | Log.e(TAG, "run task: " + task, t); |
| 209 | } |
| 210 | } |
| 211 | } |
Alexandre Lision | 63870a7 | 2013-10-28 16:33:47 -0400 | [diff] [blame] | 212 | |
| 213 | private void stopDaemon() { |
| 214 | if (managerImpl != null) { |
| 215 | managerImpl.finish(); |
| 216 | isPjSipStackStarted = false; |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 217 | } |
| 218 | } |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 219 | |
| 220 | private void startPjSipStack() throws SameThreadException { |
| 221 | if (isPjSipStackStarted) |
| 222 | return; |
| 223 | |
| 224 | try { |
| 225 | System.loadLibrary("gnustl_shared"); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 226 | System.loadLibrary("crypto"); |
| 227 | System.loadLibrary("ssl"); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 228 | System.loadLibrary("sflphone"); |
| 229 | isPjSipStackStarted = true; |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 230 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 231 | } catch (UnsatisfiedLinkError e) { |
| 232 | Log.e(TAG, "Problem with the current Pj stack...", e); |
| 233 | isPjSipStackStarted = false; |
| 234 | return; |
| 235 | } catch (Exception e) { |
| 236 | Log.e(TAG, "Problem with the current Pj stack...", e); |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 237 | isPjSipStackStarted = false; |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 238 | } |
| 239 | |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 240 | Log.i(TAG, "PjSIPStack started"); |
| 241 | managerImpl = SFLPhoneservice.instance(); |
| 242 | |
| 243 | /* set static AppPath before calling manager.init */ |
Alexandre Lision | 63870a7 | 2013-10-28 16:33:47 -0400 | [diff] [blame] | 244 | // managerImpl.setPath(getApplication().getFilesDir().getAbsolutePath()); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 245 | |
alision | 3ea8f3c | 2013-07-16 17:35:35 -0400 | [diff] [blame] | 246 | callManagerJNI = new CallManager(); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 247 | callManagerCallBack = new CallManagerCallBack(this); |
| 248 | SFLPhoneservice.setCallbackObject(callManagerCallBack); |
| 249 | |
alision | 3ea8f3c | 2013-07-16 17:35:35 -0400 | [diff] [blame] | 250 | configurationManagerJNI = new ConfigurationManager(); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 251 | configurationManagerCallback = new ConfigurationManagerCallback(this); |
| 252 | SFLPhoneservice.setConfigurationCallbackObject(configurationManagerCallback); |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 253 | managerImpl.init(""); |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 254 | |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 255 | Log.i(TAG, "->startPjSipStack"); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 256 | } |
| 257 | |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 258 | public HashMap<String, SipCall> getCurrent_calls() { |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 259 | return current_calls; |
| 260 | } |
| 261 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 262 | // Enforce same thread contract to ensure we do not call from somewhere else |
| 263 | public class SameThreadException extends Exception { |
| 264 | private static final long serialVersionUID = -905639124232613768L; |
| 265 | |
| 266 | public SameThreadException() { |
| 267 | super("Should be launched from a single worker thread"); |
| 268 | } |
| 269 | } |
| 270 | |
| 271 | public abstract static class SipRunnable implements Runnable { |
| 272 | protected abstract void doRun() throws SameThreadException, RemoteException; |
| 273 | |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 274 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 275 | public void run() { |
| 276 | try { |
| 277 | doRun(); |
| 278 | } catch (SameThreadException e) { |
| 279 | Log.e(TAG, "Not done from same thread"); |
| 280 | } catch (RemoteException e) { |
| 281 | Log.e(TAG, e.toString()); |
| 282 | } |
| 283 | } |
| 284 | } |
| 285 | |
Alexandre Lision | fab23f8 | 2013-11-01 11:22:30 -0400 | [diff] [blame] | 286 | public abstract class SipRunnableWithReturn implements Runnable { |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 287 | Object obj = null; |
| 288 | boolean done = false; |
| 289 | |
| 290 | protected abstract Object doRun() throws SameThreadException; |
| 291 | |
| 292 | public Object getVal() { |
| 293 | return obj; |
| 294 | } |
| 295 | |
| 296 | public boolean isDone() { |
| 297 | return done; |
| 298 | } |
| 299 | |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 300 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 301 | public void run() { |
| 302 | try { |
Alexandre Lision | fab23f8 | 2013-11-01 11:22:30 -0400 | [diff] [blame] | 303 | if(isPjSipStackStarted) |
| 304 | obj = doRun(); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 305 | done = true; |
| 306 | } catch (SameThreadException e) { |
| 307 | Log.e(TAG, "Not done from same thread"); |
| 308 | } |
| 309 | } |
| 310 | } |
| 311 | |
| 312 | class StartRunnable extends SipRunnable { |
| 313 | @Override |
| 314 | protected void doRun() throws SameThreadException { |
| 315 | startPjSipStack(); |
| 316 | } |
| 317 | } |
Alexandre Lision | 63870a7 | 2013-10-28 16:33:47 -0400 | [diff] [blame] | 318 | |
Alexandre Lision | dd68f65 | 2013-10-28 11:00:12 -0400 | [diff] [blame] | 319 | class FinalizeRunnable extends SipRunnable { |
| 320 | @Override |
| 321 | protected void doRun() throws SameThreadException { |
| 322 | stopDaemon(); |
| 323 | } |
| 324 | } |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 325 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 326 | /* ************************************ |
| 327 | * |
| 328 | * Implement public interface for the service |
| 329 | * |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 330 | * ********************************* |
| 331 | */ |
| 332 | |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 333 | private final ISipService.Stub mBinder = new ISipService.Stub() { |
| 334 | |
| 335 | @Override |
alision | fde875f | 2013-05-28 17:01:54 -0400 | [diff] [blame] | 336 | public void placeCall(final SipCall call) { |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 337 | getExecutor().execute(new SipRunnable() { |
| 338 | @Override |
| 339 | protected void doRun() throws SameThreadException { |
| 340 | Log.i(TAG, "SipService.placeCall() thread running..."); |
Alexandre Lision | 3ee516e | 2013-10-07 17:32:15 -0400 | [diff] [blame] | 341 | callManagerJNI.placeCall(call.getAccount().getAccountID(), call.getCallId(), call.getContact().getPhones().get(0).getNumber()); |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 342 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 343 | HashMap<String, String> details = SwigNativeConverter.convertCallDetailsToNative(callManagerJNI.getCallDetails(call.getCallId())); |
Alexandre Lision | ebeb366 | 2013-09-17 16:20:54 -0400 | [diff] [blame] | 344 | // watchout timestamp stored by sflphone is in seconds |
Alexandre Lision | 3c6b710 | 2013-09-16 16:56:46 -0400 | [diff] [blame] | 345 | call.setTimestamp_start(Long.parseLong(details.get(ServiceConstants.call.TIMESTAMP_START))); |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 346 | getCurrent_calls().put(call.getCallId(), call); |
Alexandre Lision | 6e9c7e5 | 2013-10-29 15:54:11 -0400 | [diff] [blame] | 347 | mediaManager.obtainAudioFocus(); |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 348 | } |
| 349 | }); |
| 350 | } |
| 351 | |
| 352 | @Override |
| 353 | public void refuse(final String callID) { |
| 354 | getExecutor().execute(new SipRunnable() { |
| 355 | @Override |
| 356 | protected void doRun() throws SameThreadException { |
| 357 | Log.i(TAG, "SipService.refuse() thread running..."); |
| 358 | callManagerJNI.refuse(callID); |
| 359 | } |
| 360 | }); |
| 361 | } |
| 362 | |
| 363 | @Override |
| 364 | public void accept(final String callID) { |
| 365 | getExecutor().execute(new SipRunnable() { |
| 366 | @Override |
| 367 | protected void doRun() throws SameThreadException { |
Tristan Matthews | 40cf25e | 2013-07-24 13:45:15 -0400 | [diff] [blame] | 368 | Log.i(TAG, "SipService.accept() thread running..."); |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 369 | callManagerJNI.accept(callID); |
| 370 | } |
| 371 | }); |
| 372 | } |
| 373 | |
| 374 | @Override |
| 375 | public void hangUp(final String callID) { |
| 376 | getExecutor().execute(new SipRunnable() { |
| 377 | @Override |
| 378 | protected void doRun() throws SameThreadException { |
| 379 | Log.i(TAG, "SipService.hangUp() thread running..."); |
| 380 | callManagerJNI.hangUp(callID); |
| 381 | } |
| 382 | }); |
| 383 | } |
Alexandre Savard | c1b08fe | 2012-09-25 16:24:47 -0400 | [diff] [blame] | 384 | |
| 385 | @Override |
Alexandre Savard | e9dc899 | 2012-10-26 12:12:27 -0400 | [diff] [blame] | 386 | public void hold(final String callID) { |
| 387 | getExecutor().execute(new SipRunnable() { |
| 388 | @Override |
| 389 | protected void doRun() throws SameThreadException { |
| 390 | Log.i(TAG, "SipService.hold() thread running..."); |
| 391 | callManagerJNI.hold(callID); |
| 392 | } |
| 393 | }); |
| 394 | } |
| 395 | |
| 396 | @Override |
| 397 | public void unhold(final String callID) { |
| 398 | getExecutor().execute(new SipRunnable() { |
| 399 | @Override |
| 400 | protected void doRun() throws SameThreadException { |
| 401 | Log.i(TAG, "SipService.unhold() thread running..."); |
| 402 | callManagerJNI.unhold(callID); |
| 403 | } |
| 404 | }); |
| 405 | } |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 406 | |
Alexandre Lision | 6711ab2 | 2013-09-16 15:15:38 -0400 | [diff] [blame] | 407 | @Override |
| 408 | public HashMap<String, String> getCallDetails(String callID) throws RemoteException { |
| 409 | class CallDetails extends SipRunnableWithReturn { |
| 410 | private String id; |
| 411 | |
| 412 | CallDetails(String callID) { |
| 413 | id = callID; |
| 414 | } |
| 415 | |
| 416 | @Override |
| 417 | protected StringMap doRun() throws SameThreadException { |
Alexandre Lision | 3c6b710 | 2013-09-16 16:56:46 -0400 | [diff] [blame] | 418 | Log.i(TAG, "SipService.getCallDetails() thread running..."); |
Alexandre Lision | 6711ab2 | 2013-09-16 15:15:38 -0400 | [diff] [blame] | 419 | return callManagerJNI.getCallDetails(id); |
| 420 | } |
| 421 | } |
| 422 | |
| 423 | CallDetails runInstance = new CallDetails(callID); |
| 424 | getExecutor().execute(runInstance); |
| 425 | |
| 426 | while (!runInstance.isDone()) { |
| 427 | } |
| 428 | StringMap swigmap = (StringMap) runInstance.getVal(); |
| 429 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 430 | HashMap<String, String> nativemap = SwigNativeConverter.convertCallDetailsToNative(swigmap); |
Alexandre Lision | 6711ab2 | 2013-09-16 15:15:38 -0400 | [diff] [blame] | 431 | |
| 432 | return nativemap; |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 433 | |
Alexandre Lision | 6711ab2 | 2013-09-16 15:15:38 -0400 | [diff] [blame] | 434 | } |
Alexandre Savard | e9dc899 | 2012-10-26 12:12:27 -0400 | [diff] [blame] | 435 | |
| 436 | @Override |
Alexandre Savard | c1b08fe | 2012-09-25 16:24:47 -0400 | [diff] [blame] | 437 | public void setAudioPlugin(final String audioPlugin) { |
| 438 | getExecutor().execute(new SipRunnable() { |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 439 | @Override |
| 440 | protected void doRun() throws SameThreadException { |
| 441 | Log.i(TAG, "SipService.setAudioPlugin() thread running..."); |
| 442 | configurationManagerJNI.setAudioPlugin(audioPlugin); |
| 443 | } |
Alexandre Savard | 31d27c6 | 2012-10-04 16:05:08 -0400 | [diff] [blame] | 444 | }); |
| 445 | } |
| 446 | |
| 447 | @Override |
| 448 | public String getCurrentAudioOutputPlugin() { |
| 449 | class CurrentAudioPlugin extends SipRunnableWithReturn { |
| 450 | @Override |
| 451 | protected String doRun() throws SameThreadException { |
| 452 | Log.i(TAG, "SipService.getCurrentAudioOutputPlugin() thread running..."); |
| 453 | return configurationManagerJNI.getCurrentAudioOutputPlugin(); |
| 454 | } |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 455 | } |
| 456 | ; |
Alexandre Savard | 31d27c6 | 2012-10-04 16:05:08 -0400 | [diff] [blame] | 457 | |
| 458 | CurrentAudioPlugin runInstance = new CurrentAudioPlugin(); |
| 459 | getExecutor().execute(runInstance); |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 460 | while (!runInstance.isDone()) { |
alision | 84813a1 | 2013-05-27 17:40:39 -0400 | [diff] [blame] | 461 | // Log.e(TAG, "Waiting for Nofing"); |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 462 | } |
Alexandre Savard | 7a902bc | 2012-10-04 16:32:35 -0400 | [diff] [blame] | 463 | return (String) runInstance.getVal(); |
Alexandre Savard | c1b08fe | 2012-09-25 16:24:47 -0400 | [diff] [blame] | 464 | } |
Alexandre Savard | 713a34d | 2012-09-26 15:50:41 -0400 | [diff] [blame] | 465 | |
| 466 | @Override |
Alexandre Savard | 6b85e7e | 2012-09-27 15:43:14 -0400 | [diff] [blame] | 467 | public ArrayList<String> getAccountList() { |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 468 | class AccountList extends SipRunnableWithReturn { |
| 469 | @Override |
| 470 | protected StringVect doRun() throws SameThreadException { |
| 471 | Log.i(TAG, "SipService.getAccountList() thread running..."); |
| 472 | return configurationManagerJNI.getAccountList(); |
| 473 | } |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 474 | } |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 475 | AccountList runInstance = new AccountList(); |
Alexandre Lision | cdec595 | 2013-07-17 14:18:22 -0400 | [diff] [blame] | 476 | Log.i(TAG, "SipService.getAccountList() thread running..."); |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 477 | getExecutor().execute(runInstance); |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 478 | while (!runInstance.isDone()) { |
alision | 84813a1 | 2013-05-27 17:40:39 -0400 | [diff] [blame] | 479 | // Log.e(TAG, "Waiting for Nofing"); |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 480 | } |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 481 | StringVect swigvect = (StringVect) runInstance.getVal(); |
| 482 | |
Alexandre Savard | 6b85e7e | 2012-09-27 15:43:14 -0400 | [diff] [blame] | 483 | ArrayList<String> nativelist = new ArrayList<String>(); |
Alexandre Savard | 52a7252 | 2012-09-27 16:40:13 -0400 | [diff] [blame] | 484 | |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 485 | for (int i = 0; i < swigvect.size(); i++) |
| 486 | nativelist.add(swigvect.get(i)); |
Alexandre Savard | 52a7252 | 2012-09-27 16:40:13 -0400 | [diff] [blame] | 487 | |
Alexandre Savard | 6b85e7e | 2012-09-27 15:43:14 -0400 | [diff] [blame] | 488 | return nativelist; |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 489 | } |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 490 | |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 491 | @Override |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 492 | public void setAccountOrder(final String order) { |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 493 | getExecutor().execute(new SipRunnable() { |
| 494 | @Override |
| 495 | protected void doRun() throws SameThreadException { |
| 496 | Log.i(TAG, "SipService.setAccountsOrder() thread running..."); |
| 497 | configurationManagerJNI.setAccountsOrder(order); |
| 498 | } |
| 499 | }); |
| 500 | } |
Alexandre Savard | 6b85e7e | 2012-09-27 15:43:14 -0400 | [diff] [blame] | 501 | |
| 502 | @Override |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 503 | public HashMap<String, String> getAccountDetails(final String accountID) { |
Alexandre Savard | 7a902bc | 2012-10-04 16:32:35 -0400 | [diff] [blame] | 504 | class AccountDetails extends SipRunnableWithReturn { |
| 505 | private String id; |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 506 | |
| 507 | AccountDetails(String accountId) { |
| 508 | id = accountId; |
| 509 | } |
| 510 | |
Alexandre Savard | 7a902bc | 2012-10-04 16:32:35 -0400 | [diff] [blame] | 511 | @Override |
| 512 | protected StringMap doRun() throws SameThreadException { |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 513 | Log.i(TAG, "SipService.getAccountDetails() thread running..."); |
Alexandre Savard | 7a902bc | 2012-10-04 16:32:35 -0400 | [diff] [blame] | 514 | return configurationManagerJNI.getAccountDetails(id); |
| 515 | } |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 516 | } |
Alexandre Savard | 7a902bc | 2012-10-04 16:32:35 -0400 | [diff] [blame] | 517 | |
| 518 | AccountDetails runInstance = new AccountDetails(accountID); |
| 519 | getExecutor().execute(runInstance); |
alision | fde875f | 2013-05-28 17:01:54 -0400 | [diff] [blame] | 520 | |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 521 | while (!runInstance.isDone()) { |
| 522 | } |
| 523 | StringMap swigmap = (StringMap) runInstance.getVal(); |
Alexandre Savard | 713a34d | 2012-09-26 15:50:41 -0400 | [diff] [blame] | 524 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 525 | HashMap<String, String> nativemap = SwigNativeConverter.convertAccountToNative(swigmap); |
Alexandre Savard | 713a34d | 2012-09-26 15:50:41 -0400 | [diff] [blame] | 526 | |
| 527 | return nativemap; |
| 528 | } |
Alexandre Savard | 8b7d433 | 2012-09-30 20:02:11 -0400 | [diff] [blame] | 529 | |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 530 | @SuppressWarnings("unchecked") |
| 531 | // Hashmap runtime cast |
Alexandre Savard | 8b7d433 | 2012-09-30 20:02:11 -0400 | [diff] [blame] | 532 | @Override |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 533 | public void setAccountDetails(final String accountId, final Map map) { |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 534 | HashMap<String, String> nativemap = (HashMap<String, String>) map; |
Alexandre Savard | 8b7d433 | 2012-09-30 20:02:11 -0400 | [diff] [blame] | 535 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 536 | final StringMap swigmap = SwigNativeConverter.convertFromNativeToSwig(nativemap); |
Alexandre Savard | 718d49f | 2012-10-02 15:17:13 -0400 | [diff] [blame] | 537 | |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 538 | getExecutor().execute(new SipRunnable() { |
| 539 | @Override |
| 540 | protected void doRun() throws SameThreadException { |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 541 | |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 542 | configurationManagerJNI.setAccountDetails(accountId, swigmap); |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 543 | Log.i(TAG, "SipService.setAccountDetails() thread running..."); |
| 544 | } |
| 545 | |
Alexandre Savard | 7a2b220 | 2012-10-04 17:07:33 -0400 | [diff] [blame] | 546 | }); |
Alexandre Savard | 8b7d433 | 2012-09-30 20:02:11 -0400 | [diff] [blame] | 547 | } |
| 548 | |
Alexandre Lision | 451f2a8 | 2013-11-12 12:55:55 -0500 | [diff] [blame] | 549 | @Override |
| 550 | public Map getAccountTemplate() throws RemoteException { |
| 551 | class AccountTemplate extends SipRunnableWithReturn { |
| 552 | |
| 553 | @Override |
| 554 | protected StringMap doRun() throws SameThreadException { |
| 555 | Log.i(TAG, "SipService.getAccountTemplate() thread running..."); |
| 556 | return configurationManagerJNI.getAccountTemplate(); |
| 557 | } |
| 558 | } |
| 559 | |
| 560 | AccountTemplate runInstance = new AccountTemplate(); |
| 561 | getExecutor().execute(runInstance); |
| 562 | |
| 563 | while (!runInstance.isDone()) { |
| 564 | } |
| 565 | StringMap swigmap = (StringMap) runInstance.getVal(); |
| 566 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 567 | HashMap<String, String> nativemap = SwigNativeConverter.convertAccountToNative(swigmap); |
Alexandre Lision | 451f2a8 | 2013-11-12 12:55:55 -0500 | [diff] [blame] | 568 | |
| 569 | return nativemap; |
| 570 | } |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 571 | |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 572 | @SuppressWarnings("unchecked") |
| 573 | // Hashmap runtime cast |
Alexandre Savard | 4603657 | 2012-10-05 13:56:49 -0400 | [diff] [blame] | 574 | @Override |
| 575 | public String addAccount(Map map) { |
| 576 | class AddAccount extends SipRunnableWithReturn { |
| 577 | StringMap map; |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 578 | |
| 579 | AddAccount(StringMap m) { |
| 580 | map = m; |
| 581 | } |
| 582 | |
Alexandre Savard | 4603657 | 2012-10-05 13:56:49 -0400 | [diff] [blame] | 583 | @Override |
| 584 | protected String doRun() throws SameThreadException { |
| 585 | Log.i(TAG, "SipService.getAccountDetails() thread running..."); |
| 586 | return configurationManagerJNI.addAccount(map); |
| 587 | } |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 588 | } |
Alexandre Savard | 4603657 | 2012-10-05 13:56:49 -0400 | [diff] [blame] | 589 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 590 | final StringMap swigmap = SwigNativeConverter.convertFromNativeToSwig((HashMap<String, String>) map); |
Alexandre Savard | 4603657 | 2012-10-05 13:56:49 -0400 | [diff] [blame] | 591 | |
| 592 | AddAccount runInstance = new AddAccount(swigmap); |
| 593 | getExecutor().execute(runInstance); |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 594 | while (!runInstance.isDone()) { |
alision | 84813a1 | 2013-05-27 17:40:39 -0400 | [diff] [blame] | 595 | // Log.e(TAG, "Waiting for Nofing"); |
alision | 371b77e | 2013-04-23 14:51:26 -0400 | [diff] [blame] | 596 | } |
Alexandre Savard | 4603657 | 2012-10-05 13:56:49 -0400 | [diff] [blame] | 597 | String accountId = (String) runInstance.getVal(); |
| 598 | |
| 599 | return accountId; |
| 600 | } |
| 601 | |
| 602 | @Override |
| 603 | public void removeAccount(final String accountId) { |
| 604 | getExecutor().execute(new SipRunnable() { |
| 605 | @Override |
| 606 | protected void doRun() throws SameThreadException { |
| 607 | Log.i(TAG, "SipService.setAccountDetails() thread running..."); |
| 608 | configurationManagerJNI.removeAccount(accountId); |
| 609 | } |
| 610 | }); |
| 611 | } |
alision | 5f89963 | 2013-04-22 17:26:56 -0400 | [diff] [blame] | 612 | |
alision | e2a38e1 | 2013-04-25 14:20:20 -0400 | [diff] [blame] | 613 | @Override |
| 614 | public ArrayList<HashMap<String, String>> getHistory() throws RemoteException { |
| 615 | class History extends SipRunnableWithReturn { |
| 616 | |
| 617 | @Override |
| 618 | protected VectMap doRun() throws SameThreadException { |
| 619 | Log.i(TAG, "SipService.getHistory() thread running..."); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 620 | |
alision | e2a38e1 | 2013-04-25 14:20:20 -0400 | [diff] [blame] | 621 | return configurationManagerJNI.getHistory(); |
| 622 | } |
| 623 | } |
| 624 | |
| 625 | History runInstance = new History(); |
| 626 | getExecutor().execute(runInstance); |
| 627 | while (!runInstance.isDone()) { |
alision | 84813a1 | 2013-05-27 17:40:39 -0400 | [diff] [blame] | 628 | // Log.w(TAG, "Waiting for getHistory"); |
alision | e2a38e1 | 2013-04-25 14:20:20 -0400 | [diff] [blame] | 629 | } |
alision | 1005ba1 | 2013-06-19 13:52:44 -0400 | [diff] [blame] | 630 | Log.i(TAG, "SipService.getHistory() DONE"); |
alision | e2a38e1 | 2013-04-25 14:20:20 -0400 | [diff] [blame] | 631 | VectMap swigmap = (VectMap) runInstance.getVal(); |
| 632 | |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 633 | ArrayList<HashMap<String, String>> nativemap = SwigNativeConverter.convertHistoryToNative(swigmap); |
alision | e2a38e1 | 2013-04-25 14:20:20 -0400 | [diff] [blame] | 634 | |
| 635 | return nativemap; |
| 636 | } |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 637 | |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 638 | /************************* |
| 639 | * Transfer related API |
| 640 | *************************/ |
| 641 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 642 | @Override |
| 643 | public void transfer(final String callID, final String to) throws RemoteException { |
| 644 | getExecutor().execute(new SipRunnable() { |
| 645 | @Override |
| 646 | protected void doRun() throws SameThreadException, RemoteException { |
| 647 | Log.i(TAG, "SipService.transfer() thread running..."); |
| 648 | if (callManagerJNI.transfer(callID, to)) { |
| 649 | Bundle bundle = new Bundle(); |
| 650 | bundle.putString("CallID", callID); |
| 651 | bundle.putString("State", "HUNGUP"); |
| 652 | Intent intent = new Intent(CallManagerCallBack.CALL_STATE_CHANGED); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 653 | intent.putExtra("com.savoirfairelinux.sflphone.service.newstate", bundle); |
alision | 84813a1 | 2013-05-27 17:40:39 -0400 | [diff] [blame] | 654 | sendBroadcast(intent); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 655 | } else |
| 656 | Log.i(TAG, "NOT OK"); |
| 657 | } |
| 658 | }); |
| 659 | |
| 660 | } |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 661 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 662 | @Override |
| 663 | public void attendedTransfer(final String transferID, final String targetID) throws RemoteException { |
| 664 | getExecutor().execute(new SipRunnable() { |
| 665 | @Override |
| 666 | protected void doRun() throws SameThreadException, RemoteException { |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 667 | Log.i(TAG, "SipService.attendedTransfer() thread running..."); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 668 | if (callManagerJNI.attendedTransfer(transferID, targetID)) { |
| 669 | Log.i(TAG, "OK"); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 670 | } else |
| 671 | Log.i(TAG, "NOT OK"); |
| 672 | } |
| 673 | }); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 674 | |
| 675 | } |
| 676 | |
| 677 | /************************* |
| 678 | * Conference related API |
| 679 | *************************/ |
| 680 | |
| 681 | @Override |
| 682 | public void removeConference(final String confID) throws RemoteException { |
| 683 | getExecutor().execute(new SipRunnable() { |
| 684 | @Override |
| 685 | protected void doRun() throws SameThreadException, RemoteException { |
| 686 | Log.i(TAG, "SipService.createConference() thread running..."); |
| 687 | callManagerJNI.removeConference(confID); |
| 688 | } |
| 689 | }); |
| 690 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 691 | } |
| 692 | |
| 693 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 694 | public void joinParticipant(final String sel_callID, final String drag_callID) throws RemoteException { |
| 695 | getExecutor().execute(new SipRunnable() { |
| 696 | @Override |
| 697 | protected void doRun() throws SameThreadException, RemoteException { |
| 698 | Log.i(TAG, "SipService.joinParticipant() thread running..."); |
| 699 | callManagerJNI.joinParticipant(sel_callID, drag_callID); |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 700 | // Generate a CONF_CREATED callback |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 701 | } |
| 702 | }); |
| 703 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 704 | } |
| 705 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 706 | @Override |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 707 | public void addParticipant(final SipCall call, final String confID) throws RemoteException { |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 708 | getExecutor().execute(new SipRunnable() { |
| 709 | @Override |
| 710 | protected void doRun() throws SameThreadException, RemoteException { |
| 711 | Log.i(TAG, "SipService.addParticipant() thread running..."); |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 712 | callManagerJNI.addParticipant(call.getCallId(), confID); |
| 713 | current_confs.get(confID).getParticipants().add(call); |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 714 | } |
| 715 | }); |
| 716 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 717 | } |
| 718 | |
| 719 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 720 | public void addMainParticipant(final String confID) throws RemoteException { |
| 721 | getExecutor().execute(new SipRunnable() { |
| 722 | @Override |
| 723 | protected void doRun() throws SameThreadException, RemoteException { |
| 724 | Log.i(TAG, "SipService.addMainParticipant() thread running..."); |
| 725 | callManagerJNI.addMainParticipant(confID); |
| 726 | } |
| 727 | }); |
| 728 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 729 | } |
| 730 | |
| 731 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 732 | public void detachParticipant(final String callID) throws RemoteException { |
| 733 | getExecutor().execute(new SipRunnable() { |
| 734 | @Override |
| 735 | protected void doRun() throws SameThreadException, RemoteException { |
| 736 | Log.i(TAG, "SipService.detachParticipant() thread running..."); |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 737 | Log.i(TAG, "Detaching " + callID); |
| 738 | Iterator<Entry<String, Conference>> it = current_confs.entrySet().iterator(); |
| 739 | Log.i(TAG, "current_confs size " + current_confs.size()); |
| 740 | while (it.hasNext()) { |
| 741 | Conference tmp = it.next().getValue(); |
| 742 | Log.i(TAG, "conf has " + tmp.getParticipants().size() + " participants"); |
| 743 | if (tmp.contains(callID)) { |
| 744 | current_calls.put(callID, tmp.getCall(callID)); |
| 745 | Log.i(TAG, "Call found and put in current_calls"); |
| 746 | } |
| 747 | } |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 748 | callManagerJNI.detachParticipant(callID); |
| 749 | } |
| 750 | }); |
| 751 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 752 | } |
| 753 | |
| 754 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 755 | public void joinConference(final String sel_confID, final String drag_confID) throws RemoteException { |
| 756 | getExecutor().execute(new SipRunnable() { |
| 757 | @Override |
| 758 | protected void doRun() throws SameThreadException, RemoteException { |
| 759 | Log.i(TAG, "SipService.joinConference() thread running..."); |
| 760 | callManagerJNI.joinConference(sel_confID, drag_confID); |
| 761 | } |
| 762 | }); |
| 763 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 764 | } |
| 765 | |
| 766 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 767 | public void hangUpConference(final String confID) throws RemoteException { |
| 768 | getExecutor().execute(new SipRunnable() { |
| 769 | @Override |
| 770 | protected void doRun() throws SameThreadException, RemoteException { |
| 771 | Log.i(TAG, "SipService.joinConference() thread running..."); |
| 772 | callManagerJNI.hangUpConference(confID); |
| 773 | } |
| 774 | }); |
| 775 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 776 | } |
| 777 | |
| 778 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 779 | public void holdConference(final String confID) throws RemoteException { |
| 780 | getExecutor().execute(new SipRunnable() { |
| 781 | @Override |
| 782 | protected void doRun() throws SameThreadException, RemoteException { |
| 783 | Log.i(TAG, "SipService.holdConference() thread running..."); |
| 784 | callManagerJNI.holdConference(confID); |
| 785 | } |
| 786 | }); |
| 787 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 788 | } |
| 789 | |
| 790 | @Override |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 791 | public void unholdConference(final String confID) throws RemoteException { |
| 792 | getExecutor().execute(new SipRunnable() { |
| 793 | @Override |
| 794 | protected void doRun() throws SameThreadException, RemoteException { |
| 795 | Log.i(TAG, "SipService.unholdConference() thread running..."); |
| 796 | callManagerJNI.unholdConference(confID); |
| 797 | } |
| 798 | }); |
| 799 | |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 800 | } |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 801 | |
alision | cd8fb91 | 2013-06-28 14:43:51 -0400 | [diff] [blame] | 802 | @Override |
| 803 | public boolean isConferenceParticipant(final String callID) throws RemoteException { |
| 804 | class IsParticipant extends SipRunnableWithReturn { |
| 805 | |
| 806 | @Override |
| 807 | protected Boolean doRun() throws SameThreadException { |
| 808 | Log.i(TAG, "SipService.isRecording() thread running..."); |
| 809 | return callManagerJNI.isConferenceParticipant(callID); |
| 810 | } |
| 811 | } |
| 812 | |
| 813 | IsParticipant runInstance = new IsParticipant(); |
| 814 | getExecutor().execute(runInstance); |
| 815 | while (!runInstance.isDone()) { |
| 816 | } |
| 817 | |
| 818 | return (Boolean) runInstance.getVal(); |
| 819 | } |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 820 | |
| 821 | @Override |
alision | df1dac9 | 2013-06-27 17:35:53 -0400 | [diff] [blame] | 822 | public HashMap<String, Conference> getConferenceList() throws RemoteException { |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 823 | // class ConfList extends SipRunnableWithReturn { |
| 824 | // @Override |
| 825 | // protected StringVect doRun() throws SameThreadException { |
| 826 | // Log.i(TAG, "SipService.getConferenceList() thread running..."); |
| 827 | // return callManagerJNI.getConferenceList(); |
| 828 | // } |
| 829 | // } |
| 830 | // ; |
| 831 | // ConfList runInstance = new ConfList(); |
| 832 | // getExecutor().execute(runInstance); |
| 833 | // while (!runInstance.isDone()) { |
| 834 | // // Log.w(TAG, "Waiting for getConferenceList"); |
| 835 | // } |
| 836 | // StringVect swigvect = (StringVect) runInstance.getVal(); |
| 837 | // |
| 838 | // ArrayList<String> nativelist = new ArrayList<String>(); |
| 839 | // |
| 840 | // for (int i = 0; i < swigvect.size(); i++) |
| 841 | // nativelist.add(swigvect.get(i)); |
| 842 | // |
| 843 | // return nativelist; |
alision | df1dac9 | 2013-06-27 17:35:53 -0400 | [diff] [blame] | 844 | return current_confs; |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 845 | } |
| 846 | |
| 847 | @Override |
alision | 907bde7 | 2013-06-20 14:40:37 -0400 | [diff] [blame] | 848 | public List getParticipantList(final String confID) throws RemoteException { |
| 849 | class PartList extends SipRunnableWithReturn { |
| 850 | @Override |
| 851 | protected StringVect doRun() throws SameThreadException { |
| 852 | Log.i(TAG, "SipService.getAccountList() thread running..."); |
| 853 | return callManagerJNI.getParticipantList(confID); |
| 854 | } |
| 855 | } |
| 856 | ; |
| 857 | PartList runInstance = new PartList(); |
| 858 | getExecutor().execute(runInstance); |
| 859 | while (!runInstance.isDone()) { |
| 860 | // Log.w(TAG, "Waiting for getConferenceList"); |
| 861 | } |
| 862 | StringVect swigvect = (StringVect) runInstance.getVal(); |
| 863 | |
| 864 | ArrayList<String> nativelist = new ArrayList<String>(); |
| 865 | |
| 866 | for (int i = 0; i < swigvect.size(); i++) |
| 867 | nativelist.add(swigvect.get(i)); |
| 868 | |
| 869 | return nativelist; |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 870 | } |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 871 | |
alision | 1005ba1 | 2013-06-19 13:52:44 -0400 | [diff] [blame] | 872 | @Override |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 873 | public String getConferenceId(String callID) throws RemoteException { |
alision | 43a9b36 | 2013-05-01 16:30:15 -0400 | [diff] [blame] | 874 | Log.e(TAG, "getConferenceList not implemented"); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 875 | return null; |
| 876 | } |
| 877 | |
| 878 | @Override |
alision | 806e18e | 2013-06-21 15:30:17 -0400 | [diff] [blame] | 879 | public String getConferenceDetails(final String callID) throws RemoteException { |
| 880 | class ConfDetails extends SipRunnableWithReturn { |
| 881 | @Override |
| 882 | protected StringMap doRun() throws SameThreadException { |
| 883 | Log.i(TAG, "SipService.getAccountList() thread running..."); |
| 884 | return callManagerJNI.getConferenceDetails(callID); |
| 885 | } |
| 886 | } |
| 887 | ; |
| 888 | ConfDetails runInstance = new ConfDetails(); |
| 889 | getExecutor().execute(runInstance); |
| 890 | while (!runInstance.isDone()) { |
| 891 | // Log.w(TAG, "Waiting for getConferenceList"); |
| 892 | } |
| 893 | StringMap swigvect = (StringMap) runInstance.getVal(); |
| 894 | |
| 895 | return swigvect.get("CONF_STATE"); |
alision | 7f18fc8 | 2013-05-01 09:37:33 -0400 | [diff] [blame] | 896 | } |
| 897 | |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 898 | @Override |
| 899 | public String getRecordPath() throws RemoteException { |
| 900 | class RecordPath extends SipRunnableWithReturn { |
| 901 | |
| 902 | @Override |
| 903 | protected String doRun() throws SameThreadException { |
| 904 | Log.i(TAG, "SipService.getRecordPath() thread running..."); |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 905 | return configurationManagerJNI.getRecordPath(); |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 906 | } |
| 907 | } |
| 908 | |
| 909 | RecordPath runInstance = new RecordPath(); |
| 910 | getExecutor().execute(runInstance); |
| 911 | while (!runInstance.isDone()) { |
alision | 84813a1 | 2013-05-27 17:40:39 -0400 | [diff] [blame] | 912 | // Log.w(TAG, "Waiting for getRecordPath"); |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 913 | } |
| 914 | String path = (String) runInstance.getVal(); |
| 915 | |
| 916 | return path; |
| 917 | } |
| 918 | |
| 919 | @Override |
Alexandre Lision | a764c68 | 2013-09-09 10:02:07 -0400 | [diff] [blame] | 920 | public boolean toggleRecordingCall(final String id) throws RemoteException { |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 921 | |
Alexandre Lision | a764c68 | 2013-09-09 10:02:07 -0400 | [diff] [blame] | 922 | class ToggleRecording extends SipRunnableWithReturn { |
| 923 | |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 924 | @Override |
Alexandre Lision | a764c68 | 2013-09-09 10:02:07 -0400 | [diff] [blame] | 925 | protected Boolean doRun() throws SameThreadException { |
| 926 | Log.i(TAG, "SipService.toggleRecordingCall() thread running..."); |
Alexandre Lision | 3874e55 | 2013-11-04 17:20:12 -0500 | [diff] [blame] | 927 | boolean result = callManagerJNI.toggleRecording(id); |
| 928 | |
| 929 | if(getCurrent_calls().containsKey(id)){ |
| 930 | getCurrent_calls().get(id).setRecording(result); |
| 931 | } else if(getCurrent_confs().containsKey(id)){ |
| 932 | getCurrent_confs().get(id).setRecording(result); |
| 933 | } else { |
| 934 | // A call in a conference has been put on hold |
| 935 | Iterator<Conference> it = getCurrent_confs().values().iterator(); |
| 936 | while (it.hasNext()) { |
| 937 | Conference c = it.next(); |
| 938 | if (c.getCall(id) != null) |
| 939 | c.getCall(id).setRecording(result); |
| 940 | } |
| 941 | } |
| 942 | return result; |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 943 | } |
Alexandre Lision | a764c68 | 2013-09-09 10:02:07 -0400 | [diff] [blame] | 944 | } |
| 945 | |
| 946 | ToggleRecording runInstance = new ToggleRecording(); |
| 947 | getExecutor().execute(runInstance); |
| 948 | while (!runInstance.isDone()) { |
| 949 | } |
| 950 | |
| 951 | return (Boolean) runInstance.getVal(); |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 952 | |
| 953 | } |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 954 | |
alision | 50fa072 | 2013-06-25 17:29:44 -0400 | [diff] [blame] | 955 | @Override |
| 956 | public boolean startRecordedFilePlayback(final String filepath) throws RemoteException { |
| 957 | getExecutor().execute(new SipRunnable() { |
| 958 | @Override |
| 959 | protected void doRun() throws SameThreadException, RemoteException { |
| 960 | Log.i(TAG, "SipService.setRecordingCall() thread running..."); |
| 961 | callManagerJNI.startRecordedFilePlayback(filepath); |
| 962 | } |
| 963 | }); |
| 964 | return false; |
| 965 | } |
| 966 | |
| 967 | @Override |
| 968 | public void stopRecordedFilePlayback(final String filepath) throws RemoteException { |
| 969 | getExecutor().execute(new SipRunnable() { |
| 970 | @Override |
| 971 | protected void doRun() throws SameThreadException, RemoteException { |
| 972 | Log.i(TAG, "SipService.stopRecordedFilePlayback() thread running..."); |
| 973 | callManagerJNI.stopRecordedFilePlayback(filepath); |
| 974 | } |
| 975 | }); |
| 976 | } |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 977 | |
| 978 | @Override |
| 979 | public void setRecordPath(final String path) throws RemoteException { |
| 980 | getExecutor().execute(new SipRunnable() { |
| 981 | @Override |
| 982 | protected void doRun() throws SameThreadException, RemoteException { |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 983 | Log.i(TAG, "SipService.setRecordPath() " + path + " thread running..."); |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 984 | configurationManagerJNI.setRecordPath(path); |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 985 | } |
| 986 | }); |
| 987 | } |
| 988 | |
| 989 | @Override |
Alexandre Lision | d568603 | 2013-10-29 11:09:21 -0400 | [diff] [blame] | 990 | public void sendTextMessage(final String callID, final SipMessage message) throws RemoteException { |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 991 | getExecutor().execute(new SipRunnable() { |
| 992 | @Override |
| 993 | protected void doRun() throws SameThreadException, RemoteException { |
| 994 | Log.i(TAG, "SipService.sendTextMessage() thread running..."); |
Alexandre Lision | d568603 | 2013-10-29 11:09:21 -0400 | [diff] [blame] | 995 | callManagerJNI.sendTextMessage(callID, message.comment); |
Alexandre Lision | d554523 | 2013-10-29 11:24:02 -0400 | [diff] [blame] | 996 | if(getCurrent_calls().get(callID) != null) |
| 997 | getCurrent_calls().get(callID).addSipMessage(message); |
| 998 | else if(getCurrent_confs().get(callID) != null) |
| 999 | getCurrent_confs().get(callID).addSipMessage(message); |
alision | 04a0018 | 2013-05-10 17:05:29 -0400 | [diff] [blame] | 1000 | } |
| 1001 | }); |
| 1002 | |
| 1003 | } |
| 1004 | |
alision | d295ec2 | 2013-05-17 10:12:13 -0400 | [diff] [blame] | 1005 | @Override |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 1006 | public List getAudioCodecList(final String accountID) throws RemoteException { |
Alexandre Lision | afd40e4 | 2013-10-15 13:48:37 -0400 | [diff] [blame] | 1007 | class AudioCodecList extends SipRunnableWithReturn { |
| 1008 | |
| 1009 | @Override |
Alexandre Lision | 933ef0a | 2013-10-15 17:28:40 -0400 | [diff] [blame] | 1010 | protected ArrayList<Codec> doRun() throws SameThreadException { |
Alexandre Lision | afd40e4 | 2013-10-15 13:48:37 -0400 | [diff] [blame] | 1011 | Log.i(TAG, "SipService.getAudioCodecList() thread running..."); |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 1012 | ArrayList<Codec> results = new ArrayList<Codec>(); |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 1013 | |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 1014 | IntVect active_payloads = configurationManagerJNI.getActiveAudioCodecList(accountID); |
| 1015 | for (int i = 0; i < active_payloads.size(); ++i) { |
| 1016 | |
Alexandre Lision | 039a3cf | 2013-10-16 17:44:57 -0400 | [diff] [blame] | 1017 | results.add(new Codec(active_payloads.get(i), configurationManagerJNI.getAudioCodecDetails(active_payloads.get(i)), true)); |
Alexandre Lision | e004544 | 2013-10-25 09:16:19 -0400 | [diff] [blame] | 1018 | |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 1019 | } |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 1020 | |
Alexandre Lision | 039a3cf | 2013-10-16 17:44:57 -0400 | [diff] [blame] | 1021 | // if (results.get(active_payloads.get(i)) != null) { |
| 1022 | // results.get(active_payloads.get(i)).setEnabled(true); |
Alexandre Lision | 451f2a8 | 2013-11-12 12:55:55 -0500 | [diff] [blame] | 1023 | |
Alexandre Lision | 039a3cf | 2013-10-16 17:44:57 -0400 | [diff] [blame] | 1024 | IntVect payloads = configurationManagerJNI.getAudioCodecList(); |
| 1025 | |
| 1026 | for (int i = 0; i < payloads.size(); ++i) { |
| 1027 | boolean isActive = false; |
| 1028 | for (Codec co : results) { |
| 1029 | if (co.getPayload().toString().contentEquals(String.valueOf(payloads.get(i)))) |
| 1030 | isActive = true; |
| 1031 | |
| 1032 | } |
| 1033 | if (isActive) |
| 1034 | continue; |
| 1035 | else |
| 1036 | results.add(new Codec(payloads.get(i), configurationManagerJNI.getAudioCodecDetails(payloads.get(i)), false)); |
| 1037 | |
| 1038 | } |
| 1039 | |
| 1040 | // if (!results.containsKey(payloads.get(i))) { |
| 1041 | // results.put(payloads.get(i), new Codec(payloads.get(i), configurationManagerJNI.getAudioCodecDetails(payloads.get(i)), false)); |
| 1042 | // Log.i(TAG, "Other, Adding:" + results.get((payloads.get(i))).getName()); |
| 1043 | // } |
| 1044 | |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 1045 | return results; |
Alexandre Lision | afd40e4 | 2013-10-15 13:48:37 -0400 | [diff] [blame] | 1046 | } |
| 1047 | } |
| 1048 | |
| 1049 | AudioCodecList runInstance = new AudioCodecList(); |
| 1050 | getExecutor().execute(runInstance); |
| 1051 | while (!runInstance.isDone()) { |
Alexandre Lision | afd40e4 | 2013-10-15 13:48:37 -0400 | [diff] [blame] | 1052 | } |
Alexandre Lision | 933ef0a | 2013-10-15 17:28:40 -0400 | [diff] [blame] | 1053 | ArrayList<Codec> codecs = (ArrayList<Codec>) runInstance.getVal(); |
Alexandre Lision | afd40e4 | 2013-10-15 13:48:37 -0400 | [diff] [blame] | 1054 | return codecs; |
alision | d295ec2 | 2013-05-17 10:12:13 -0400 | [diff] [blame] | 1055 | } |
| 1056 | |
alision | 9f7a6ec | 2013-05-24 16:26:26 -0400 | [diff] [blame] | 1057 | @Override |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 1058 | public Map getRingtoneList() throws RemoteException { |
| 1059 | class RingtoneList extends SipRunnableWithReturn { |
| 1060 | |
| 1061 | @Override |
| 1062 | protected StringMap doRun() throws SameThreadException { |
| 1063 | Log.i(TAG, "SipService.getRingtoneList() thread running..."); |
| 1064 | return configurationManagerJNI.getRingtoneList(); |
| 1065 | } |
| 1066 | } |
| 1067 | |
| 1068 | RingtoneList runInstance = new RingtoneList(); |
| 1069 | getExecutor().execute(runInstance); |
| 1070 | while (!runInstance.isDone()) { |
| 1071 | } |
Alexandre Lision | 4b4233a | 2013-10-16 17:24:17 -0400 | [diff] [blame] | 1072 | StringMap ringtones = (StringMap) runInstance.getVal(); |
| 1073 | |
| 1074 | for (int i = 0; i < ringtones.size(); ++i) { |
| 1075 | // Log.i(TAG,"ringtones "+i+" "+ ringtones.); |
| 1076 | } |
| 1077 | |
Alexandre Lision | 4cf7870 | 2013-10-16 13:43:23 -0400 | [diff] [blame] | 1078 | return null; |
| 1079 | } |
| 1080 | |
| 1081 | @Override |
| 1082 | public void setActiveCodecList(final List codecs, final String accountID) throws RemoteException { |
| 1083 | getExecutor().execute(new SipRunnable() { |
| 1084 | @Override |
| 1085 | protected void doRun() throws SameThreadException, RemoteException { |
| 1086 | Log.i(TAG, "SipService.setActiveAudioCodecList() thread running..."); |
| 1087 | StringVect list = new StringVect(); |
| 1088 | for (int i = 0; i < codecs.size(); ++i) { |
| 1089 | list.add((String) codecs.get(i)); |
| 1090 | } |
| 1091 | configurationManagerJNI.setActiveAudioCodecList(list, accountID); |
| 1092 | } |
| 1093 | }); |
| 1094 | } |
| 1095 | |
| 1096 | @Override |
alision | fde875f | 2013-05-28 17:01:54 -0400 | [diff] [blame] | 1097 | public HashMap<String, SipCall> getCallList() throws RemoteException { |
alision | 8570418 | 2013-05-29 15:23:03 -0400 | [diff] [blame] | 1098 | // class CallList extends SipRunnableWithReturn { |
| 1099 | // |
| 1100 | // @Override |
| 1101 | // protected StringVect doRun() throws SameThreadException { |
| 1102 | // Log.i(TAG, "SipService.getCallList() thread running..."); |
| 1103 | // return callManagerJNI.getCallList(); |
| 1104 | // } |
| 1105 | // } |
| 1106 | // |
| 1107 | // CallList runInstance = new CallList(); |
| 1108 | // getExecutor().execute(runInstance); |
| 1109 | // while (!runInstance.isDone()) { |
| 1110 | // Log.w(TAG, "Waiting for getAudioCodecList"); |
| 1111 | // } |
| 1112 | // StringVect swigmap = (StringVect) runInstance.getVal(); |
| 1113 | // |
| 1114 | // ArrayList<String> nativemap = new ArrayList<String>(); |
| 1115 | // for (int i = 0; i < swigmap.size(); ++i) { |
| 1116 | // |
| 1117 | // String t = swigmap.get(i); |
| 1118 | // nativemap.add(t); |
| 1119 | // } |
Alexandre Lision | afd40e4 | 2013-10-15 13:48:37 -0400 | [diff] [blame] | 1120 | // if(callManagerJNI == null) |
| 1121 | // return new HashMap<String, SipCall>(); |
| 1122 | // |
| 1123 | // |
| 1124 | // HashMap<String, SipCall> results = new HashMap<String, SipCall>(); |
| 1125 | // StringVect calls = callManagerJNI.getCallList(); |
| 1126 | // for(int i = 0 ; i < calls.size(); ++i){ |
| 1127 | // results.put(calls.get(i), new SipCall(calls.get(i), callManagerJNI.getCallDetails(calls.get(i)))); |
| 1128 | // } |
alision | 9f7a6ec | 2013-05-24 16:26:26 -0400 | [diff] [blame] | 1129 | |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1130 | return getCurrent_calls(); |
alision | 9f7a6ec | 2013-05-24 16:26:26 -0400 | [diff] [blame] | 1131 | } |
| 1132 | |
alision | 8570418 | 2013-05-29 15:23:03 -0400 | [diff] [blame] | 1133 | @Override |
| 1134 | public SipCall getCall(String callID) throws RemoteException { |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1135 | return getCurrent_calls().get(callID); |
| 1136 | } |
| 1137 | |
| 1138 | /*********************** |
| 1139 | * Notification API |
| 1140 | ***********************/ |
| 1141 | @Override |
| 1142 | public void createNotification() throws RemoteException { |
| 1143 | makeNotification(); |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1144 | |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1145 | } |
| 1146 | |
| 1147 | @Override |
| 1148 | public void destroyNotification() throws RemoteException { |
| 1149 | removeNotification(); |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1150 | |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1151 | } |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1152 | |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 1153 | private final int NOTIFICATION_ID = new Random().nextInt(1000); |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1154 | |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1155 | private void makeNotification() { |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1156 | if (current_calls.size() == 0) { |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1157 | return; |
| 1158 | } |
Alexandre Lision | 4ab5397 | 2013-11-04 16:59:18 -0500 | [diff] [blame] | 1159 | Intent notificationIntent = new Intent(getApplicationContext(), HomeActivity.class); |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1160 | PendingIntent contentIntent = PendingIntent.getActivity(getApplicationContext(), 007, notificationIntent, |
| 1161 | PendingIntent.FLAG_UPDATE_CURRENT); |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1162 | |
| 1163 | NotificationManager nm = (NotificationManager) getBaseContext().getSystemService(Context.NOTIFICATION_SERVICE); |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 1164 | nm.cancel(NOTIFICATION_ID); // clear previous notifications. |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1165 | |
| 1166 | NotificationCompat.Builder builder = new NotificationCompat.Builder(getBaseContext()); |
Alexandre Lision | 5f733bc | 2013-12-04 13:10:30 -0500 | [diff] [blame] | 1167 | |
alision | cc7bb42 | 2013-06-06 15:31:39 -0400 | [diff] [blame] | 1168 | builder.setContentIntent(contentIntent).setOngoing(true).setSmallIcon(R.drawable.ic_launcher) |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 1169 | .setContentTitle(getCurrent_calls().size() + " ongoing calls").setTicker("Pending calls").setWhen(System.currentTimeMillis()) |
| 1170 | .setAutoCancel(false); |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1171 | builder.setPriority(NotificationCompat.PRIORITY_MAX); |
| 1172 | Notification n = builder.build(); |
| 1173 | |
| 1174 | nm.notify(NOTIFICATION_ID, n); |
alision | 2cb9956 | 2013-05-30 17:02:20 -0400 | [diff] [blame] | 1175 | } |
| 1176 | |
| 1177 | public void removeNotification() { |
| 1178 | NotificationManager nm = (NotificationManager) getBaseContext().getSystemService(Context.NOTIFICATION_SERVICE); |
| 1179 | nm.cancel(NOTIFICATION_ID); |
alision | 8570418 | 2013-05-29 15:23:03 -0400 | [diff] [blame] | 1180 | } |
| 1181 | |
alision | df1dac9 | 2013-06-27 17:35:53 -0400 | [diff] [blame] | 1182 | @Override |
| 1183 | public Conference getCurrentCall() throws RemoteException { |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 1184 | for (SipCall i : current_calls.values()) { |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 1185 | |
Alexandre Lision | c51ccb1 | 2013-09-11 16:00:30 -0400 | [diff] [blame] | 1186 | // Incoming >> Ongoing |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 1187 | if (i.isIncoming()) { |
Alexandre Lision | c51ccb1 | 2013-09-11 16:00:30 -0400 | [diff] [blame] | 1188 | Conference tmp = new Conference("-1"); |
| 1189 | tmp.getParticipants().add(i); |
| 1190 | return tmp; |
| 1191 | } |
Adrien Béraud | 9360f24 | 2013-09-19 11:07:42 +1000 | [diff] [blame] | 1192 | |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 1193 | if (i.isOngoing()) { |
alision | df1dac9 | 2013-06-27 17:35:53 -0400 | [diff] [blame] | 1194 | Conference tmp = new Conference("-1"); |
| 1195 | tmp.getParticipants().add(i); |
| 1196 | return tmp; |
| 1197 | } |
| 1198 | } |
Alexandre Lision | 6781719 | 2013-07-18 12:04:30 -0400 | [diff] [blame] | 1199 | |
| 1200 | if (!current_confs.isEmpty()) { |
alision | df1dac9 | 2013-06-27 17:35:53 -0400 | [diff] [blame] | 1201 | return (Conference) current_confs.values().toArray()[0]; |
| 1202 | } |
| 1203 | return null; |
| 1204 | } |
| 1205 | |
Alexandre Lision | 64dc8c0 | 2013-09-25 15:32:25 -0400 | [diff] [blame] | 1206 | @Override |
| 1207 | public void playDtmf(final String key) throws RemoteException { |
| 1208 | getExecutor().execute(new SipRunnable() { |
| 1209 | @Override |
| 1210 | protected void doRun() throws SameThreadException, RemoteException { |
| 1211 | Log.i(TAG, "SipService.playDtmf() thread running..."); |
| 1212 | callManagerJNI.playDTMF(key); |
| 1213 | } |
| 1214 | }); |
| 1215 | } |
| 1216 | |
Alexandre Lision | 6ae652d | 2013-09-26 16:39:20 -0400 | [diff] [blame] | 1217 | @Override |
| 1218 | public List getConcurrentCalls() throws RemoteException { |
| 1219 | ArrayList<Conference> toReturn = new ArrayList<Conference>(); |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 1220 | |
| 1221 | for (SipCall sip : current_calls.values()) { |
| 1222 | if (!sip.isCurrent()) { |
Alexandre Lision | 6ae652d | 2013-09-26 16:39:20 -0400 | [diff] [blame] | 1223 | Conference tmp = new Conference("-1"); |
| 1224 | tmp.getParticipants().add(sip); |
| 1225 | toReturn.add(tmp); |
| 1226 | } |
| 1227 | } |
Alexandre Lision | b4a9e39 | 2013-10-01 14:39:43 -0400 | [diff] [blame] | 1228 | |
| 1229 | Log.i(TAG, "toReturn SIZE " + toReturn.size()); |
| 1230 | |
Alexandre Lision | 6ae652d | 2013-09-26 16:39:20 -0400 | [diff] [blame] | 1231 | return toReturn; |
| 1232 | } |
| 1233 | |
Alexandre Lision | 4fb2262 | 2013-10-21 16:26:33 -0400 | [diff] [blame] | 1234 | @Override |
| 1235 | public String getCurrentAudioCodecName(String callID) throws RemoteException { |
| 1236 | return callManagerJNI.getCurrentAudioCodecName(callID); |
| 1237 | } |
| 1238 | |
Alexandre Lision | 31e3090 | 2013-11-08 15:16:59 -0500 | [diff] [blame] | 1239 | @Override |
| 1240 | public void setMuted(final boolean mute) throws RemoteException { |
| 1241 | getExecutor().execute(new SipRunnable() { |
| 1242 | @Override |
| 1243 | protected void doRun() throws SameThreadException, RemoteException { |
| 1244 | Log.i(TAG, "SipService.setMuted() thread running..."); |
| 1245 | configurationManagerJNI.muteCapture(mute); |
| 1246 | } |
| 1247 | }); |
| 1248 | } |
| 1249 | |
| 1250 | @Override |
| 1251 | public boolean isCaptureMuted() throws RemoteException { |
| 1252 | class IsMuted extends SipRunnableWithReturn { |
| 1253 | |
| 1254 | @Override |
| 1255 | protected Boolean doRun() throws SameThreadException { |
| 1256 | Log.i(TAG, "SipService.isCaptureMuted() thread running..."); |
| 1257 | return configurationManagerJNI.isCaptureMuted(); |
| 1258 | } |
| 1259 | } |
| 1260 | |
| 1261 | IsMuted runInstance = new IsMuted(); |
| 1262 | getExecutor().execute(runInstance); |
| 1263 | while (!runInstance.isDone()) { |
| 1264 | } |
| 1265 | |
| 1266 | return (Boolean) runInstance.getVal(); |
| 1267 | } |
| 1268 | |
Alexandre Lision | 3b7148e | 2013-11-13 17:23:06 -0500 | [diff] [blame] | 1269 | @Override |
| 1270 | public List getCredentials(final String accountID) throws RemoteException { |
| 1271 | class Credentials extends SipRunnableWithReturn { |
| 1272 | |
| 1273 | @Override |
| 1274 | protected List doRun() throws SameThreadException { |
| 1275 | Log.i(TAG, "SipService.getCredentials() thread running..."); |
| 1276 | VectMap map = configurationManagerJNI.getCredentials(accountID); |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 1277 | ArrayList<HashMap<String, String>> result = SwigNativeConverter.convertCredentialsToNative(map); |
Alexandre Lision | 3b7148e | 2013-11-13 17:23:06 -0500 | [diff] [blame] | 1278 | return result; |
| 1279 | } |
| 1280 | } |
| 1281 | |
| 1282 | Credentials runInstance = new Credentials(); |
| 1283 | getExecutor().execute(runInstance); |
| 1284 | while (!runInstance.isDone()) { |
| 1285 | } |
| 1286 | return (List) runInstance.getVal(); |
| 1287 | } |
| 1288 | |
| 1289 | @Override |
| 1290 | public void setCredentials(final String accountID, final List creds) throws RemoteException { |
| 1291 | getExecutor().execute(new SipRunnable() { |
| 1292 | @Override |
| 1293 | protected void doRun() throws SameThreadException, RemoteException { |
| 1294 | Log.i(TAG, "SipService.setCredentials() thread running..."); |
Alexandre Lision | 3cefec2 | 2013-11-14 17:26:35 -0500 | [diff] [blame] | 1295 | ArrayList<HashMap<String, String>> list = (ArrayList<HashMap<String, String>>) creds; |
Alexandre Lision | 2aae48d | 2013-12-04 13:50:38 -0500 | [diff] [blame] | 1296 | configurationManagerJNI.setCredentials(accountID, SwigNativeConverter.convertFromNativeToSwig(creds)); |
Alexandre Lision | 3b7148e | 2013-11-13 17:23:06 -0500 | [diff] [blame] | 1297 | } |
| 1298 | }); |
| 1299 | } |
| 1300 | |
Alexandre Lision | 3e2a1d0 | 2013-11-19 17:23:00 -0500 | [diff] [blame] | 1301 | @Override |
| 1302 | public void registerAllAccounts() throws RemoteException { |
| 1303 | getExecutor().execute(new SipRunnable() { |
| 1304 | @Override |
| 1305 | protected void doRun() throws SameThreadException, RemoteException { |
| 1306 | Log.i(TAG, "SipService.registerAllAccounts() thread running..."); |
| 1307 | configurationManagerJNI.registerAllAccounts(); |
| 1308 | } |
| 1309 | }); |
| 1310 | } |
| 1311 | |
Alexandre Lision | 5f733bc | 2013-12-04 13:10:30 -0500 | [diff] [blame] | 1312 | /** |
| 1313 | * Not working yet |
| 1314 | */ |
| 1315 | @Override |
| 1316 | public List getAudioInputDeviceList() throws RemoteException { |
| 1317 | class AudioInputDevices extends SipRunnableWithReturn { |
| 1318 | |
| 1319 | @Override |
| 1320 | protected List doRun() throws SameThreadException { |
| 1321 | Log.i(TAG, "SipService.getCredentials() thread running..."); |
| 1322 | StringVect map = configurationManagerJNI.getAudioInputDeviceList(); |
| 1323 | ArrayList<HashMap<String, String>> result = new ArrayList<HashMap<String,String>>(); |
| 1324 | return result; |
| 1325 | } |
| 1326 | } |
| 1327 | |
| 1328 | AudioInputDevices runInstance = new AudioInputDevices(); |
| 1329 | getExecutor().execute(runInstance); |
| 1330 | while (!runInstance.isDone()) { |
| 1331 | } |
| 1332 | return (List) runInstance.getVal(); |
| 1333 | } |
| 1334 | |
| 1335 | /** |
| 1336 | * Not working yet |
| 1337 | */ |
| 1338 | @Override |
| 1339 | public List getAudioOutputDeviceList() throws RemoteException { |
| 1340 | class AudioOutputDevices extends SipRunnableWithReturn { |
| 1341 | |
| 1342 | @Override |
| 1343 | protected List doRun() throws SameThreadException { |
| 1344 | Log.i(TAG, "SipService.getCredentials() thread running..."); |
| 1345 | StringVect map = configurationManagerJNI.getAudioOutputDeviceList(); |
| 1346 | ArrayList<HashMap<String, String>> result = new ArrayList<HashMap<String,String>>(); |
| 1347 | return result; |
| 1348 | } |
| 1349 | } |
| 1350 | |
| 1351 | AudioOutputDevices runInstance = new AudioOutputDevices(); |
| 1352 | getExecutor().execute(runInstance); |
| 1353 | while (!runInstance.isDone()) { |
| 1354 | } |
| 1355 | return (List) runInstance.getVal(); |
| 1356 | } |
| 1357 | |
Alexandre Lision | 451f2a8 | 2013-11-12 12:55:55 -0500 | [diff] [blame] | 1358 | |
| 1359 | |
Emeric Vigier | 6119d78 | 2012-09-21 18:04:14 -0400 | [diff] [blame] | 1360 | }; |
Alexandre Lision | 63870a7 | 2013-10-28 16:33:47 -0400 | [diff] [blame] | 1361 | } |