Changeset 4284 for pjproject/branches/projects/android/pjsip-apps/src/apjsua

Timestamp:

Oct 18, 2012 8:36:13 AM (12 years ago)

Author:

ming

Message:

Re #1546: Fixed race condition in text i/o thread for apjsua

File:

• pjproject/branches/projects/android/pjsip-apps/src/apjsua/src/org/pjsip/pjsua/ApjsuaActivity.java (modified) (4 diffs)

pjproject/branches/projects/android/pjsip-apps/src/apjsua/src/org/pjsip/pjsua/ApjsuaActivity.java

@@ -22 +22 @@
 /* This class is for running pjsua in a secondary thread. */
 class PjsuaThread extends Thread {
-        public static Boolean finished;
+        public enum PjsuaState {
+                NULL, INITED, TERMINATED
+        };
+        public static PjsuaState state;
         
         public void run() {
-                if (pjsua_app.initApp() != 0)
-                return;
+                if (pjsua_app.initApp() != 0) {
+                        state = PjsuaState.TERMINATED;
+                        return;
+                }
+                state = PjsuaState.INITED;
                 
         pjsua_app.startPjsua(ApjsuaActivity.CFG_FNAME);
-        finished = true;
+        state = PjsuaState.TERMINATED;
+        
+        try {
+                Thread.sleep(200);
+        } catch(Exception e) {
+        }
         pjsua_app.deinitApp();
         }
@@ -42 +53 @@
         
         protected Void doInBackground(Void... args) {
-                while (!PjsuaThread.finished) {
-                        publishProgress(pjsua_app.getMessage());
+                while (PjsuaThread.state != PjsuaThread.PjsuaState.TERMINATED) {
+                        if (PjsuaThread.state == PjsuaThread.PjsuaState.INITED)
+                                publishProgress(pjsua_app.getMessage());
                 }
                 return null;
@@ -116 +128 @@
                                 (keyCode == KeyEvent.KEYCODE_ENTER))
                         {
-                                pjsua_app.setInput(cmd.getText().toString());
+                                if (PjsuaThread.state == PjsuaThread.PjsuaState.INITED)
+                                        pjsua_app.setInput(cmd.getText().toString());
                                 cmd.setText("");
                                 return true;
@@ -136 +149 @@
         
         /* Create pjsua and output thread */
-        PjsuaThread.finished = false;
+        PjsuaThread.state = PjsuaThread.PjsuaState.NULL;
         TextOutTask outTask = new TextOutTask();
         outTask.tv = tv;