summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2014-07-03 09:43:19 +0000
committerBenny Prijono <bennylp@teluu.com>2014-07-03 09:43:19 +0000
commitd14d6a33edf1e7360c289f9d59b047e6878a1579 (patch)
treead60d45d5f0739849c245227c3b9cd3b40c7121d
parent0afb0fd54874856944a4df43f6242cbd46868999 (diff)
Misc re #1751: changing Android java's String.isEmpty() to String.length()==0 for better portability since the former is only available on API level 9
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4870 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java6
-rw-r--r--pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java2
2 files changed, 4 insertions, 4 deletions
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 0146b09c..3d16caff 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
@@ -243,7 +243,7 @@ public class MainActivity extends Activity implements Handler.Callback, MyAppObs
LayoutInflater li = LayoutInflater.from(this);
View view = li.inflate(R.layout.dlg_account_config, null);
- if (!lastRegStatus.isEmpty()) {
+ if (lastRegStatus.length()!=0) {
TextView tvInfo = (TextView)view.findViewById(R.id.textViewInfo);
tvInfo.setText("Last status: " + lastRegStatus);
}
@@ -288,12 +288,12 @@ public class MainActivity extends Activity implements Handler.Callback, MyAppObs
accCfg.getRegConfig().setRegistrarUri(registrar);
AuthCredInfoVector creds = accCfg.getSipConfig().getAuthCreds();
creds.clear();
- if (!username.isEmpty()) {
+ if (username.length() != 0) {
creds.add(new AuthCredInfo("Digest", "*", username, 0, password));
}
StringVector proxies = accCfg.getSipConfig().getProxies();
proxies.clear();
- if (!proxy.isEmpty()) {
+ if (proxy.length() != 0) {
proxies.add(proxy);
}
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 92163a04..9a5b2464 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
@@ -179,7 +179,7 @@ class MyBuddy extends Buddy {
if (bi.getSubState() == pjsip_evsub_state.PJSIP_EVSUB_STATE_ACTIVE) {
if (bi.getPresStatus().getStatus() == pjsua_buddy_status.PJSUA_BUDDY_STATUS_ONLINE) {
status = bi.getPresStatus().getStatusText();
- if (status == null || status.isEmpty()) {
+ if (status == null || status.length()==0) {
status = "Online";
}
} else if (bi.getPresStatus().getStatus() == pjsua_buddy_status.PJSUA_BUDDY_STATUS_OFFLINE) {