Changeset 5738 for pjproject/trunk/pjsip-apps/src/swig/java/sample2.java

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).

File:

• pjproject/trunk/pjsip-apps/src/swig/java/sample2.java (modified) (4 diffs)

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