Changeset 4697 for pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.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/MainActivity.java (modified) (4 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);

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