Changeset 5738 for pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java

Timestamp:

Feb 16, 2018 9:37:00 AM (6 years ago)

Author:

nanang

Message:

Misc (#2059): Update Android & Java app samples to avoid call instance deletion in the library callback context (thanks Kai Ludwig for the feedbacks).

File:

• pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java

@@ -233 +233 @@
         } else if (m.what == MSG_TYPE.CALL_STATE) {
 
-            CallInfo ci = (CallInfo) m.obj;
-
-            /* Forward the message to CallActivity */
-            if (CallActivity.handler_ != null) {
+            MyCall call = (MyCall) m.obj;
+            CallInfo ci;
+            try {
+                ci = call.getInfo();
+            } catch (Exception e) {
+                ci = null;
+            }
+
+            /* Forward the call info to CallActivity */
+            if (ci != null && CallActivity.handler_ != null) {
                 Message m2 = Message.obtain(CallActivity.handler_,
                     MSG_TYPE.CALL_STATE, ci);
                 m2.sendToTarget();
+            }
+
+            if (ci != null &&
+                ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
+            {
+                call.delete();
             }
 
@@ -602 +614 @@
             ci = null;
         }
-        Message m = Message.obtain(handler, MSG_TYPE.CALL_STATE, ci);
+        Message m = Message.obtain(handler, MSG_TYPE.CALL_STATE, call);
         m.sendToTarget();