Changeset 4697 for pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java

Timestamp:

Dec 18, 2013 11:42:04 AM (10 years ago)

Author:

nanang

Message:

Re #1716: Misc fixes/updates on Android app based on pjsua2+SWIG, e.g: fixed java string comparisons, added build config for ndk-build (for native debugging), updates on SVN props.

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android

Files:

• . (modified) (1 prop)
• src/org/pjsip/pjsua2/app/MyApp.java (modified) (5 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android

@@ -1 +1 @@
 bin
 gen
+obj
+.cproject

@@ -1 +1 @@
 bin
 gen
+obj
+.cproject

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

@@ -168 +168 @@
                         if (bi.getPresStatus().getStatus() == pjsua_buddy_status.PJSUA_BUDDY_STATUS_ONLINE) {
                                 status = bi.getPresStatus().getStatusText();
-                                if (status == null || status == "") {
+                                if (status == null || status.isEmpty()) {
                                         status = "Online";
                                 }
@@ -340 +340 @@
         public void delAcc(MyAccount acc) {
                 accList.remove(acc);
-                /* GC will delete the acc soon? */
         }
         
@@ -369 +368 @@
                         System.out.println(e);
                 }
+                
+                /* Suggest to delete, as we found this causes crash when the Java
+                 * deletes it later after lib has been destroyed.
+                 */
+                json.delete();
         }
 
@@ -410 +414 @@
                         json.saveFile(filename);
                 } catch (Exception e) {}
+
+                /* Suggest to delete, as we found this causes crash when the Java
+                 * deletes it later after lib has been destroyed.
+                 */
+                json.delete();
         }
         
@@ -415 +424 @@
                 String configPath = appDir + "/" + configName;
                 saveConfig(configPath);
+                
+                /* Try force GC to avoid late destroy of PJ objects as they should be
+                 * deleted before lib is destroyed.
+                 */
+                System.gc();
+                
                 try {
                         ep.libDestroy();

@@ -1 +1 @@
 bin
 gen
+obj
+.cproject