From d14d6a33edf1e7360c289f9d59b047e6878a1579 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Thu, 3 Jul 2014 09:43:19 +0000 Subject: 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 --- .../swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java | 6 +++--- .../src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java | 2 +- 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) { -- cgit v1.2.3