diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2016-12-19 04:48:35 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2016-12-19 04:48:35 +0000 |
| commit | 7ecdadbbaa4a77ba0a2f33b494460e11fc3f59d4 (patch) | |
| tree | f0af4082fe5f5ac1a651c577db037574e017c5ce | |
| parent | b8fdf0a75d69c18e9931d513950d85e833074dcb (diff) | |
Re #1986: Convert pjsua2 sample app Android project from Eclipse to Android Studio.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5502 74dad513-b988-da41-8d7b-12977e46ad98
41 files changed, 2104 insertions, 1584 deletions
diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index 2230670d..3f9bb78c 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -21,7 +21,7 @@ else LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.jnilib else ifeq ($(OS),android) - LIBPJSUA2_SO=android/libs/armeabi/libpjsua2.so + LIBPJSUA2_SO=android/app/src/main/jniLibs/armeabi/libpjsua2.so else LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so endif @@ -149,12 +149,12 @@ MY_CFLAGS := $(PJ_CXXFLAGS) $(MY_JNI_CFLAGS) $(CFLAGS) MY_LDFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS) MY_PACKAGE_NAME := org.pjsip.pjsua2 ifeq ($(OS),android) - MY_PACKAGE_PATH := android/src/$(subst .,/,$(MY_PACKAGE_NAME)) + MY_PACKAGE_PATH := android/app/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME)) else MY_PACKAGE_PATH := $(OUT_DIR)/$(subst .,/,$(MY_PACKAGE_NAME)) endif -MY_APP_JAVA := android/src/$(subst .,/,$(MY_PACKAGE_NAME))/app/MyApp.java +MY_APP_JAVA := android/app/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))/app/MyApp.java .PHONY: all java install uninstall diff --git a/pjsip-apps/src/swig/java/android/.classpath b/pjsip-apps/src/swig/java/android/.classpath deleted file mode 100644 index b76ec6cd..00000000 --- a/pjsip-apps/src/swig/java/android/.classpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/pjsip-apps/src/swig/java/android/.project b/pjsip-apps/src/swig/java/android/.project deleted file mode 100644 index 434a3408..00000000 --- a/pjsip-apps/src/swig/java/android/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Pjsua2</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/pjsip-apps/src/swig/java/android/.settings/org.eclipse.jdt.core.prefs b/pjsip-apps/src/swig/java/android/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 48ab4c6b..00000000 --- a/pjsip-apps/src/swig/java/android/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/pjsip-apps/src/swig/java/android/app/build.gradle b/pjsip-apps/src/swig/java/android/app/build.gradle new file mode 100644 index 00000000..2fab9e88 --- /dev/null +++ b/pjsip-apps/src/swig/java/android/app/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 15
+ buildToolsVersion "23.0.3"
+
+ defaultConfig {
+ applicationId "org.pjsip.pjsua2.app"
+ minSdkVersion 11
+ targetSdkVersion 15
+
+ ndk {
+ moduleName "libpjsua2"
+ }
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+}
diff --git a/pjsip-apps/src/swig/java/android/AndroidManifest.xml b/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml index 9a7463a0..9a7463a0 100644 --- a/pjsip-apps/src/swig/java/android/AndroidManifest.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml diff --git a/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCamera.java b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCamera.java new file mode 100644 index 00000000..566b0faa --- /dev/null +++ b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCamera.java @@ -0,0 +1,210 @@ +/* $Id: PjCamera.java 5019 2015-03-23 06:35:45Z nanang $ */
+/*
+ * Copyright (C) 2015 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package org.pjsip;
+
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public class PjCamera implements Camera.PreviewCallback, SurfaceHolder.Callback
+{
+ private final String TAG = "PjCamera";
+
+ public class Param {
+ public int width;
+ public int height;
+ public int format;
+ public int fps1000;
+ }
+
+ private Camera camera = null;
+ private boolean isRunning = false;
+ private int camIdx;
+ private long userData;
+
+ private Param param = null;
+
+ private SurfaceView surfaceView = null;
+ private SurfaceHolder surfaceHolder = null;
+ private SurfaceTexture surfaceTexture = null;
+
+ public PjCamera(int idx, int w, int h, int fmt, int fps,
+ long userData_, SurfaceView surface)
+ {
+ camIdx = idx;
+ userData = userData_;
+
+ param = new Param();
+ param.width = w;
+ param.height = h;
+ param.format = fmt;
+ param.fps1000 = fps;
+
+ SetSurfaceView(surface);
+ }
+
+ public void SetSurfaceView(SurfaceView surface)
+ {
+ boolean isCaptureRunning = isRunning;
+
+ if (isCaptureRunning)
+ Stop();
+
+ if (surface != null) {
+ surfaceView = surface;
+ surfaceHolder = surfaceView.getHolder();
+ } else {
+ // Create dummy texture
+ surfaceHolder = null;
+ surfaceView = null;
+ if (surfaceTexture == null) {
+ surfaceTexture = new SurfaceTexture(10);
+ }
+ }
+
+ if (isCaptureRunning)
+ Start();
+ }
+
+ public int SwitchDevice(int idx)
+ {
+ boolean isCaptureRunning = isRunning;
+ int oldIdx = camIdx;
+
+ if (isCaptureRunning)
+ Stop();
+
+ camIdx = idx;
+
+ if (isCaptureRunning) {
+ int ret = Start();
+ if (ret != 0) {
+ /* Try to revert back */
+ camIdx = oldIdx;
+ Start();
+ return ret;
+ }
+ }
+
+ return 0;
+ }
+
+ public int Start()
+ {
+ try {
+ camera = Camera.open(camIdx);
+ } catch (Exception e) {
+ Log.d("IOException", e.getMessage());
+ return -10;
+ }
+
+ try {
+ if (surfaceHolder != null) {
+ camera.setPreviewDisplay(surfaceHolder);
+ surfaceHolder.addCallback(this);
+ } else {
+ camera.setPreviewTexture(surfaceTexture);
+ }
+ } catch (IOException e) {
+ Log.d("IOException", e.getMessage());
+ return -20;
+ }
+
+ Camera.Parameters cp = camera.getParameters();
+ cp.setPreviewSize(param.width, param.height);
+ cp.setPreviewFormat(param.format);
+ // Some devices such as Nexus require an exact FPS range from the
+ // supported FPS ranges, specifying a subset range will raise
+ // exception.
+ //cp.setPreviewFpsRange(param.fps1000, param.fps1000);
+ try {
+ camera.setParameters(cp);
+ } catch (RuntimeException e) {
+ Log.d("RuntimeException", e.getMessage());
+ return -30;
+ }
+
+ camera.setPreviewCallback(this);
+ camera.startPreview();
+ isRunning = true;
+
+ return 0;
+ }
+
+ public void Stop()
+ {
+ isRunning = false;
+ if (camera == null)
+ return;
+
+ if (surfaceHolder != null)
+ surfaceHolder.removeCallback(this);
+
+ camera.setPreviewCallback(null);
+ camera.stopPreview();
+ camera.release();
+ camera = null;
+ }
+
+ native void PushFrame(byte[] data, int length, long userData_);
+
+ public void onPreviewFrame(byte[] data, Camera camera)
+ {
+ if (isRunning) {
+ PushFrame(data, data.length, userData);
+ }
+ }
+
+ public void surfaceChanged(SurfaceHolder holder,
+ int format, int width, int height)
+ {
+ Log.d(TAG, "VideoCaptureAndroid::surfaceChanged");
+ }
+
+ public void surfaceCreated(SurfaceHolder holder)
+ {
+ Log.d(TAG, "VideoCaptureAndroid::surfaceCreated");
+ try {
+ if(camera != null) {
+ camera.setPreviewDisplay(holder);
+ }
+ } catch (IOException e) {
+ Log.e(TAG, "Failed to set preview surface!", e);
+ }
+ }
+
+ public void surfaceDestroyed(SurfaceHolder holder)
+ {
+ Log.d(TAG, "VideoCaptureAndroid::surfaceDestroyed");
+ try {
+ if(camera != null) {
+ camera.setPreviewDisplay(null);
+ }
+ } catch (IOException e) {
+ Log.e(TAG, "Failed to clear preview surface!", e);
+ } catch (RuntimeException e) {
+ Log.w(TAG, "Clear preview surface useless", e);
+ }
+ }
+
+}
diff --git a/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCameraInfo.java b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCameraInfo.java new file mode 100644 index 00000000..d44cdb95 --- /dev/null +++ b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCameraInfo.java @@ -0,0 +1,110 @@ +/* $Id: PjCameraInfo.java 5019 2015-03-23 06:35:45Z nanang $ */
+/*
+ * Copyright (C) 2015 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package org.pjsip;
+
+import java.util.List;
+
+import android.hardware.Camera;
+import android.util.Log;
+
+public class PjCameraInfo {
+ public int facing;
+ public int orient;
+ public int[] supportedSize; // [w1, h1, w2, h2, ...]
+ public int[] supportedFps1000; // [min1, max1, min2, max2, ...]
+ public int[] supportedFormat; // [fmt1, fmt2, ...]
+
+ // convert Format list {fmt1, fmt2, ...} to [fmt1, fmt2, ...]
+ private static int[] IntegerListToIntArray(List<Integer> list)
+ {
+ int[] li = new int[list.size()];
+ int i = 0;
+ for (Integer e : list) {
+ li[i++] = e.intValue();
+ }
+ return li;
+ }
+
+ // convert Fps list {[min1, max1], [min2, max2], ...} to
+ // [min1, max1, min2, max2, ...]
+ private static int[] IntArrayListToIntArray(List<int[]> list)
+ {
+ int[] li = new int[list.size() * 2];
+ int i = 0;
+ for (int[] e : list) {
+ li[i++] = e[0];
+ li[i++] = e[1];
+ }
+ return li;
+ }
+
+ // convert Size list {{w1, h1}, {w2, h2}, ...} to [w1, h1, w2, h2, ...]
+ private static int[] CameraSizeListToIntArray(List<Camera.Size> list)
+ {
+ int[] li = new int[list.size() * 2];
+ int i = 0;
+ for (Camera.Size e : list) {
+ li[i++] = e.width;
+ li[i++] = e.height;
+ }
+ return li;
+ }
+
+ public static int GetCameraCount()
+ {
+ return Camera.getNumberOfCameras();
+ }
+
+ // Get camera info: facing, orientation, supported size/fps/format.
+ // Camera must not be opened.
+ public static PjCameraInfo GetCameraInfo(int idx)
+ {
+ if (idx < 0 || idx >= GetCameraCount())
+ return null;
+
+ Camera cam;
+ try {
+ cam = Camera.open(idx);
+ } catch (Exception e) {
+ Log.d("IOException", e.getMessage());
+ return null;
+ }
+
+ PjCameraInfo pjci = new PjCameraInfo();
+
+ Camera.CameraInfo ci = new Camera.CameraInfo();
+ Camera.getCameraInfo(idx, ci);
+
+ pjci.facing = ci.facing;
+ pjci.orient = ci.orientation;
+
+ Camera.Parameters param = cam.getParameters();
+ cam.release();
+ cam = null;
+
+ pjci.supportedFormat = IntegerListToIntArray(
+ param.getSupportedPreviewFormats());
+ pjci.supportedFps1000 = IntArrayListToIntArray(
+ param.getSupportedPreviewFpsRange());
+ pjci.supportedSize = CameraSizeListToIntArray(
+ param.getSupportedPreviewSizes());
+
+ return pjci;
+ }
+}
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/CallActivity.java b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/CallActivity.java index 6df2b7e7..8700cde3 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/CallActivity.java +++ b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/CallActivity.java @@ -1,364 +1,364 @@ -/* $Id$ */ -/* - * Copyright (C) 2013 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -package org.pjsip.pjsua2.app; - -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.view.Display; -import android.view.Surface; -import android.view.SurfaceHolder; -import android.view.SurfaceView; -import android.view.View; -import android.view.WindowManager; -import android.widget.Button; -import android.widget.TextView; -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; - -import org.pjsip.pjsua2.*; - -class VideoPreviewHandler implements SurfaceHolder.Callback -{ - public boolean videoPreviewActive = false; - - public void updateVideoPreview(SurfaceHolder holder) - { - if (MainActivity.currentCall != null && - MainActivity.currentCall.vidWin != null && - MainActivity.currentCall.vidPrev != null) - { - if (videoPreviewActive) { - VideoWindowHandle vidWH = new VideoWindowHandle(); - vidWH.getHandle().setWindow(holder.getSurface()); - VideoPreviewOpParam vidPrevParam = new VideoPreviewOpParam(); - vidPrevParam.setWindow(vidWH); - try { - MainActivity.currentCall.vidPrev.start(vidPrevParam); - } catch (Exception e) { - System.out.println(e); - } - } else { - try { - MainActivity.currentCall.vidPrev.stop(); - } catch (Exception e) { - System.out.println(e); - } - } - } - } - - @Override - public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) - { - updateVideoPreview(holder); - } - - @Override - public void surfaceCreated(SurfaceHolder holder) - { - - } - - @Override - public void surfaceDestroyed(SurfaceHolder holder) - { - try { - MainActivity.currentCall.vidPrev.stop(); - } catch (Exception e) { - System.out.println(e); - } - } -} - -public class CallActivity extends Activity - implements Handler.Callback, SurfaceHolder.Callback -{ - - public static Handler handler_; - private static VideoPreviewHandler previewHandler = - new VideoPreviewHandler(); - - private final Handler handler = new Handler(this); - private static CallInfo lastCallInfo; - - @Override - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_call); - - SurfaceView surfaceInVideo = (SurfaceView) - findViewById(R.id.surfaceIncomingVideo); - SurfaceView surfacePreview = (SurfaceView) - findViewById(R.id.surfacePreviewCapture); - Button buttonShowPreview = (Button) - findViewById(R.id.buttonShowPreview); - - if (MainActivity.currentCall == null || - MainActivity.currentCall.vidWin == null) - { - surfaceInVideo.setVisibility(View.GONE); - buttonShowPreview.setVisibility(View.GONE); - } - setupVideoPreview(surfacePreview, buttonShowPreview); - surfaceInVideo.getHolder().addCallback(this); - surfacePreview.getHolder().addCallback(previewHandler); - - handler_ = handler; - if (MainActivity.currentCall != null) { - try { - lastCallInfo = MainActivity.currentCall.getInfo(); - updateCallState(lastCallInfo); - } catch (Exception e) { - System.out.println(e); - } - } else { - updateCallState(lastCallInfo); - } - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - - WindowManager wm; - Display display; - int rotation; - pjmedia_orient orient; - - wm = (WindowManager)this.getSystemService(Context.WINDOW_SERVICE); - display = wm.getDefaultDisplay(); - rotation = display.getRotation(); - System.out.println("Device orientation changed: " + rotation); - - switch (rotation) { - case Surface.ROTATION_0: // Portrait - orient = pjmedia_orient.PJMEDIA_ORIENT_ROTATE_270DEG; - break; - case Surface.ROTATION_90: // Landscape, home button on the right - orient = pjmedia_orient.PJMEDIA_ORIENT_NATURAL; - break; - case Surface.ROTATION_180: - orient = pjmedia_orient.PJMEDIA_ORIENT_ROTATE_90DEG; - break; - case Surface.ROTATION_270: // Landscape, home button on the left - orient = pjmedia_orient.PJMEDIA_ORIENT_ROTATE_180DEG; - break; - default: - orient = pjmedia_orient.PJMEDIA_ORIENT_UNKNOWN; - } - - if (MyApp.ep != null && MainActivity.account != null) { - try { - AccountConfig cfg = MainActivity.account.cfg; - int cap_dev = cfg.getVideoConfig().getDefaultCaptureDevice(); - MyApp.ep.vidDevManager().setCaptureOrient(cap_dev, orient, - true); - } catch (Exception e) { - System.out.println(e); - } - } - } - - @Override - protected void onDestroy() - { - super.onDestroy(); - handler_ = null; - } - - private void updateVideoWindow(boolean show) - { - if (MainActivity.currentCall != null && - MainActivity.currentCall.vidWin != null && - MainActivity.currentCall.vidPrev != null) - { - SurfaceView surfaceInVideo = (SurfaceView) - findViewById(R.id.surfaceIncomingVideo); - - VideoWindowHandle vidWH = new VideoWindowHandle(); - if (show) { - vidWH.getHandle().setWindow( - surfaceInVideo.getHolder().getSurface()); - } else { - vidWH.getHandle().setWindow(null); - } - try { - MainActivity.currentCall.vidWin.setWindow(vidWH); - } catch (Exception e) { - System.out.println(e); - } - } - } - - public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) - { - updateVideoWindow(true); - } - - public void surfaceCreated(SurfaceHolder holder) - { - } - - public void surfaceDestroyed(SurfaceHolder holder) - { - updateVideoWindow(false); - } - - public void acceptCall(View view) - { - CallOpParam prm = new CallOpParam(); - prm.setStatusCode(pjsip_status_code.PJSIP_SC_OK); - try { - MainActivity.currentCall.answer(prm); - } catch (Exception e) { - System.out.println(e); - } - - view.setVisibility(View.GONE); - } - - public void hangupCall(View view) - { - handler_ = null; - finish(); - - if (MainActivity.currentCall != null) { - CallOpParam prm = new CallOpParam(); - prm.setStatusCode(pjsip_status_code.PJSIP_SC_DECLINE); - try { - MainActivity.currentCall.hangup(prm); - } catch (Exception e) { - System.out.println(e); - } - } - } - - public void setupVideoPreview(SurfaceView surfacePreview, - Button buttonShowPreview) - { - surfacePreview.setVisibility(previewHandler.videoPreviewActive? - View.VISIBLE:View.GONE); - - buttonShowPreview.setText(previewHandler.videoPreviewActive? - getString(R.string.hide_preview): - getString(R.string.show_preview)); - } - - public void showPreview(View view) - { - SurfaceView surfacePreview = (SurfaceView) - findViewById(R.id.surfacePreviewCapture); - - Button buttonShowPreview = (Button) - findViewById(R.id.buttonShowPreview); - - - previewHandler.videoPreviewActive = !previewHandler.videoPreviewActive; - - setupVideoPreview(surfacePreview, buttonShowPreview); - - previewHandler.updateVideoPreview(surfacePreview.getHolder()); - } - - private void setupVideoSurface() - { - SurfaceView surfaceInVideo = (SurfaceView) - findViewById(R.id.surfaceIncomingVideo); - SurfaceView surfacePreview = (SurfaceView) - findViewById(R.id.surfacePreviewCapture); - Button buttonShowPreview = (Button) - findViewById(R.id.buttonShowPreview); - surfaceInVideo.setVisibility(View.VISIBLE); - buttonShowPreview.setVisibility(View.VISIBLE); - surfacePreview.setVisibility(View.GONE); - } - - @Override - public boolean handleMessage(Message m) - { - if (m.what == MainActivity.MSG_TYPE.CALL_STATE) { - - lastCallInfo = (CallInfo) m.obj; - updateCallState(lastCallInfo); - - } else if (m.what == MainActivity.MSG_TYPE.CALL_MEDIA_STATE) { - - if (MainActivity.currentCall.vidWin != null) { - /* Set capture orientation according to current - * device orientation. - */ - onConfigurationChanged(getResources().getConfiguration()); - /* If there's incoming video, display it. */ - setupVideoSurface(); - } - - } else { - - /* Message not handled */ - return false; - - } - - return true; - } - - private void updateCallState(CallInfo ci) { - TextView tvPeer = (TextView) findViewById(R.id.textViewPeer); - TextView tvState = (TextView) findViewById(R.id.textViewCallState); - Button buttonHangup = (Button) findViewById(R.id.buttonHangup); - Button buttonAccept = (Button) findViewById(R.id.buttonAccept); - String call_state = ""; - - if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAC) { - buttonAccept.setVisibility(View.GONE); - } - - if (ci.getState().swigValue() < - pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue()) - { - if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAS) { - call_state = "Incoming call.."; - /* Default button texts are already 'Accept' & 'Reject' */ - } else { - buttonHangup.setText("Cancel"); - call_state = ci.getStateText(); - } - } - else if (ci.getState().swigValue() >= - pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue()) - { - buttonAccept.setVisibility(View.GONE); - call_state = ci.getStateText(); - if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED) { - buttonHangup.setText("Hangup"); - } else if (ci.getState() == - pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) - { - buttonHangup.setText("OK"); - call_state = "Call disconnected: " + ci.getLastReason(); - } - } - - tvPeer.setText(ci.getRemoteUri()); - tvState.setText(call_state); - } -} +/* $Id: CallActivity.java 5138 2015-07-30 06:23:35Z ming $ */
+/*
+ * Copyright (C) 2013 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package org.pjsip.pjsua2.app;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Display;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.TextView;
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Configuration;
+
+import org.pjsip.pjsua2.*;
+
+class VideoPreviewHandler implements SurfaceHolder.Callback
+{
+ public boolean videoPreviewActive = false;
+
+ public void updateVideoPreview(SurfaceHolder holder)
+ {
+ if (MainActivity.currentCall != null &&
+ MainActivity.currentCall.vidWin != null &&
+ MainActivity.currentCall.vidPrev != null)
+ {
+ if (videoPreviewActive) {
+ VideoWindowHandle vidWH = new VideoWindowHandle();
+ vidWH.getHandle().setWindow(holder.getSurface());
+ VideoPreviewOpParam vidPrevParam = new VideoPreviewOpParam();
+ vidPrevParam.setWindow(vidWH);
+ try {
+ MainActivity.currentCall.vidPrev.start(vidPrevParam);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ } else {
+ try {
+ MainActivity.currentCall.vidPrev.stop();
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h)
+ {
+ updateVideoPreview(holder);
+ }
+
+ @Override
+ public void surfaceCreated(SurfaceHolder holder)
+ {
+
+ }
+
+ @Override
+ public void surfaceDestroyed(SurfaceHolder holder)
+ {
+ try {
+ MainActivity.currentCall.vidPrev.stop();
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+}
+
+public class CallActivity extends Activity
+ implements Handler.Callback, SurfaceHolder.Callback
+{
+
+ public static Handler handler_;
+ private static VideoPreviewHandler previewHandler =
+ new VideoPreviewHandler();
+
+ private final Handler handler = new Handler(this);
+ private static CallInfo lastCallInfo;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_call);
+
+ SurfaceView surfaceInVideo = (SurfaceView)
+ findViewById(R.id.surfaceIncomingVideo);
+ SurfaceView surfacePreview = (SurfaceView)
+ findViewById(R.id.surfacePreviewCapture);
+ Button buttonShowPreview = (Button)
+ findViewById(R.id.buttonShowPreview);
+
+ if (MainActivity.currentCall == null ||
+ MainActivity.currentCall.vidWin == null)
+ {
+ surfaceInVideo.setVisibility(View.GONE);
+ buttonShowPreview.setVisibility(View.GONE);
+ }
+ setupVideoPreview(surfacePreview, buttonShowPreview);
+ surfaceInVideo.getHolder().addCallback(this);
+ surfacePreview.getHolder().addCallback(previewHandler);
+
+ handler_ = handler;
+ if (MainActivity.currentCall != null) {
+ try {
+ lastCallInfo = MainActivity.currentCall.getInfo();
+ updateCallState(lastCallInfo);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ } else {
+ updateCallState(lastCallInfo);
+ }
+ }
+
+ @Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+
+ WindowManager wm;
+ Display display;
+ int rotation;
+ pjmedia_orient orient;
+
+ wm = (WindowManager)this.getSystemService(Context.WINDOW_SERVICE);
+ display = wm.getDefaultDisplay();
+ rotation = display.getRotation();
+ System.out.println("Device orientation changed: " + rotation);
+
+ switch (rotation) {
+ case Surface.ROTATION_0: // Portrait
+ orient = pjmedia_orient.PJMEDIA_ORIENT_ROTATE_270DEG;
+ break;
+ case Surface.ROTATION_90: // Landscape, home button on the right
+ orient = pjmedia_orient.PJMEDIA_ORIENT_NATURAL;
+ break;
+ case Surface.ROTATION_180:
+ orient = pjmedia_orient.PJMEDIA_ORIENT_ROTATE_90DEG;
+ break;
+ case Surface.ROTATION_270: // Landscape, home button on the left
+ orient = pjmedia_orient.PJMEDIA_ORIENT_ROTATE_180DEG;
+ break;
+ default:
+ orient = pjmedia_orient.PJMEDIA_ORIENT_UNKNOWN;
+ }
+
+ if (MyApp.ep != null && MainActivity.account != null) {
+ try {
+ AccountConfig cfg = MainActivity.account.cfg;
+ int cap_dev = cfg.getVideoConfig().getDefaultCaptureDevice();
+ MyApp.ep.vidDevManager().setCaptureOrient(cap_dev, orient,
+ true);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+ }
+
+ @Override
+ protected void onDestroy()
+ {
+ super.onDestroy();
+ handler_ = null;
+ }
+
+ private void updateVideoWindow(boolean show)
+ {
+ if (MainActivity.currentCall != null &&
+ MainActivity.currentCall.vidWin != null &&
+ MainActivity.currentCall.vidPrev != null)
+ {
+ SurfaceView surfaceInVideo = (SurfaceView)
+ findViewById(R.id.surfaceIncomingVideo);
+
+ VideoWindowHandle vidWH = new VideoWindowHandle();
+ if (show) {
+ vidWH.getHandle().setWindow(
+ surfaceInVideo.getHolder().getSurface());
+ } else {
+ vidWH.getHandle().setWindow(null);
+ }
+ try {
+ MainActivity.currentCall.vidWin.setWindow(vidWH);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+ }
+
+ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h)
+ {
+ updateVideoWindow(true);
+ }
+
+ public void surfaceCreated(SurfaceHolder holder)
+ {
+ }
+
+ public void surfaceDestroyed(SurfaceHolder holder)
+ {
+ updateVideoWindow(false);
+ }
+
+ public void acceptCall(View view)
+ {
+ CallOpParam prm = new CallOpParam();
+ prm.setStatusCode(pjsip_status_code.PJSIP_SC_OK);
+ try {
+ MainActivity.currentCall.answer(prm);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+
+ view.setVisibility(View.GONE);
+ }
+
+ public void hangupCall(View view)
+ {
+ handler_ = null;
+ finish();
+
+ if (MainActivity.currentCall != null) {
+ CallOpParam prm = new CallOpParam();
+ prm.setStatusCode(pjsip_status_code.PJSIP_SC_DECLINE);
+ try {
+ MainActivity.currentCall.hangup(prm);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+ }
+
+ public void setupVideoPreview(SurfaceView surfacePreview,
+ Button buttonShowPreview)
+ {
+ surfacePreview.setVisibility(previewHandler.videoPreviewActive?
+ View.VISIBLE:View.GONE);
+
+ buttonShowPreview.setText(previewHandler.videoPreviewActive?
+ getString(R.string.hide_preview):
+ getString(R.string.show_preview));
+ }
+
+ public void showPreview(View view)
+ {
+ SurfaceView surfacePreview = (SurfaceView)
+ findViewById(R.id.surfacePreviewCapture);
+
+ Button buttonShowPreview = (Button)
+ findViewById(R.id.buttonShowPreview);
+
+
+ previewHandler.videoPreviewActive = !previewHandler.videoPreviewActive;
+
+ setupVideoPreview(surfacePreview, buttonShowPreview);
+
+ previewHandler.updateVideoPreview(surfacePreview.getHolder());
+ }
+
+ private void setupVideoSurface()
+ {
+ SurfaceView surfaceInVideo = (SurfaceView)
+ findViewById(R.id.surfaceIncomingVideo);
+ SurfaceView surfacePreview = (SurfaceView)
+ findViewById(R.id.surfacePreviewCapture);
+ Button buttonShowPreview = (Button)
+ findViewById(R.id.buttonShowPreview);
+ surfaceInVideo.setVisibility(View.VISIBLE);
+ buttonShowPreview.setVisibility(View.VISIBLE);
+ surfacePreview.setVisibility(View.GONE);
+ }
+
+ @Override
+ public boolean handleMessage(Message m)
+ {
+ if (m.what == MainActivity.MSG_TYPE.CALL_STATE) {
+
+ lastCallInfo = (CallInfo) m.obj;
+ updateCallState(lastCallInfo);
+
+ } else if (m.what == MainActivity.MSG_TYPE.CALL_MEDIA_STATE) {
+
+ if (MainActivity.currentCall.vidWin != null) {
+ /* Set capture orientation according to current
+ * device orientation.
+ */
+ onConfigurationChanged(getResources().getConfiguration());
+ /* If there's incoming video, display it. */
+ setupVideoSurface();
+ }
+
+ } else {
+
+ /* Message not handled */
+ return false;
+
+ }
+
+ return true;
+ }
+
+ private void updateCallState(CallInfo ci) {
+ TextView tvPeer = (TextView) findViewById(R.id.textViewPeer);
+ TextView tvState = (TextView) findViewById(R.id.textViewCallState);
+ Button buttonHangup = (Button) findViewById(R.id.buttonHangup);
+ Button buttonAccept = (Button) findViewById(R.id.buttonAccept);
+ String call_state = "";
+
+ if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAC) {
+ buttonAccept.setVisibility(View.GONE);
+ }
+
+ if (ci.getState().swigValue() <
+ pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
+ {
+ if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAS) {
+ call_state = "Incoming call..";
+ /* Default button texts are already 'Accept' & 'Reject' */
+ } else {
+ buttonHangup.setText("Cancel");
+ call_state = ci.getStateText();
+ }
+ }
+ else if (ci.getState().swigValue() >=
+ pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
+ {
+ buttonAccept.setVisibility(View.GONE);
+ call_state = ci.getStateText();
+ if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED) {
+ buttonHangup.setText("Hangup");
+ } else if (ci.getState() ==
+ pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
+ {
+ buttonHangup.setText("OK");
+ call_state = "Call disconnected: " + ci.getLastReason();
+ }
+ }
+
+ tvPeer.setText(ci.getRemoteUri());
+ tvState.setText(call_state);
+ }
+}
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java index 3ae46338..cd5c74e9 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java +++ b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java @@ -1,581 +1,581 @@ -/* $Id$ */ -/* - * Copyright (C) 2013 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -package org.pjsip.pjsua2.app; - -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.ListView; -import android.widget.SimpleAdapter; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import org.pjsip.pjsua2.*; - -public class MainActivity extends Activity - implements Handler.Callback, MyAppObserver -{ - public static MyApp app = null; - public static MyCall currentCall = null; - public static MyAccount account = null; - public static AccountConfig accCfg = null; - - private ListView buddyListView; - private SimpleAdapter buddyListAdapter; - private int buddyListSelectedIdx = -1; - ArrayList<Map<String, String>> buddyList; - private String lastRegStatus = ""; - - private final Handler handler = new Handler(this); - public class MSG_TYPE - { - public final static int INCOMING_CALL = 1; - public final static int CALL_STATE = 2; - public final static int REG_STATE = 3; - public final static int BUDDY_STATE = 4; - public final static int CALL_MEDIA_STATE = 5; - } - - private HashMap<String, String> putData(String uri, String status) - { - HashMap<String, String> item = new HashMap<String, String>(); - item.put("uri", uri); - item.put("status", status); - return item; - } - - private void showCallActivity() - { - Intent intent = new Intent(this, CallActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - if (app == null) { - app = new MyApp(); - // Wait for GDB to init, for native debugging only - if (false && - (getApplicationInfo().flags & - ApplicationInfo.FLAG_DEBUGGABLE) != 0) - { - try { - Thread.sleep(5000); - } catch (InterruptedException e) {} - } - - app.init(this, getFilesDir().getAbsolutePath()); - } - - if (app.accList.size() == 0) { - accCfg = new AccountConfig(); - accCfg.setIdUri("sip:localhost"); - accCfg.getNatConfig().setIceEnabled(true); - accCfg.getVideoConfig().setAutoTransmitOutgoing(true); - accCfg.getVideoConfig().setAutoShowIncoming(true); - account = app.addAcc(accCfg); - } else { - account = app.accList.get(0); - accCfg = account.cfg; - } - - buddyList = new ArrayList<Map<String, String>>(); - for (int i = 0; i < account.buddyList.size(); i++) { - buddyList.add(putData(account.buddyList.get(i).cfg.getUri(), - account.buddyList.get(i).getStatusText())); - } - - String[] from = { "uri", "status" }; - int[] to = { android.R.id.text1, android.R.id.text2 }; - buddyListAdapter = new SimpleAdapter( - this, buddyList, - android.R.layout.simple_list_item_2, - from, to); - - buddyListView = (ListView) findViewById(R.id.listViewBuddy);; - buddyListView.setAdapter(buddyListAdapter); - buddyListView.setOnItemClickListener( - new AdapterView.OnItemClickListener() - { - @Override - public void onItemClick(AdapterView<?> parent, - final View view, - int position, long id) - { - view.setSelected(true); - buddyListSelectedIdx = position; - } - } - ); - - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - // Inflate the menu; this adds items to the action bar - // if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) - { - switch (item.getItemId()) { - case R.id.action_acc_config: - dlgAccountSetting(); - break; - - case R.id.action_quit: - Message m = Message.obtain(handler, 0); - m.sendToTarget(); - break; - - default: - break; - } - - return true; - } - - @Override - public boolean handleMessage(Message m) - { - if (m.what == 0) { - - app.deinit(); - finish(); - Runtime.getRuntime().gc(); - android.os.Process.killProcess(android.os.Process.myPid()); - - } else if (m.what == MSG_TYPE.CALL_STATE) { - - CallInfo ci = (CallInfo) m.obj; - - /* Forward the message to CallActivity */ - if (CallActivity.handler_ != null) { - Message m2 = Message.obtain(CallActivity.handler_, - MSG_TYPE.CALL_STATE, ci); - m2.sendToTarget(); - } - - } else if (m.what == MSG_TYPE.CALL_MEDIA_STATE) { - - /* Forward the message to CallActivity */ - if (CallActivity.handler_ != null) { - Message m2 = Message.obtain(CallActivity.handler_, - MSG_TYPE.CALL_MEDIA_STATE, - null); - m2.sendToTarget(); - } - - } else if (m.what == MSG_TYPE.BUDDY_STATE) { - - MyBuddy buddy = (MyBuddy) m.obj; - int idx = account.buddyList.indexOf(buddy); - - /* Update buddy status text, if buddy is valid and - * the buddy lists in account and UI are sync-ed. - */ - if (idx >= 0 && account.buddyList.size() == buddyList.size()) - { - buddyList.get(idx).put("status", buddy.getStatusText()); - buddyListAdapter.notifyDataSetChanged(); - // TODO: selection color/mark is gone after this, - // dont know how to return it back. - //buddyListView.setSelection(buddyListSelectedIdx); - //buddyListView.performItemClick(buddyListView, - // buddyListSelectedIdx, - // buddyListView. - // getItemIdAtPosition(buddyListSelectedIdx)); - - /* Return back Call activity */ - notifyCallState(currentCall); - } - - } else if (m.what == MSG_TYPE.REG_STATE) { - - String msg_str = (String) m.obj; - lastRegStatus = msg_str; - - } else if (m.what == MSG_TYPE.INCOMING_CALL) { - - /* Incoming call */ - final MyCall call = (MyCall) m.obj; - CallOpParam prm = new CallOpParam(); - - /* Only one call at anytime */ - if (currentCall != null) { - /* - prm.setStatusCode(pjsip_status_code.PJSIP_SC_BUSY_HERE); - try { - call.hangup(prm); - } catch (Exception e) {} - */ - // TODO: set status code - call.delete(); - return true; - } - - /* Answer with ringing */ - prm.setStatusCode(pjsip_status_code.PJSIP_SC_RINGING); - try { - call.answer(prm); - } catch (Exception e) {} - - currentCall = call; - showCallActivity(); - - } else { - - /* Message not handled */ - return false; - - } - - return true; - } - - - private void dlgAccountSetting() - { - LayoutInflater li = LayoutInflater.from(this); - View view = li.inflate(R.layout.dlg_account_config, null); - - if (lastRegStatus.length()!=0) { - TextView tvInfo = (TextView)view.findViewById(R.id.textViewInfo); - tvInfo.setText("Last status: " + lastRegStatus); - } - - AlertDialog.Builder adb = new AlertDialog.Builder(this); - adb.setView(view); - adb.setTitle("Account Settings"); - - final EditText etId = (EditText)view.findViewById(R.id.editTextId); - final EditText etReg = (EditText)view.findViewById(R.id.editTextRegistrar); - final EditText etProxy = (EditText)view.findViewById(R.id.editTextProxy); - final EditText etUser = (EditText)view.findViewById(R.id.editTextUsername); - final EditText etPass = (EditText)view.findViewById(R.id.editTextPassword); - - etId. setText(accCfg.getIdUri()); - etReg. setText(accCfg.getRegConfig().getRegistrarUri()); - StringVector proxies = accCfg.getSipConfig().getProxies(); - if (proxies.size() > 0) - etProxy.setText(proxies.get(0)); - else - etProxy.setText(""); - AuthCredInfoVector creds = accCfg.getSipConfig().getAuthCreds(); - if (creds.size() > 0) { - etUser. setText(creds.get(0).getUsername()); - etPass. setText(creds.get(0).getData()); - } else { - etUser. setText(""); - etPass. setText(""); - } - - adb.setCancelable(false); - adb.setPositiveButton("OK", - new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog,int id) - { - String acc_id = etId.getText().toString(); - String registrar = etReg.getText().toString(); - String proxy = etProxy.getText().toString(); - String username = etUser.getText().toString(); - String password = etPass.getText().toString(); - - accCfg.setIdUri(acc_id); - accCfg.getRegConfig().setRegistrarUri(registrar); - AuthCredInfoVector creds = accCfg.getSipConfig(). - getAuthCreds(); - creds.clear(); - if (username.length() != 0) { - creds.add(new AuthCredInfo("Digest", "*", username, 0, - password)); - } - StringVector proxies = accCfg.getSipConfig().getProxies(); - proxies.clear(); - if (proxy.length() != 0) { - proxies.add(proxy); - } - - /* Enable ICE */ - accCfg.getNatConfig().setIceEnabled(true); - - /* Finally */ - lastRegStatus = ""; - try { - account.modify(accCfg); - } catch (Exception e) {} - } - } - ); - adb.setNegativeButton("Cancel", - new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog,int id) - { - dialog.cancel(); - } - } - ); - - AlertDialog ad = adb.create(); - ad.show(); - } - - - public void makeCall(View view) - { - if (buddyListSelectedIdx == -1) - return; - - /* Only one call at anytime */ - if (currentCall != null) { - return; - } - - HashMap<String, String> item = (HashMap<String, String>) buddyListView. - getItemAtPosition(buddyListSelectedIdx); - String buddy_uri = item.get("uri"); - - MyCall call = new MyCall(account, -1); - CallOpParam prm = new CallOpParam(true); - - try { - call.makeCall(buddy_uri, prm); - } catch (Exception e) { - call.delete(); - return; - } - - currentCall = call; - showCallActivity(); - } - - private void dlgAddEditBuddy(BuddyConfig initial) - { - final BuddyConfig cfg = new BuddyConfig(); - final BuddyConfig old_cfg = initial; - final boolean is_add = initial == null; - - LayoutInflater li = LayoutInflater.from(this); - View view = li.inflate(R.layout.dlg_add_buddy, null); - - AlertDialog.Builder adb = new AlertDialog.Builder(this); - adb.setView(view); - - final EditText etUri = (EditText)view.findViewById(R.id.editTextUri); - final CheckBox cbSubs = (CheckBox)view.findViewById(R.id.checkBoxSubscribe); - - if (is_add) { - adb.setTitle("Add Buddy"); - } else { - adb.setTitle("Edit Buddy"); - etUri. setText(initial.getUri()); - cbSubs.setChecked(initial.getSubscribe()); - } - - adb.setCancelable(false); - adb.setPositiveButton("OK", - new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog,int id) - { - cfg.setUri(etUri.getText().toString()); - cfg.setSubscribe(cbSubs.isChecked()); - - if (is_add) { - account.addBuddy(cfg); - buddyList.add(putData(cfg.getUri(), "")); - buddyListAdapter.notifyDataSetChanged(); - buddyListSelectedIdx = -1; - } else { - if (!old_cfg.getUri().equals(cfg.getUri())) { - account.delBuddy(buddyListSelectedIdx); - account.addBuddy(cfg); - buddyList.remove(buddyListSelectedIdx); - buddyList.add(putData(cfg.getUri(), "")); - buddyListAdapter.notifyDataSetChanged(); - buddyListSelectedIdx = -1; - } else if (old_cfg.getSubscribe() != - cfg.getSubscribe()) - { - MyBuddy bud = account.buddyList.get( - buddyListSelectedIdx); - try { - bud.subscribePresence(cfg.getSubscribe()); - } catch (Exception e) {} - } - } - } - } - ); - adb.setNegativeButton("Cancel", - new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog,int id) { - dialog.cancel(); - } - } - ); - - AlertDialog ad = adb.create(); - ad.show(); - } - - public void addBuddy(View view) - { - dlgAddEditBuddy(null); - } - - public void editBuddy(View view) - { - if (buddyListSelectedIdx == -1) - return; - - BuddyConfig old_cfg = account.buddyList.get(buddyListSelectedIdx).cfg; - dlgAddEditBuddy(old_cfg); - } - - public void delBuddy(View view) { - if (buddyListSelectedIdx == -1) - return; - - final HashMap<String, String> item = (HashMap<String, String>) - buddyListView.getItemAtPosition(buddyListSelectedIdx); - String buddy_uri = item.get("uri"); - - DialogInterface.OnClickListener ocl = - new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - switch (which) { - case DialogInterface.BUTTON_POSITIVE: - account.delBuddy(buddyListSelectedIdx); - buddyList.remove(item); - buddyListAdapter.notifyDataSetChanged(); - buddyListSelectedIdx = -1; - break; - case DialogInterface.BUTTON_NEGATIVE: - break; - } - } - }; - - AlertDialog.Builder adb = new AlertDialog.Builder(this); - adb.setTitle(buddy_uri); - adb.setMessage("\nDelete this buddy?\n"); - adb.setPositiveButton("Yes", ocl); - adb.setNegativeButton("No", ocl); - adb.show(); - } - - - /* - * === MyAppObserver === - * - * As we cannot do UI from worker thread, the callbacks mostly just send - * a message to UI/main thread. - */ - - public void notifyIncomingCall(MyCall call) - { - Message m = Message.obtain(handler, MSG_TYPE.INCOMING_CALL, call); - m.sendToTarget(); - } - - public void notifyRegState(pjsip_status_code code, String reason, - int expiration) - { - String msg_str = ""; - if (expiration == 0) - msg_str += "Unregistration"; - else - msg_str += "Registration"; - - if (code.swigValue()/100 == 2) - msg_str += " successful"; - else - msg_str += " failed: " + reason; - - Message m = Message.obtain(handler, MSG_TYPE.REG_STATE, msg_str); - m.sendToTarget(); - } - - public void notifyCallState(MyCall call) - { - if (currentCall == null || call.getId() != currentCall.getId()) - return; - - CallInfo ci; - try { - ci = call.getInfo(); - } catch (Exception e) { - ci = null; - } - Message m = Message.obtain(handler, MSG_TYPE.CALL_STATE, ci); - m.sendToTarget(); - - if (ci != null && - ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) - { - currentCall = null; - } - } - - public void notifyCallMediaState(MyCall call) - { - Message m = Message.obtain(handler, MSG_TYPE.CALL_MEDIA_STATE, null); - m.sendToTarget(); - } - - public void notifyBuddyState(MyBuddy buddy) - { - Message m = Message.obtain(handler, MSG_TYPE.BUDDY_STATE, buddy); - m.sendToTarget(); - } - - /* === end of MyAppObserver ==== */ - -} +/* $Id: MainActivity.java 5022 2015-03-25 03:41:21Z nanang $ */
+/*
+ * Copyright (C) 2013 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package org.pjsip.pjsua2.app;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.pjsip.pjsua2.*;
+
+public class MainActivity extends Activity
+ implements Handler.Callback, MyAppObserver
+{
+ public static MyApp app = null;
+ public static MyCall currentCall = null;
+ public static MyAccount account = null;
+ public static AccountConfig accCfg = null;
+
+ private ListView buddyListView;
+ private SimpleAdapter buddyListAdapter;
+ private int buddyListSelectedIdx = -1;
+ ArrayList<Map<String, String>> buddyList;
+ private String lastRegStatus = "";
+
+ private final Handler handler = new Handler(this);
+ public class MSG_TYPE
+ {
+ public final static int INCOMING_CALL = 1;
+ public final static int CALL_STATE = 2;
+ public final static int REG_STATE = 3;
+ public final static int BUDDY_STATE = 4;
+ public final static int CALL_MEDIA_STATE = 5;
+ }
+
+ private HashMap<String, String> putData(String uri, String status)
+ {
+ HashMap<String, String> item = new HashMap<String, String>();
+ item.put("uri", uri);
+ item.put("status", status);
+ return item;
+ }
+
+ private void showCallActivity()
+ {
+ Intent intent = new Intent(this, CallActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ startActivity(intent);
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ if (app == null) {
+ app = new MyApp();
+ // Wait for GDB to init, for native debugging only
+ if (false &&
+ (getApplicationInfo().flags &
+ ApplicationInfo.FLAG_DEBUGGABLE) != 0)
+ {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {}
+ }
+
+ app.init(this, getFilesDir().getAbsolutePath());
+ }
+
+ if (app.accList.size() == 0) {
+ accCfg = new AccountConfig();
+ accCfg.setIdUri("sip:localhost");
+ accCfg.getNatConfig().setIceEnabled(true);
+ accCfg.getVideoConfig().setAutoTransmitOutgoing(true);
+ accCfg.getVideoConfig().setAutoShowIncoming(true);
+ account = app.addAcc(accCfg);
+ } else {
+ account = app.accList.get(0);
+ accCfg = account.cfg;
+ }
+
+ buddyList = new ArrayList<Map<String, String>>();
+ for (int i = 0; i < account.buddyList.size(); i++) {
+ buddyList.add(putData(account.buddyList.get(i).cfg.getUri(),
+ account.buddyList.get(i).getStatusText()));
+ }
+
+ String[] from = { "uri", "status" };
+ int[] to = { android.R.id.text1, android.R.id.text2 };
+ buddyListAdapter = new SimpleAdapter(
+ this, buddyList,
+ android.R.layout.simple_list_item_2,
+ from, to);
+
+ buddyListView = (ListView) findViewById(R.id.listViewBuddy);;
+ buddyListView.setAdapter(buddyListAdapter);
+ buddyListView.setOnItemClickListener(
+ new AdapterView.OnItemClickListener()
+ {
+ @Override
+ public void onItemClick(AdapterView<?> parent,
+ final View view,
+ int position, long id)
+ {
+ view.setSelected(true);
+ buddyListSelectedIdx = position;
+ }
+ }
+ );
+
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu)
+ {
+ // Inflate the menu; this adds items to the action bar
+ // if it is present.
+ getMenuInflater().inflate(R.menu.main, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item)
+ {
+ switch (item.getItemId()) {
+ case R.id.action_acc_config:
+ dlgAccountSetting();
+ break;
+
+ case R.id.action_quit:
+ Message m = Message.obtain(handler, 0);
+ m.sendToTarget();
+ break;
+
+ default:
+ break;
+ }
+
+ return true;
+ }
+
+ @Override
+ public boolean handleMessage(Message m)
+ {
+ if (m.what == 0) {
+
+ app.deinit();
+ finish();
+ Runtime.getRuntime().gc();
+ android.os.Process.killProcess(android.os.Process.myPid());
+
+ } else if (m.what == MSG_TYPE.CALL_STATE) {
+
+ CallInfo ci = (CallInfo) m.obj;
+
+ /* Forward the message to CallActivity */
+ if (CallActivity.handler_ != null) {
+ Message m2 = Message.obtain(CallActivity.handler_,
+ MSG_TYPE.CALL_STATE, ci);
+ m2.sendToTarget();
+ }
+
+ } else if (m.what == MSG_TYPE.CALL_MEDIA_STATE) {
+
+ /* Forward the message to CallActivity */
+ if (CallActivity.handler_ != null) {
+ Message m2 = Message.obtain(CallActivity.handler_,
+ MSG_TYPE.CALL_MEDIA_STATE,
+ null);
+ m2.sendToTarget();
+ }
+
+ } else if (m.what == MSG_TYPE.BUDDY_STATE) {
+
+ MyBuddy buddy = (MyBuddy) m.obj;
+ int idx = account.buddyList.indexOf(buddy);
+
+ /* Update buddy status text, if buddy is valid and
+ * the buddy lists in account and UI are sync-ed.
+ */
+ if (idx >= 0 && account.buddyList.size() == buddyList.size())
+ {
+ buddyList.get(idx).put("status", buddy.getStatusText());
+ buddyListAdapter.notifyDataSetChanged();
+ // TODO: selection color/mark is gone after this,
+ // dont know how to return it back.
+ //buddyListView.setSelection(buddyListSelectedIdx);
+ //buddyListView.performItemClick(buddyListView,
+ // buddyListSelectedIdx,
+ // buddyListView.
+ // getItemIdAtPosition(buddyListSelectedIdx));
+
+ /* Return back Call activity */
+ notifyCallState(currentCall);
+ }
+
+ } else if (m.what == MSG_TYPE.REG_STATE) {
+
+ String msg_str = (String) m.obj;
+ lastRegStatus = msg_str;
+
+ } else if (m.what == MSG_TYPE.INCOMING_CALL) {
+
+ /* Incoming call */
+ final MyCall call = (MyCall) m.obj;
+ CallOpParam prm = new CallOpParam();
+
+ /* Only one call at anytime */
+ if (currentCall != null) {
+ /*
+ prm.setStatusCode(pjsip_status_code.PJSIP_SC_BUSY_HERE);
+ try {
+ call.hangup(prm);
+ } catch (Exception e) {}
+ */
+ // TODO: set status code
+ call.delete();
+ return true;
+ }
+
+ /* Answer with ringing */
+ prm.setStatusCode(pjsip_status_code.PJSIP_SC_RINGING);
+ try {
+ call.answer(prm);
+ } catch (Exception e) {}
+
+ currentCall = call;
+ showCallActivity();
+
+ } else {
+
+ /* Message not handled */
+ return false;
+
+ }
+
+ return true;
+ }
+
+
+ private void dlgAccountSetting()
+ {
+ LayoutInflater li = LayoutInflater.from(this);
+ View view = li.inflate(R.layout.dlg_account_config, null);
+
+ if (lastRegStatus.length()!=0) {
+ TextView tvInfo = (TextView)view.findViewById(R.id.textViewInfo);
+ tvInfo.setText("Last status: " + lastRegStatus);
+ }
+
+ AlertDialog.Builder adb = new AlertDialog.Builder(this);
+ adb.setView(view);
+ adb.setTitle("Account Settings");
+
+ final EditText etId = (EditText)view.findViewById(R.id.editTextId);
+ final EditText etReg = (EditText)view.findViewById(R.id.editTextRegistrar);
+ final EditText etProxy = (EditText)view.findViewById(R.id.editTextProxy);
+ final EditText etUser = (EditText)view.findViewById(R.id.editTextUsername);
+ final EditText etPass = (EditText)view.findViewById(R.id.editTextPassword);
+
+ etId. setText(accCfg.getIdUri());
+ etReg. setText(accCfg.getRegConfig().getRegistrarUri());
+ StringVector proxies = accCfg.getSipConfig().getProxies();
+ if (proxies.size() > 0)
+ etProxy.setText(proxies.get(0));
+ else
+ etProxy.setText("");
+ AuthCredInfoVector creds = accCfg.getSipConfig().getAuthCreds();
+ if (creds.size() > 0) {
+ etUser. setText(creds.get(0).getUsername());
+ etPass. setText(creds.get(0).getData());
+ } else {
+ etUser. setText("");
+ etPass. setText("");
+ }
+
+ adb.setCancelable(false);
+ adb.setPositiveButton("OK",
+ new DialogInterface.OnClickListener()
+ {
+ public void onClick(DialogInterface dialog,int id)
+ {
+ String acc_id = etId.getText().toString();
+ String registrar = etReg.getText().toString();
+ String proxy = etProxy.getText().toString();
+ String username = etUser.getText().toString();
+ String password = etPass.getText().toString();
+
+ accCfg.setIdUri(acc_id);
+ accCfg.getRegConfig().setRegistrarUri(registrar);
+ AuthCredInfoVector creds = accCfg.getSipConfig().
+ getAuthCreds();
+ creds.clear();
+ if (username.length() != 0) {
+ creds.add(new AuthCredInfo("Digest", "*", username, 0,
+ password));
+ }
+ StringVector proxies = accCfg.getSipConfig().getProxies();
+ proxies.clear();
+ if (proxy.length() != 0) {
+ proxies.add(proxy);
+ }
+
+ /* Enable ICE */
+ accCfg.getNatConfig().setIceEnabled(true);
+
+ /* Finally */
+ lastRegStatus = "";
+ try {
+ account.modify(accCfg);
+ } catch (Exception e) {}
+ }
+ }
+ );
+ adb.setNegativeButton("Cancel",
+ new DialogInterface.OnClickListener()
+ {
+ public void onClick(DialogInterface dialog,int id)
+ {
+ dialog.cancel();
+ }
+ }
+ );
+
+ AlertDialog ad = adb.create();
+ ad.show();
+ }
+
+
+ public void makeCall(View view)
+ {
+ if (buddyListSelectedIdx == -1)
+ return;
+
+ /* Only one call at anytime */
+ if (currentCall != null) {
+ return;
+ }
+
+ HashMap<String, String> item = (HashMap<String, String>) buddyListView.
+ getItemAtPosition(buddyListSelectedIdx);
+ String buddy_uri = item.get("uri");
+
+ MyCall call = new MyCall(account, -1);
+ CallOpParam prm = new CallOpParam(true);
+
+ try {
+ call.makeCall(buddy_uri, prm);
+ } catch (Exception e) {
+ call.delete();
+ return;
+ }
+
+ currentCall = call;
+ showCallActivity();
+ }
+
+ private void dlgAddEditBuddy(BuddyConfig initial)
+ {
+ final BuddyConfig cfg = new BuddyConfig();
+ final BuddyConfig old_cfg = initial;
+ final boolean is_add = initial == null;
+
+ LayoutInflater li = LayoutInflater.from(this);
+ View view = li.inflate(R.layout.dlg_add_buddy, null);
+
+ AlertDialog.Builder adb = new AlertDialog.Builder(this);
+ adb.setView(view);
+
+ final EditText etUri = (EditText)view.findViewById(R.id.editTextUri);
+ final CheckBox cbSubs = (CheckBox)view.findViewById(R.id.checkBoxSubscribe);
+
+ if (is_add) {
+ adb.setTitle("Add Buddy");
+ } else {
+ adb.setTitle("Edit Buddy");
+ etUri. setText(initial.getUri());
+ cbSubs.setChecked(initial.getSubscribe());
+ }
+
+ adb.setCancelable(false);
+ adb.setPositiveButton("OK",
+ new DialogInterface.OnClickListener()
+ {
+ public void onClick(DialogInterface dialog,int id)
+ {
+ cfg.setUri(etUri.getText().toString());
+ cfg.setSubscribe(cbSubs.isChecked());
+
+ if (is_add) {
+ account.addBuddy(cfg);
+ buddyList.add(putData(cfg.getUri(), ""));
+ buddyListAdapter.notifyDataSetChanged();
+ buddyListSelectedIdx = -1;
+ } else {
+ if (!old_cfg.getUri().equals(cfg.getUri())) {
+ account.delBuddy(buddyListSelectedIdx);
+ account.addBuddy(cfg);
+ buddyList.remove(buddyListSelectedIdx);
+ buddyList.add(putData(cfg.getUri(), ""));
+ buddyListAdapter.notifyDataSetChanged();
+ buddyListSelectedIdx = -1;
+ } else if (old_cfg.getSubscribe() !=
+ cfg.getSubscribe())
+ {
+ MyBuddy bud = account.buddyList.get(
+ buddyListSelectedIdx);
+ try {
+ bud.subscribePresence(cfg.getSubscribe());
+ } catch (Exception e) {}
+ }
+ }
+ }
+ }
+ );
+ adb.setNegativeButton("Cancel",
+ new DialogInterface.OnClickListener()
+ {
+ public void onClick(DialogInterface dialog,int id) {
+ dialog.cancel();
+ }
+ }
+ );
+
+ AlertDialog ad = adb.create();
+ ad.show();
+ }
+
+ public void addBuddy(View view)
+ {
+ dlgAddEditBuddy(null);
+ }
+
+ public void editBuddy(View view)
+ {
+ if (buddyListSelectedIdx == -1)
+ return;
+
+ BuddyConfig old_cfg = account.buddyList.get(buddyListSelectedIdx).cfg;
+ dlgAddEditBuddy(old_cfg);
+ }
+
+ public void delBuddy(View view) {
+ if (buddyListSelectedIdx == -1)
+ return;
+
+ final HashMap<String, String> item = (HashMap<String, String>)
+ buddyListView.getItemAtPosition(buddyListSelectedIdx);
+ String buddy_uri = item.get("uri");
+
+ DialogInterface.OnClickListener ocl =
+ new DialogInterface.OnClickListener()
+ {
+ @Override
+ public void onClick(DialogInterface dialog, int which)
+ {
+ switch (which) {
+ case DialogInterface.BUTTON_POSITIVE:
+ account.delBuddy(buddyListSelectedIdx);
+ buddyList.remove(item);
+ buddyListAdapter.notifyDataSetChanged();
+ buddyListSelectedIdx = -1;
+ break;
+ case DialogInterface.BUTTON_NEGATIVE:
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder adb = new AlertDialog.Builder(this);
+ adb.setTitle(buddy_uri);
+ adb.setMessage("\nDelete this buddy?\n");
+ adb.setPositiveButton("Yes", ocl);
+ adb.setNegativeButton("No", ocl);
+ adb.show();
+ }
+
+
+ /*
+ * === MyAppObserver ===
+ *
+ * As we cannot do UI from worker thread, the callbacks mostly just send
+ * a message to UI/main thread.
+ */
+
+ public void notifyIncomingCall(MyCall call)
+ {
+ Message m = Message.obtain(handler, MSG_TYPE.INCOMING_CALL, call);
+ m.sendToTarget();
+ }
+
+ public void notifyRegState(pjsip_status_code code, String reason,
+ int expiration)
+ {
+ String msg_str = "";
+ if (expiration == 0)
+ msg_str += "Unregistration";
+ else
+ msg_str += "Registration";
+
+ if (code.swigValue()/100 == 2)
+ msg_str += " successful";
+ else
+ msg_str += " failed: " + reason;
+
+ Message m = Message.obtain(handler, MSG_TYPE.REG_STATE, msg_str);
+ m.sendToTarget();
+ }
+
+ public void notifyCallState(MyCall call)
+ {
+ if (currentCall == null || call.getId() != currentCall.getId())
+ return;
+
+ CallInfo ci;
+ try {
+ ci = call.getInfo();
+ } catch (Exception e) {
+ ci = null;
+ }
+ Message m = Message.obtain(handler, MSG_TYPE.CALL_STATE, ci);
+ m.sendToTarget();
+
+ if (ci != null &&
+ ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
+ {
+ currentCall = null;
+ }
+ }
+
+ public void notifyCallMediaState(MyCall call)
+ {
+ Message m = Message.obtain(handler, MSG_TYPE.CALL_MEDIA_STATE, null);
+ m.sendToTarget();
+ }
+
+ public void notifyBuddyState(MyBuddy buddy)
+ {
+ Message m = Message.obtain(handler, MSG_TYPE.BUDDY_STATE, buddy);
+ m.sendToTarget();
+ }
+
+ /* === end of MyAppObserver ==== */
+
+}
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java index f7855db4..b8c50671 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java +++ b/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java @@ -1,540 +1,540 @@ -/* $Id$ */ -/* - * Copyright (C) 2013 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -package org.pjsip.pjsua2.app; - -import java.io.File; -import java.util.ArrayList; - -import org.pjsip.pjsua2.*; - - -/* Interface to separate UI & engine a bit better */ -interface MyAppObserver -{ - abstract void notifyRegState(pjsip_status_code code, String reason, - int expiration); - abstract void notifyIncomingCall(MyCall call); - abstract void notifyCallState(MyCall call); - abstract void notifyCallMediaState(MyCall call); - abstract void notifyBuddyState(MyBuddy buddy); -} - - -class MyLogWriter extends LogWriter -{ - @Override - public void write(LogEntry entry) - { - System.out.println(entry.getMsg()); - } -} - - -class MyCall extends Call -{ - public VideoWindow vidWin; - public VideoPreview vidPrev; - - MyCall(MyAccount acc, int call_id) - { - super(acc, call_id); - vidWin = null; - } - - @Override - public void onCallState(OnCallStateParam prm) - { - MyApp.observer.notifyCallState(this); - try { - CallInfo ci = getInfo(); - if (ci.getState() == - pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) - { - this.delete(); - } - } catch (Exception e) { - return; - } - } - - @Override - public void onCallMediaState(OnCallMediaStateParam prm) - { - CallInfo ci; - try { - ci = getInfo(); - } catch (Exception e) { - return; - } - - CallMediaInfoVector cmiv = ci.getMedia(); - - for (int i = 0; i < cmiv.size(); i++) { - CallMediaInfo cmi = cmiv.get(i); - if (cmi.getType() == pjmedia_type.PJMEDIA_TYPE_AUDIO && - (cmi.getStatus() == - pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE || - cmi.getStatus() == - pjsua_call_media_status.PJSUA_CALL_MEDIA_REMOTE_HOLD)) - { - // unfortunately, on Java too, the returned Media cannot be - // downcasted to AudioMedia - Media m = getMedia(i); - AudioMedia am = AudioMedia.typecastFromMedia(m); - - // connect ports - try { - MyApp.ep.audDevManager().getCaptureDevMedia(). - startTransmit(am); - am.startTransmit(MyApp.ep.audDevManager(). - getPlaybackDevMedia()); - } catch (Exception e) { - continue; - } - } else if (cmi.getType() == pjmedia_type.PJMEDIA_TYPE_VIDEO && - cmi.getStatus() == - pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE && - cmi.getVideoIncomingWindowId() != pjsua2.INVALID_ID) - { - vidWin = new VideoWindow(cmi.getVideoIncomingWindowId()); - vidPrev = new VideoPreview(cmi.getVideoCapDev()); - } - } - - MyApp.observer.notifyCallMediaState(this); - } -} - - -class MyAccount extends Account -{ - public ArrayList<MyBuddy> buddyList = new ArrayList<MyBuddy>(); - public AccountConfig cfg; - - MyAccount(AccountConfig config) - { - super(); - cfg = config; - } - - public MyBuddy addBuddy(BuddyConfig bud_cfg) - { - /* Create Buddy */ - MyBuddy bud = new MyBuddy(bud_cfg); - try { - bud.create(this, bud_cfg); - } catch (Exception e) { - bud.delete(); - bud = null; - } - - if (bud != null) { - buddyList.add(bud); - if (bud_cfg.getSubscribe()) - try { - bud.subscribePresence(true); - } catch (Exception e) {} - } - - return bud; - } - - public void delBuddy(MyBuddy buddy) - { - buddyList.remove(buddy); - buddy.delete(); - } - - public void delBuddy(int index) - { - MyBuddy bud = buddyList.get(index); - buddyList.remove(index); - bud.delete(); - } - - @Override - public void onRegState(OnRegStateParam prm) - { - MyApp.observer.notifyRegState(prm.getCode(), prm.getReason(), - prm.getExpiration()); - } - - @Override - public void onIncomingCall(OnIncomingCallParam prm) - { - System.out.println("======== Incoming call ======== "); - MyCall call = new MyCall(this, prm.getCallId()); - MyApp.observer.notifyIncomingCall(call); - } - - @Override - public void onInstantMessage(OnInstantMessageParam prm) - { - System.out.println("======== Incoming pager ======== "); - System.out.println("From : " + prm.getFromUri()); - System.out.println("To : " + prm.getToUri()); - System.out.println("Contact : " + prm.getContactUri()); - System.out.println("Mimetype : " + prm.getContentType()); - System.out.println("Body : " + prm.getMsgBody()); - } -} - - -class MyBuddy extends Buddy -{ - public BuddyConfig cfg; - - MyBuddy(BuddyConfig config) - { - super(); - cfg = config; - } - - String getStatusText() - { - BuddyInfo bi; - - try { - bi = getInfo(); - } catch (Exception e) { - return "?"; - } - - String status = ""; - if (bi.getSubState() == pjsip_evsub_state.PJSIP_EVSUB_STATE_ACTIVE) { - if (bi.getPresStatus().getStatus() == - pjsua_buddy_status.PJSUA_BUDDY_STATUS_ONLINE) - { - status = bi.getPresStatus().getStatusText(); - if (status == null || status.length()==0) { - status = "Online"; - } - } else if (bi.getPresStatus().getStatus() == - pjsua_buddy_status.PJSUA_BUDDY_STATUS_OFFLINE) - { - status = "Offline"; - } else { - status = "Unknown"; - } - } - return status; - } - - @Override - public void onBuddyState() - { - MyApp.observer.notifyBuddyState(this); - } - -} - - -class MyAccountConfig -{ - public AccountConfig accCfg = new AccountConfig(); - public ArrayList<BuddyConfig> buddyCfgs = new ArrayList<BuddyConfig>(); - - public void readObject(ContainerNode node) - { - try { - ContainerNode acc_node = node.readContainer("Account"); - accCfg.readObject(acc_node); - ContainerNode buddies_node = acc_node.readArray("buddies"); - buddyCfgs.clear(); - while (buddies_node.hasUnread()) { - BuddyConfig bud_cfg = new BuddyConfig(); - bud_cfg.readObject(buddies_node); - buddyCfgs.add(bud_cfg); - } - } catch (Exception e) {} - } - - public void writeObject(ContainerNode node) - { - try { - ContainerNode acc_node = node.writeNewContainer("Account"); - accCfg.writeObject(acc_node); - ContainerNode buddies_node = acc_node.writeNewArray("buddies"); - for (int j = 0; j < buddyCfgs.size(); j++) { - buddyCfgs.get(j).writeObject(buddies_node); - } - } catch (Exception e) {} - } -} - - -class MyApp { - static { - try{ - System.loadLibrary("openh264"); - // Ticket #1937: libyuv is now included as static lib - //System.loadLibrary("yuv"); - } catch (UnsatisfiedLinkError e) { - System.out.println("UnsatisfiedLinkError: " + e.getMessage()); - System.out.println("This could be safely ignored if you " + - "don't need video."); - } - System.loadLibrary("pjsua2"); - System.out.println("Library loaded"); - } - - public static Endpoint ep = new Endpoint(); - public static MyAppObserver observer; - public ArrayList<MyAccount> accList = new ArrayList<MyAccount>(); - - private ArrayList<MyAccountConfig> accCfgs = - new ArrayList<MyAccountConfig>(); - private EpConfig epConfig = new EpConfig(); - private TransportConfig sipTpConfig = new TransportConfig(); - private String appDir; - - /* Maintain reference to log writer to avoid premature cleanup by GC */ - private MyLogWriter logWriter; - - private final String configName = "pjsua2.json"; - private final int SIP_PORT = 6000; - private final int LOG_LEVEL = 4; - - public void init(MyAppObserver obs, String app_dir) - { - init(obs, app_dir, false); - } - - public void init(MyAppObserver obs, String app_dir, - boolean own_worker_thread) - { - observer = obs; - appDir = app_dir; - - /* Create endpoint */ - try { - ep.libCreate(); - } catch (Exception e) { - return; - } - - - /* Load config */ - String configPath = appDir + "/" + configName; - File f = new File(configPath); - if (f.exists()) { - loadConfig(configPath); - } else { - /* Set 'default' values */ - sipTpConfig.setPort(SIP_PORT); - } - - /* Override log level setting */ - epConfig.getLogConfig().setLevel(LOG_LEVEL); - epConfig.getLogConfig().setConsoleLevel(LOG_LEVEL); - - /* Set log config. */ - LogConfig log_cfg = epConfig.getLogConfig(); - logWriter = new MyLogWriter(); - log_cfg.setWriter(logWriter); - log_cfg.setDecor(log_cfg.getDecor() & - ~(pj_log_decoration.PJ_LOG_HAS_CR.swigValue() | - pj_log_decoration.PJ_LOG_HAS_NEWLINE.swigValue())); - - /* Set ua config. */ - UaConfig ua_cfg = epConfig.getUaConfig(); - ua_cfg.setUserAgent("Pjsua2 Android " + ep.libVersion().getFull()); - StringVector stun_servers = new StringVector(); - stun_servers.add("stun.pjsip.org"); - ua_cfg.setStunServer(stun_servers); - if (own_worker_thread) { - ua_cfg.setThreadCnt(0); - ua_cfg.setMainThreadOnly(true); - } - - /* Init endpoint */ - try { - ep.libInit(epConfig); - } catch (Exception e) { - return; - } - - /* Create transports. */ - try { - ep.transportCreate(pjsip_transport_type_e.PJSIP_TRANSPORT_UDP, - sipTpConfig); - } catch (Exception e) { - System.out.println(e); - } - - try { - ep.transportCreate(pjsip_transport_type_e.PJSIP_TRANSPORT_TCP, - sipTpConfig); - } catch (Exception e) { - System.out.println(e); - } - - /* Create accounts. */ - for (int i = 0; i < accCfgs.size(); i++) { - MyAccountConfig my_cfg = accCfgs.get(i); - - /* Customize account config */ - my_cfg.accCfg.getNatConfig().setIceEnabled(true); - my_cfg.accCfg.getVideoConfig().setAutoTransmitOutgoing(true); - my_cfg.accCfg.getVideoConfig().setAutoShowIncoming(true); - - MyAccount acc = addAcc(my_cfg.accCfg); - if (acc == null) - continue; - - /* Add Buddies */ - for (int j = 0; j < my_cfg.buddyCfgs.size(); j++) { - BuddyConfig bud_cfg = my_cfg.buddyCfgs.get(j); - acc.addBuddy(bud_cfg); - } - } - - /* Start. */ - try { - ep.libStart(); - } catch (Exception e) { - return; - } - } - - public MyAccount addAcc(AccountConfig cfg) - { - MyAccount acc = new MyAccount(cfg); - try { - acc.create(cfg); - } catch (Exception e) { - acc = null; - return null; - } - - accList.add(acc); - return acc; - } - - public void delAcc(MyAccount acc) - { - accList.remove(acc); - } - - private void loadConfig(String filename) - { - JsonDocument json = new JsonDocument(); - - try { - /* Load file */ - json.loadFile(filename); - ContainerNode root = json.getRootContainer(); - - /* Read endpoint config */ - epConfig.readObject(root); - - /* Read transport config */ - ContainerNode tp_node = root.readContainer("SipTransport"); - sipTpConfig.readObject(tp_node); - - /* Read account configs */ - accCfgs.clear(); - ContainerNode accs_node = root.readArray("accounts"); - while (accs_node.hasUnread()) { - MyAccountConfig acc_cfg = new MyAccountConfig(); - acc_cfg.readObject(accs_node); - accCfgs.add(acc_cfg); - } - } catch (Exception e) { - System.out.println(e); - } - - /* Force delete json now, as I found that Java somehow destroys it - * after lib has been destroyed and from non-registered thread. - */ - json.delete(); - } - - private void buildAccConfigs() - { - /* Sync accCfgs from accList */ - accCfgs.clear(); - for (int i = 0; i < accList.size(); i++) { - MyAccount acc = accList.get(i); - MyAccountConfig my_acc_cfg = new MyAccountConfig(); - my_acc_cfg.accCfg = acc.cfg; - - my_acc_cfg.buddyCfgs.clear(); - for (int j = 0; j < acc.buddyList.size(); j++) { - MyBuddy bud = acc.buddyList.get(j); - my_acc_cfg.buddyCfgs.add(bud.cfg); - } - - accCfgs.add(my_acc_cfg); - } - } - - private void saveConfig(String filename) - { - JsonDocument json = new JsonDocument(); - - try { - /* Write endpoint config */ - json.writeObject(epConfig); - - /* Write transport config */ - ContainerNode tp_node = json.writeNewContainer("SipTransport"); - sipTpConfig.writeObject(tp_node); - - /* Write account configs */ - buildAccConfigs(); - ContainerNode accs_node = json.writeNewArray("accounts"); - for (int i = 0; i < accCfgs.size(); i++) { - accCfgs.get(i).writeObject(accs_node); - } - - /* Save file */ - json.saveFile(filename); - } catch (Exception e) {} - - /* Force delete json now, as I found that Java somehow destroys it - * after lib has been destroyed and from non-registered thread. - */ - json.delete(); - } - - public void deinit() - { - String configPath = appDir + "/" + configName; - saveConfig(configPath); - - /* Try force GC to avoid late destroy of PJ objects as they should be - * deleted before lib is destroyed. - */ - Runtime.getRuntime().gc(); - - /* Shutdown pjsua. Note that Endpoint destructor will also invoke - * libDestroy(), so this will be a test of double libDestroy(). - */ - try { - ep.libDestroy(); - } catch (Exception e) {} - - /* Force delete Endpoint here, to avoid deletion from a non- - * registered thread (by GC?). - */ - ep.delete(); - ep = null; - } -} +/* $Id: MyApp.java 5361 2016-06-28 14:32:08Z nanang $ */
+/*
+ * Copyright (C) 2013 Teluu Inc. (http://www.teluu.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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package org.pjsip.pjsua2.app;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import org.pjsip.pjsua2.*;
+
+
+/* Interface to separate UI & engine a bit better */
+interface MyAppObserver
+{
+ abstract void notifyRegState(pjsip_status_code code, String reason,
+ int expiration);
+ abstract void notifyIncomingCall(MyCall call);
+ abstract void notifyCallState(MyCall call);
+ abstract void notifyCallMediaState(MyCall call);
+ abstract void notifyBuddyState(MyBuddy buddy);
+}
+
+
+class MyLogWriter extends LogWriter
+{
+ @Override
+ public void write(LogEntry entry)
+ {
+ System.out.println(entry.getMsg());
+ }
+}
+
+
+class MyCall extends Call
+{
+ public VideoWindow vidWin;
+ public VideoPreview vidPrev;
+
+ MyCall(MyAccount acc, int call_id)
+ {
+ super(acc, call_id);
+ vidWin = null;
+ }
+
+ @Override
+ public void onCallState(OnCallStateParam prm)
+ {
+ MyApp.observer.notifyCallState(this);
+ try {
+ CallInfo ci = getInfo();
+ if (ci.getState() ==
+ pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
+ {
+ this.delete();
+ }
+ } catch (Exception e) {
+ return;
+ }
+ }
+
+ @Override
+ public void onCallMediaState(OnCallMediaStateParam prm)
+ {
+ CallInfo ci;
+ try {
+ ci = getInfo();
+ } catch (Exception e) {
+ return;
+ }
+
+ CallMediaInfoVector cmiv = ci.getMedia();
+
+ for (int i = 0; i < cmiv.size(); i++) {
+ CallMediaInfo cmi = cmiv.get(i);
+ if (cmi.getType() == pjmedia_type.PJMEDIA_TYPE_AUDIO &&
+ (cmi.getStatus() ==
+ pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE ||
+ cmi.getStatus() ==
+ pjsua_call_media_status.PJSUA_CALL_MEDIA_REMOTE_HOLD))
+ {
+ // unfortunately, on Java too, the returned Media cannot be
+ // downcasted to AudioMedia
+ Media m = getMedia(i);
+ AudioMedia am = AudioMedia.typecastFromMedia(m);
+
+ // connect ports
+ try {
+ MyApp.ep.audDevManager().getCaptureDevMedia().
+ startTransmit(am);
+ am.startTransmit(MyApp.ep.audDevManager().
+ getPlaybackDevMedia());
+ } catch (Exception e) {
+ continue;
+ }
+ } else if (cmi.getType() == pjmedia_type.PJMEDIA_TYPE_VIDEO &&
+ cmi.getStatus() ==
+ pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE &&
+ cmi.getVideoIncomingWindowId() != pjsua2.INVALID_ID)
+ {
+ vidWin = new VideoWindow(cmi.getVideoIncomingWindowId());
+ vidPrev = new VideoPreview(cmi.getVideoCapDev());
+ }
+ }
+
+ MyApp.observer.notifyCallMediaState(this);
+ }
+}
+
+
+class MyAccount extends Account
+{
+ public ArrayList<MyBuddy> buddyList = new ArrayList<MyBuddy>();
+ public AccountConfig cfg;
+
+ MyAccount(AccountConfig config)
+ {
+ super();
+ cfg = config;
+ }
+
+ public MyBuddy addBuddy(BuddyConfig bud_cfg)
+ {
+ /* Create Buddy */
+ MyBuddy bud = new MyBuddy(bud_cfg);
+ try {
+ bud.create(this, bud_cfg);
+ } catch (Exception e) {
+ bud.delete();
+ bud = null;
+ }
+
+ if (bud != null) {
+ buddyList.add(bud);
+ if (bud_cfg.getSubscribe())
+ try {
+ bud.subscribePresence(true);
+ } catch (Exception e) {}
+ }
+
+ return bud;
+ }
+
+ public void delBuddy(MyBuddy buddy)
+ {
+ buddyList.remove(buddy);
+ buddy.delete();
+ }
+
+ public void delBuddy(int index)
+ {
+ MyBuddy bud = buddyList.get(index);
+ buddyList.remove(index);
+ bud.delete();
+ }
+
+ @Override
+ public void onRegState(OnRegStateParam prm)
+ {
+ MyApp.observer.notifyRegState(prm.getCode(), prm.getReason(),
+ prm.getExpiration());
+ }
+
+ @Override
+ public void onIncomingCall(OnIncomingCallParam prm)
+ {
+ System.out.println("======== Incoming call ======== ");
+ MyCall call = new MyCall(this, prm.getCallId());
+ MyApp.observer.notifyIncomingCall(call);
+ }
+
+ @Override
+ public void onInstantMessage(OnInstantMessageParam prm)
+ {
+ System.out.println("======== Incoming pager ======== ");
+ System.out.println("From : " + prm.getFromUri());
+ System.out.println("To : " + prm.getToUri());
+ System.out.println("Contact : " + prm.getContactUri());
+ System.out.println("Mimetype : " + prm.getContentType());
+ System.out.println("Body : " + prm.getMsgBody());
+ }
+}
+
+
+class MyBuddy extends Buddy
+{
+ public BuddyConfig cfg;
+
+ MyBuddy(BuddyConfig config)
+ {
+ super();
+ cfg = config;
+ }
+
+ String getStatusText()
+ {
+ BuddyInfo bi;
+
+ try {
+ bi = getInfo();
+ } catch (Exception e) {
+ return "?";
+ }
+
+ String status = "";
+ if (bi.getSubState() == pjsip_evsub_state.PJSIP_EVSUB_STATE_ACTIVE) {
+ if (bi.getPresStatus().getStatus() ==
+ pjsua_buddy_status.PJSUA_BUDDY_STATUS_ONLINE)
+ {
+ status = bi.getPresStatus().getStatusText();
+ if (status == null || status.length()==0) {
+ status = "Online";
+ }
+ } else if (bi.getPresStatus().getStatus() ==
+ pjsua_buddy_status.PJSUA_BUDDY_STATUS_OFFLINE)
+ {
+ status = "Offline";
+ } else {
+ status = "Unknown";
+ }
+ }
+ return status;
+ }
+
+ @Override
+ public void onBuddyState()
+ {
+ MyApp.observer.notifyBuddyState(this);
+ }
+
+}
+
+
+class MyAccountConfig
+{
+ public AccountConfig accCfg = new AccountConfig();
+ public ArrayList<BuddyConfig> buddyCfgs = new ArrayList<BuddyConfig>();
+
+ public void readObject(ContainerNode node)
+ {
+ try {
+ ContainerNode acc_node = node.readContainer("Account");
+ accCfg.readObject(acc_node);
+ ContainerNode buddies_node = acc_node.readArray("buddies");
+ buddyCfgs.clear();
+ while (buddies_node.hasUnread()) {
+ BuddyConfig bud_cfg = new BuddyConfig();
+ bud_cfg.readObject(buddies_node);
+ buddyCfgs.add(bud_cfg);
+ }
+ } catch (Exception e) {}
+ }
+
+ public void writeObject(ContainerNode node)
+ {
+ try {
+ ContainerNode acc_node = node.writeNewContainer("Account");
+ accCfg.writeObject(acc_node);
+ ContainerNode buddies_node = acc_node.writeNewArray("buddies");
+ for (int j = 0; j < buddyCfgs.size(); j++) {
+ buddyCfgs.get(j).writeObject(buddies_node);
+ }
+ } catch (Exception e) {}
+ }
+}
+
+
+class MyApp {
+ static {
+ try{
+ System.loadLibrary("openh264");
+ // Ticket #1937: libyuv is now included as static lib
+ //System.loadLibrary("yuv");
+ } catch (UnsatisfiedLinkError e) {
+ System.out.println("UnsatisfiedLinkError: " + e.getMessage());
+ System.out.println("This could be safely ignored if you " +
+ "don't need video.");
+ }
+ System.loadLibrary("pjsua2");
+ System.out.println("Library loaded");
+ }
+
+ public static Endpoint ep = new Endpoint();
+ public static MyAppObserver observer;
+ public ArrayList<MyAccount> accList = new ArrayList<MyAccount>();
+
+ private ArrayList<MyAccountConfig> accCfgs =
+ new ArrayList<MyAccountConfig>();
+ private EpConfig epConfig = new EpConfig();
+ private TransportConfig sipTpConfig = new TransportConfig();
+ private String appDir;
+
+ /* Maintain reference to log writer to avoid premature cleanup by GC */
+ private MyLogWriter logWriter;
+
+ private final String configName = "pjsua2.json";
+ private final int SIP_PORT = 6000;
+ private final int LOG_LEVEL = 4;
+
+ public void init(MyAppObserver obs, String app_dir)
+ {
+ init(obs, app_dir, false);
+ }
+
+ public void init(MyAppObserver obs, String app_dir,
+ boolean own_worker_thread)
+ {
+ observer = obs;
+ appDir = app_dir;
+
+ /* Create endpoint */
+ try {
+ ep.libCreate();
+ } catch (Exception e) {
+ return;
+ }
+
+
+ /* Load config */
+ String configPath = appDir + "/" + configName;
+ File f = new File(configPath);
+ if (f.exists()) {
+ loadConfig(configPath);
+ } else {
+ /* Set 'default' values */
+ sipTpConfig.setPort(SIP_PORT);
+ }
+
+ /* Override log level setting */
+ epConfig.getLogConfig().setLevel(LOG_LEVEL);
+ epConfig.getLogConfig().setConsoleLevel(LOG_LEVEL);
+
+ /* Set log config. */
+ LogConfig log_cfg = epConfig.getLogConfig();
+ logWriter = new MyLogWriter();
+ log_cfg.setWriter(logWriter);
+ log_cfg.setDecor(log_cfg.getDecor() &
+ ~(pj_log_decoration.PJ_LOG_HAS_CR.swigValue() |
+ pj_log_decoration.PJ_LOG_HAS_NEWLINE.swigValue()));
+
+ /* Set ua config. */
+ UaConfig ua_cfg = epConfig.getUaConfig();
+ ua_cfg.setUserAgent("Pjsua2 Android " + ep.libVersion().getFull());
+ StringVector stun_servers = new StringVector();
+ stun_servers.add("stun.pjsip.org");
+ ua_cfg.setStunServer(stun_servers);
+ if (own_worker_thread) {
+ ua_cfg.setThreadCnt(0);
+ ua_cfg.setMainThreadOnly(true);
+ }
+
+ /* Init endpoint */
+ try {
+ ep.libInit(epConfig);
+ } catch (Exception e) {
+ return;
+ }
+
+ /* Create transports. */
+ try {
+ ep.transportCreate(pjsip_transport_type_e.PJSIP_TRANSPORT_UDP,
+ sipTpConfig);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+
+ try {
+ ep.transportCreate(pjsip_transport_type_e.PJSIP_TRANSPORT_TCP,
+ sipTpConfig);
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+
+ /* Create accounts. */
+ for (int i = 0; i < accCfgs.size(); i++) {
+ MyAccountConfig my_cfg = accCfgs.get(i);
+
+ /* Customize account config */
+ my_cfg.accCfg.getNatConfig().setIceEnabled(true);
+ my_cfg.accCfg.getVideoConfig().setAutoTransmitOutgoing(true);
+ my_cfg.accCfg.getVideoConfig().setAutoShowIncoming(true);
+
+ MyAccount acc = addAcc(my_cfg.accCfg);
+ if (acc == null)
+ continue;
+
+ /* Add Buddies */
+ for (int j = 0; j < my_cfg.buddyCfgs.size(); j++) {
+ BuddyConfig bud_cfg = my_cfg.buddyCfgs.get(j);
+ acc.addBuddy(bud_cfg);
+ }
+ }
+
+ /* Start. */
+ try {
+ ep.libStart();
+ } catch (Exception e) {
+ return;
+ }
+ }
+
+ public MyAccount addAcc(AccountConfig cfg)
+ {
+ MyAccount acc = new MyAccount(cfg);
+ try {
+ acc.create(cfg);
+ } catch (Exception e) {
+ acc = null;
+ return null;
+ }
+
+ accList.add(acc);
+ return acc;
+ }
+
+ public void delAcc(MyAccount acc)
+ {
+ accList.remove(acc);
+ }
+
+ private void loadConfig(String filename)
+ {
+ JsonDocument json = new JsonDocument();
+
+ try {
+ /* Load file */
+ json.loadFile(filename);
+ ContainerNode root = json.getRootContainer();
+
+ /* Read endpoint config */
+ epConfig.readObject(root);
+
+ /* Read transport config */
+ ContainerNode tp_node = root.readContainer("SipTransport");
+ sipTpConfig.readObject(tp_node);
+
+ /* Read account configs */
+ accCfgs.clear();
+ ContainerNode accs_node = root.readArray("accounts");
+ while (accs_node.hasUnread()) {
+ MyAccountConfig acc_cfg = new MyAccountConfig();
+ acc_cfg.readObject(accs_node);
+ accCfgs.add(acc_cfg);
+ }
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+
+ /* Force delete json now, as I found that Java somehow destroys it
+ * after lib has been destroyed and from non-registered thread.
+ */
+ json.delete();
+ }
+
+ private void buildAccConfigs()
+ {
+ /* Sync accCfgs from accList */
+ accCfgs.clear();
+ for (int i = 0; i < accList.size(); i++) {
+ MyAccount acc = accList.get(i);
+ MyAccountConfig my_acc_cfg = new MyAccountConfig();
+ my_acc_cfg.accCfg = acc.cfg;
+
+ my_acc_cfg.buddyCfgs.clear();
+ for (int j = 0; j < acc.buddyList.size(); j++) {
+ MyBuddy bud = acc.buddyList.get(j);
+ my_acc_cfg.buddyCfgs.add(bud.cfg);
+ }
+
+ accCfgs.add(my_acc_cfg);
+ }
+ }
+
+ private void saveConfig(String filename)
+ {
+ JsonDocument json = new JsonDocument();
+
+ try {
+ /* Write endpoint config */
+ json.writeObject(epConfig);
+
+ /* Write transport config */
+ ContainerNode tp_node = json.writeNewContainer("SipTransport");
+ sipTpConfig.writeObject(tp_node);
+
+ /* Write account configs */
+ buildAccConfigs();
+ ContainerNode accs_node = json.writeNewArray("accounts");
+ for (int i = 0; i < accCfgs.size(); i++) {
+ accCfgs.get(i).writeObject(accs_node);
+ }
+
+ /* Save file */
+ json.saveFile(filename);
+ } catch (Exception e) {}
+
+ /* Force delete json now, as I found that Java somehow destroys it
+ * after lib has been destroyed and from non-registered thread.
+ */
+ json.delete();
+ }
+
+ public void deinit()
+ {
+ String configPath = appDir + "/" + configName;
+ saveConfig(configPath);
+
+ /* Try force GC to avoid late destroy of PJ objects as they should be
+ * deleted before lib is destroyed.
+ */
+ Runtime.getRuntime().gc();
+
+ /* Shutdown pjsua. Note that Endpoint destructor will also invoke
+ * libDestroy(), so this will be a test of double libDestroy().
+ */
+ try {
+ ep.libDestroy();
+ } catch (Exception e) {}
+
+ /* Force delete Endpoint here, to avoid deletion from a non-
+ * registered thread (by GC?).
+ */
+ ep.delete();
+ ep = null;
+ }
+}
diff --git a/pjsip-apps/src/swig/java/android/res/drawable-hdpi/ic_launcher.png b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex 288b6655..288b6655 100644 --- a/pjsip-apps/src/swig/java/android/res/drawable-hdpi/ic_launcher.png +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/pjsip-apps/src/swig/java/android/res/drawable-mdpi/ic_launcher.png b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 6ae570b4..6ae570b4 100644 --- a/pjsip-apps/src/swig/java/android/res/drawable-mdpi/ic_launcher.png +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/pjsip-apps/src/swig/java/android/res/drawable-xhdpi/ic_launcher.png b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex d4fb7cd9..d4fb7cd9 100644 --- a/pjsip-apps/src/swig/java/android/res/drawable-xhdpi/ic_launcher.png +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/pjsip-apps/src/swig/java/android/res/drawable-xxhdpi/ic_launcher.png b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex 85a60815..85a60815 100644 --- a/pjsip-apps/src/swig/java/android/res/drawable-xxhdpi/ic_launcher.png +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/pjsip-apps/src/swig/java/android/res/drawable/bkg.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable/bkg.xml index f5052332..e9676f5f 100644 --- a/pjsip-apps/src/swig/java/android/res/drawable/bkg.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/drawable/bkg.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/pressed_color" />
<item android:drawable="@color/default_color" />
diff --git a/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/activity_call.xml index 17acf1c5..17acf1c5 100644 --- a/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/activity_call.xml diff --git a/pjsip-apps/src/swig/java/android/res/layout/activity_main.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/activity_main.xml index c63c0210..c63c0210 100644 --- a/pjsip-apps/src/swig/java/android/res/layout/activity_main.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/activity_main.xml diff --git a/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/dlg_account_config.xml index 6e64ea9e..6e64ea9e 100644 --- a/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/dlg_account_config.xml diff --git a/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/dlg_add_buddy.xml index 86617fcc..86617fcc 100644 --- a/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/layout/dlg_add_buddy.xml diff --git a/pjsip-apps/src/swig/java/android/res/menu/call.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/menu/call.xml index d122a4b7..d122a4b7 100644 --- a/pjsip-apps/src/swig/java/android/res/menu/call.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/menu/call.xml diff --git a/pjsip-apps/src/swig/java/android/res/menu/main.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/menu/main.xml index be94829a..be94829a 100644 --- a/pjsip-apps/src/swig/java/android/res/menu/main.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/menu/main.xml diff --git a/pjsip-apps/src/swig/java/android/res/values-sw600dp/dimens.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values-sw600dp/dimens.xml index c876987e..c876987e 100644 --- a/pjsip-apps/src/swig/java/android/res/values-sw600dp/dimens.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values-sw600dp/dimens.xml diff --git a/pjsip-apps/src/swig/java/android/res/values-sw720dp-land/dimens.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values-sw720dp-land/dimens.xml index 0df30679..0df30679 100644 --- a/pjsip-apps/src/swig/java/android/res/values-sw720dp-land/dimens.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/pjsip-apps/src/swig/java/android/res/values-v11/styles.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values-v11/styles.xml index e3ef53d9..e3ef53d9 100644 --- a/pjsip-apps/src/swig/java/android/res/values-v11/styles.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values-v11/styles.xml diff --git a/pjsip-apps/src/swig/java/android/res/values-v14/styles.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values-v14/styles.xml index 94dd245c..94dd245c 100644 --- a/pjsip-apps/src/swig/java/android/res/values-v14/styles.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values-v14/styles.xml diff --git a/pjsip-apps/src/swig/java/android/res/values/colors.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values/colors.xml index 9ce61cf2..9ce61cf2 100644 --- a/pjsip-apps/src/swig/java/android/res/values/colors.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values/colors.xml diff --git a/pjsip-apps/src/swig/java/android/res/values/dimens.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values/dimens.xml index 2e0e2ae4..2e0e2ae4 100644 --- a/pjsip-apps/src/swig/java/android/res/values/dimens.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values/dimens.xml diff --git a/pjsip-apps/src/swig/java/android/res/values/strings.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values/strings.xml index cce48a16..cce48a16 100644 --- a/pjsip-apps/src/swig/java/android/res/values/strings.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values/strings.xml diff --git a/pjsip-apps/src/swig/java/android/res/values/styles.xml b/pjsip-apps/src/swig/java/android/app/src/main/res/values/styles.xml index 4ea93266..4ea93266 100644 --- a/pjsip-apps/src/swig/java/android/res/values/styles.xml +++ b/pjsip-apps/src/swig/java/android/app/src/main/res/values/styles.xml diff --git a/pjsip-apps/src/swig/java/android/build.gradle b/pjsip-apps/src/swig/java/android/build.gradle new file mode 100644 index 00000000..88c89a9a --- /dev/null +++ b/pjsip-apps/src/swig/java/android/build.gradle @@ -0,0 +1,15 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.2.3'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
diff --git a/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.jar b/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 00000000..13372aef --- /dev/null +++ b/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.jar diff --git a/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties b/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..04e285f3 --- /dev/null +++ b/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/pjsip-apps/src/swig/java/android/gradlew b/pjsip-apps/src/swig/java/android/gradlew new file mode 100644 index 00000000..9d82f789 --- /dev/null +++ b/pjsip-apps/src/swig/java/android/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/pjsip-apps/src/swig/java/android/gradlew.bat b/pjsip-apps/src/swig/java/android/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/pjsip-apps/src/swig/java/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pjsip-apps/src/swig/java/android/ic_launcher-web.png b/pjsip-apps/src/swig/java/android/ic_launcher-web.png Binary files differdeleted file mode 100644 index a18cbb48..00000000 --- a/pjsip-apps/src/swig/java/android/ic_launcher-web.png +++ /dev/null diff --git a/pjsip-apps/src/swig/java/android/jni/Android.mk b/pjsip-apps/src/swig/java/android/jni/Android.mk deleted file mode 100644 index 2dbc574c..00000000 --- a/pjsip-apps/src/swig/java/android/jni/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -include ../../../../../build.mak - -LOCAL_PATH := $(PJDIR)/pjsip-apps/src/swig/java/android -include $(CLEAR_VARS) - -LOCAL_MODULE := libpjsua2 -LOCAL_CFLAGS := $(APP_CXXFLAGS) -frtti -fexceptions -LOCAL_LDFLAGS := $(APP_LDXXFLAGS) -LOCAL_LDLIBS := $(APP_LDXXLIBS) -#LOCAL_SHARED_LIBRARIES := $(APP_LDXXLIBS) -LOCAL_SRC_FILES := ../output/pjsua2_wrap.cpp - -include $(BUILD_SHARED_LIBRARY) diff --git a/pjsip-apps/src/swig/java/android/jni/Application.mk b/pjsip-apps/src/swig/java/android/jni/Application.mk deleted file mode 100644 index 255f6e91..00000000 --- a/pjsip-apps/src/swig/java/android/jni/Application.mk +++ /dev/null @@ -1,2 +0,0 @@ -APP_STL := gnustl_static -APP_PLATFORM := android-11 diff --git a/pjsip-apps/src/swig/java/android/proguard-project.txt b/pjsip-apps/src/swig/java/android/proguard-project.txt deleted file mode 100644 index f2fe1559..00000000 --- a/pjsip-apps/src/swig/java/android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/pjsip-apps/src/swig/java/android/project.properties b/pjsip-apps/src/swig/java/android/project.properties deleted file mode 100644 index 0840b4a0..00000000 --- a/pjsip-apps/src/swig/java/android/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-15 diff --git a/pjsip-apps/src/swig/java/android/settings.gradle b/pjsip-apps/src/swig/java/android/settings.gradle new file mode 100644 index 00000000..d3db1092 --- /dev/null +++ b/pjsip-apps/src/swig/java/android/settings.gradle @@ -0,0 +1 @@ +include ':app'
|
