diff options
author | Liong Sauw Ming <ming@teluu.com> | 2014-07-02 02:58:01 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2014-07-02 02:58:01 +0000 |
commit | 7fd83f380dfaf75f2d78bdb09c60c421c5552b3e (patch) | |
tree | 0d3af1f8d39bbe8465d90cabd610e0979719c363 /pjsip-apps/src | |
parent | 62c44dfdba4ae551cb9e167401b3b80cfeeaaa51 (diff) |
Re #1768: move access to MainActivity class from MyApp to avoid undefined symbol error when not compiling for Android app
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4866 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
-rw-r--r-- | pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java | 6 | ||||
-rw-r--r-- | pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java index a8d0db45..0146b09c 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java +++ b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java @@ -494,6 +494,12 @@ public class MainActivity extends Activity implements Handler.Callback, MyAppObs } 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 notifyBuddyState(MyBuddy buddy) { diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java index cb083ffc..92163a04 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java +++ b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java @@ -52,7 +52,6 @@ class MyCall extends Call { CallInfo ci = getInfo(); if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) { this.delete(); - MainActivity.currentCall = null; } } catch (Exception e) { return; |