Changeset 5863 for pjproject

Timestamp:

Aug 21, 2018 7:23:25 AM (6 years ago)

Author:

nanang

Message:

Misc (re #2059): Fixed crash in pjsua2 sample app (perhaps due to access to invalid MyCall? instance).

Location:

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

Files:

• CallActivity.java (modified) (1 diff)
• MainActivity.java (modified) (2 diffs)

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

@@ -329 +329 @@
         String call_state = "";
 
+        if (ci == null) {
+            buttonAccept.setVisibility(View.GONE);
+            buttonHangup.setText("OK");
+            tvState.setText("Call disconnected");
+            return;
+        }
+
         if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAC) {
             buttonAccept.setVisibility(View.GONE);

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) {
 
-            MyCall call = (MyCall) m.obj;
-            CallInfo ci;
-            try {
-                ci = call.getInfo();
-            } catch (Exception e) {
-                ci = null;
+            CallInfo ci = (CallInfo) m.obj;
+
+            if (currentCall == null || ci == null || ci.getId() != currentCall.getId()) {
+                System.out.println("Call state event received, but call info is invalid");
+                return true;
             }
 
             /* Forward the call info to CallActivity */
-            if (ci != null && CallActivity.handler_ != null) {
-                Message m2 = Message.obtain(CallActivity.handler_,
-                    MSG_TYPE.CALL_STATE, ci);
+            if (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();
+            if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
+            {
+                currentCall.delete();
+                currentCall = null;
             }
 
@@ -608 +606 @@
             return;
 
-        CallInfo ci;
+        CallInfo ci = null;
         try {
             ci = call.getInfo();
-        } catch (Exception e) {
-            ci = null;
-        }
-        Message m = Message.obtain(handler, MSG_TYPE.CALL_STATE, call);
+        } catch (Exception e) {}
+        
+        if (ci != null)
+            return;
+
+        Message m = Message.obtain(handler, MSG_TYPE.CALL_STATE, ci);
         m.sendToTarget();
-
-        if (ci != null &&
-            ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
-        {
-            currentCall = null;
-        }
     }