Changeset 4840

Timestamp:

May 9, 2014 8:47:06 AM (11 years ago)

Author:

bennylp

Message:

Re #1768: Fixed problems with Java garbage collection on call and buddy object

Location:

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

Files:

• CallActivity.java (modified) (2 diffs)
• MainActivity.java (modified) (2 diffs)
• MyApp.java (modified) (3 diffs)

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

@@ -84 +84 @@
                                 System.out.println(e);
                         }
-
-                        MainActivity.currentCall = null;
                 }
         }
@@ -137 +135 @@
                                 buttonHangup.setText("OK");
                                 call_state = "Call disconnected: " + ci.getLastReason();
-                                MainActivity.currentCall = null;
                         }
                 }

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

@@ -173 +173 @@
                                 m2.sendToTarget();
                         }
-                        
-                        if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED)
-                                currentCall = null;
                         
                 } else if (m.what == MSG_TYPE.BUDDY_STATE) {
@@ -340 +337 @@
                         call.makeCall(buddy_uri, prm);
                 } catch (Exception e) {
-                        currentCall = null;
+                        call.delete();
                         return;
                 }

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

@@ -49 +49 @@
         public void onCallState(OnCallStateParam prm) {
                 MyApp.observer.notifyCallState(this);
+                try {
+                        CallInfo ci = getInfo();
+                        if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) {
+                                this.delete();
+                                MainActivity.currentCall = null;
+                        }
+                } catch (Exception e) {
+                        return;
+                }
         }
         
@@ -101 +110 @@
                         bud.create(this, bud_cfg);
                 } catch (Exception e) {
+                        bud.delete();
                         bud = null;
                 }
@@ -117 +127 @@
         public void delBuddy(MyBuddy buddy) {
                 buddyList.remove(buddy);
+                buddy.delete();
         }
         
         public void delBuddy(int index) {
+                MyBuddy bud = buddyList.get(index);
                 buddyList.remove(index);
+                bud.delete();
         }