diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-02-05 09:32:57 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-02-05 09:32:57 +0000 |
| commit | d35a7343da4e635318367ec3b1dd39ed4d1ca6f2 (patch) | |
| tree | 17890a2fd06c110b67d947872bd24c855a78103b | |
| parent | be3c7aec0313fc7219d3d54dd968ffc4a2aa2692 (diff) | |
Re #1716, misc updates:
- always enable ICE+STUN
- UI: added textEmailAddress to SIP URI inputs
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4734 74dad513-b988-da41-8d7b-12977e46ad98
4 files changed, 13 insertions, 5 deletions
diff --git a/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml b/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml index 71111f14..6e64ea9e 100644 --- a/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml +++ b/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml @@ -15,13 +15,13 @@ <TableRow>
<TextView android:text="ID">
</TextView>
-
+
<EditText
android:id="@+id/editTextId"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:inputType="textUri" >
+ android:inputType="textUri|textEmailAddress" >
<requestFocus />
</EditText>
diff --git a/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml b/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml index f13e7005..86617fcc 100644 --- a/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml +++ b/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml @@ -7,11 +7,12 @@ <TableRow>
<TextView android:text="Buddy URI">
</TextView>
-
+
<EditText
android:id="@+id/editTextUri"
android:layout_weight="1"
- android:inputType="textUri" >
+ android:inputType="textUri|textEmailAddress" >
+
<requestFocus />
</EditText>
</TableRow>
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java index 47cf286d..d0ea68a7 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java +++ b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java @@ -96,6 +96,7 @@ public class MainActivity extends Activity implements Handler.Callback, MyAppObs if (app.accList.size() == 0) { accCfg = new AccountConfig(); accCfg.setIdUri("sip:localhost"); + accCfg.getNatConfig().setIceEnabled(true); account = app.addAcc(accCfg); } else { account = app.accList.get(0); @@ -295,6 +296,9 @@ public class MainActivity extends Activity implements Handler.Callback, MyAppObs proxies.add(proxy); } + /* Enable ICE */ + accCfg.getNatConfig().setIceEnabled(true); + /* Finally */ lastRegStatus = ""; try { diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java index 7d7ab5d4..24cea9b9 100644 --- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java +++ b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java @@ -280,7 +280,10 @@ class MyApp { /* Set ua config. */ UaConfig ua_cfg = epConfig.getUaConfig(); - ua_cfg.setUserAgent("Pjsua2And" + ep.libVersion().getFull()); + ua_cfg.setUserAgent("Pjsua2 Android " + ep.libVersion().getFull()); + StringVector stun_servers = new StringVector(); + stun_servers.add("stun.pjsip.org"); + ua_cfg.setStunServer(stun_servers); if (own_worker_thread) { ua_cfg.setThreadCnt(0); ua_cfg.setMainThreadOnly(true); |