From 621eb9f5ece525cea02c2d5363b39bd9e012c5ea Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 29 May 2013 11:03:01 +0200 Subject: [PATCH] Fix some issues --- Makefile | 2 +- src/org/linphone/CallManager.java | 2 +- src/org/linphone/ChatStorage.java | 11 +++++++++-- src/org/linphone/ContactFragment.java | 23 +++++++++++++---------- src/org/linphone/LinphoneActivity.java | 4 ++-- src/org/linphone/LinphoneManager.java | 4 ++-- src/org/linphone/LinphoneService.java | 2 +- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index be77fd9ee..2784a9f26 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ run-tests: $(SDK_PATH)/android update test-project --path . -m ../ && \ ant debug && \ ant installd && \ - ant test + adb shell am instrument -w -e size small org.linphone.test/android.test.InstrumentationTestRunner clean: $(NDK_PATH)/ndk-build $(NDK_BUILD_OPTIONS) clean diff --git a/src/org/linphone/CallManager.java b/src/org/linphone/CallManager.java index 9009a24d4..319b238fa 100644 --- a/src/org/linphone/CallManager.java +++ b/src/org/linphone/CallManager.java @@ -49,7 +49,7 @@ public class CallManager { - void inviteAddress(LinphoneAddress lAddress, boolean videoEnabled, boolean lowBandwidth) throws LinphoneCoreException { + public void inviteAddress(LinphoneAddress lAddress, boolean videoEnabled, boolean lowBandwidth) throws LinphoneCoreException { LinphoneCore lc = LinphoneManager.getLc(); LinphoneCallParams params = lc.createDefaultCallParameters(); diff --git a/src/org/linphone/ChatStorage.java b/src/org/linphone/ChatStorage.java index b082d43b5..aff4fc8bb 100644 --- a/src/org/linphone/ChatStorage.java +++ b/src/org/linphone/ChatStorage.java @@ -253,11 +253,18 @@ public class ChatStorage { } public int getUnreadMessageCount() { - return db.query(TABLE_NAME, null, "read LIKE " + NOT_READ, null, null, null, null).getCount(); + Cursor c = db.query(TABLE_NAME, null, "read LIKE " + NOT_READ, null, null, null, null); + int count = c.getCount(); + c.close(); + return count; + } public int getUnreadMessageCount(String contact) { - return db.query(TABLE_NAME, null, "remoteContact LIKE \"" + contact + "\" AND read LIKE " + NOT_READ, null, null, null, null).getCount(); + Cursor c = db.query(TABLE_NAME, null, "remoteContact LIKE \"" + contact + "\" AND read LIKE " + NOT_READ, null, null, null, null); + int count = c.getCount(); + c.close(); + return count; } public byte[] getRawImageFromMessage(int id) { diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java index d42603fcb..a8d341709 100644 --- a/src/org/linphone/ContactFragment.java +++ b/src/org/linphone/ContactFragment.java @@ -101,7 +101,7 @@ public class ContactFragment extends Fragment implements OnClickListener { String displayednumberOrAddress = numberOrAddress; if (numberOrAddress.startsWith("sip:")) { - displayednumberOrAddress = displayednumberOrAddress.substring(4); + displayednumberOrAddress = displayednumberOrAddress.replace("sip:", ""); } TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress); @@ -116,16 +116,19 @@ public class ContactFragment extends Fragment implements OnClickListener { } v.findViewById(R.id.chat).setOnClickListener(chatListener); - if (LinphoneUtils.isSipAddress(numberOrAddress)) { - v.findViewById(R.id.chat).setTag(numberOrAddress); - } else { - LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig(); - if (lpc != null) { - if (!numberOrAddress.startsWith("sip:")) { - numberOrAddress = "sip:" + numberOrAddress; - } - v.findViewById(R.id.chat).setTag(numberOrAddress + "@" + lpc.getDomain()); + LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig(); + if (lpc != null) { + if (!displayednumberOrAddress.startsWith("sip:")) { + numberOrAddress = "sip:" + displayednumberOrAddress; } + + String tag = numberOrAddress; + if (!numberOrAddress.contains("@")) { + tag = numberOrAddress + "@" + lpc.getDomain(); + } + v.findViewById(R.id.chat).setTag(tag); + } else { + v.findViewById(R.id.chat).setTag(numberOrAddress); } final String finalNumberOrAddress = numberOrAddress; diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 24ce0dbc9..d216aaf22 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -157,7 +157,7 @@ public class LinphoneActivity extends FragmentActivity implements if (findViewById(R.id.fragmentContainer) != null) { dialerFragment = new DialerFragment(); dialerFragment.setArguments(getIntent().getExtras()); - getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, dialerFragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, dialerFragment, currentFragment.toString()).commit(); selectMenu(FragmentsAvailable.DIALER); } } @@ -367,7 +367,7 @@ public class LinphoneActivity extends FragmentActivity implements } transaction.addToBackStack(newFragmentType.toString()); - transaction.replace(R.id.fragmentContainer, newFragment); + transaction.replace(R.id.fragmentContainer, newFragment, newFragmentType.toString()); transaction.commitAllowingStateLoss(); getSupportFragmentManager().executePendingTransactions(); diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 135d865c3..b9ce0b14c 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -133,7 +133,7 @@ import android.widget.Toast; * @author Guillaume Beraudo * */ -public final class LinphoneManager implements LinphoneCoreListener { +public class LinphoneManager implements LinphoneCoreListener { private static LinphoneManager instance; private Context mServiceContext; @@ -171,7 +171,7 @@ public final class LinphoneManager implements LinphoneCoreListener { simpleListeners.remove(listener); } - private LinphoneManager(final Context c, LinphoneServiceListener listener) { + protected LinphoneManager(final Context c, LinphoneServiceListener listener) { sExited=false; mServiceContext = c; mListenerDispatcher = new ListenerDispatcher(listener); diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 257ea0b35..e1a151f44 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -80,7 +80,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis * setLatestEventInfo and startActivity() which needs a context. */ - private Handler mHandler = new Handler(); + public Handler mHandler = new Handler(); private static LinphoneService instance; // private boolean mTestDelayElapsed; // add a timer for testing