Changeset 5738 for pjproject/trunk/pjsip-apps/src/swig/java/sample.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/sample.java (modified) (4 diffs)

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();