Changeset 5738 for pjproject

Timestamp:

Feb 16, 2018 9:37:00 AM (7 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).

Location:

pjproject/trunk/pjsip-apps/src/swig/java

Files:

• android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java (modified) (2 diffs)
• android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java (modified) (1 diff)
• sample.java (modified) (4 diffs)
• sample2.java (modified) (4 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();
 

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

@@ -62 +62 @@
     public void onCallState(OnCallStateParam prm)
     {
-            MyApp.observer.notifyCallState(this);
-            try {
-                CallInfo ci = getInfo();
-                if (ci.getState() == 
-                    pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
-                {
-                    MyApp.ep.utilLogWrite(3, "MyCall", this.dump(true, ""));
-                    this.delete();
-                }
-            } catch (Exception e) {
-                return;
-            }
+        try {
+            CallInfo ci = getInfo();
+            if (ci.getState() == 
+                pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
+            {
+                MyApp.ep.utilLogWrite(3, "MyCall", this.dump(true, ""));
+            }
+        } catch (Exception e) {
+        }
+        
+        // Should not delete this call instance (self) in this context,
+        // so the observer should manage this call instance deletion
+        // out of this callback context.
+        MyApp.observer.notifyCallState(this);
     }
 

pjproject/trunk/pjsip-apps/src/swig/java/sample.java

@@ -26 +26 @@
 class MyObserver implements MyAppObserver {
         private static MyCall currentCall = null;
+        private boolean del_call_scheduled = false;
+        
+        public void check_call_deletion()
+        {
+                if (del_call_scheduled && currentCall != null) {
+                        currentCall.delete();
+                        currentCall = null;
+                        del_call_scheduled = false;
+                }
+        }
         
         @Override
@@ -58 +68 @@
                         ci = null;
                 }
-                if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
-                        currentCall = null;             
+                if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) {
+                        // Should not delete call instance in this context,
+                        // so let's just schedule it, the call will be deleted
+                        // in our main worker thread context.
+                        del_call_scheduled = true;
+                }
+                        
         }
         
@@ -86 +101 @@
 public class sample {
         private static MyApp app = new MyApp();
-        private static MyAppObserver observer = new MyObserver();
+        private static MyObserver observer = new MyObserver();
         private static MyAccount account = null;
         private static AccountConfig accCfg = null;             
@@ -142 +157 @@
 
                 while (!Thread.currentThread().isInterrupted()) {
+                        // Handle events
                         MyApp.ep.libHandleEvents(10);
+                        
+                        // Check if any call instance need to be deleted
+                        observer.check_call_deletion();
+                        
                         try {                                           
                                 Thread.currentThread().sleep(50);
                         } catch (InterruptedException ie) {                                             
                                 break;
-                        }                                       
+                        }                       
                 }
                 app.deinit();

pjproject/trunk/pjsip-apps/src/swig/java/sample2.java

@@ -34 +34 @@
 class MyObserver implements MyAppObserver {
         private static MyCall currentCall = null;
+        private static boolean del_call_scheduled = false;
+        
+        public void check_call_deletion()
+        {
+                if (del_call_scheduled && currentCall != null) {
+                        currentCall.delete();
+                        currentCall = null;
+                        del_call_scheduled = false;
+                }
+        }
         
         @Override
@@ -67 +77 @@
                 }
                 if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) {
-                        currentCall = null;                        
+                        // Should not delete call instance here, so let's schedule it.
+                        // The call will be deleted by our main worker thread.
+                        del_call_scheduled = true;                 
                 } else if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED) {
                         if (ci.getSetting().getVideoCount() != 0) {
@@ -89 +101 @@
 class MyThread extends Thread {
         private static MyApp app = new MyApp();
-        private static MyAppObserver observer = new MyObserver();
+        private static MyObserver observer = new MyObserver();
         private static MyAccount account = null;
         private static AccountConfig accCfg = null;                  
@@ -118 +130 @@
 
                 while (!Thread.currentThread().isInterrupted()) {
+                        // Handle events
                         MyApp.ep.libHandleEvents(10);
+
+                        // Check if any call instance need to be deleted
+                        observer.check_call_deletion();
                         try {
                                 Thread.currentThread().sleep(50);