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

Timestamp:

Dec 18, 2013 11:42:04 AM (11 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)
• AndroidManifest.xml (modified) (1 prop)
• jni (added)
• jni/Android.mk (added)
• jni/Application.mk (added)
• libs/armeabi (modified) (1 prop)
• project.properties (modified) (1 prop)
• src/org/pjsip/pjsua2/app/MainActivity.java (modified) (4 diffs)
• 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/MainActivity.java

@@ -26 +26 @@
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -83 +84 @@
                 if (app == null) {
                         app = new MyApp();
+                        /* Wait for GDB to init */
+                        if ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
+                                try {
+                                        Thread.sleep(5000);
+                                } catch (InterruptedException e) {}
+                        }
+                        
                     app.init(this, getFilesDir().getAbsolutePath());
                 }
@@ -128 +136 @@
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
-                CharSequence str = item.getTitle();
                 switch (item.getItemId()) {
                 case R.id.action_acc_config:
@@ -368 +375 @@
                                                 buddyListSelectedIdx = -1;
                                 } else {
-                                        if (old_cfg.getUri() != cfg.getUri()) {
+                                        if (!old_cfg.getUri().equals(cfg.getUri())) {
                                                 account.delBuddy(buddyListSelectedIdx);
                                                 account.addBuddy(cfg);

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