Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated liblinphone + fix dialer address clear

Browse source
This commit is contained in:
Sylvain Berfini 2012-10-10 13:45:05 +02:00
parent 17093d9be5
commit e1aab3c954
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/org/linphone/DialerFragment.java
View file

@ -47,6 +47,7 @@ public class DialerFragment extends Fragment {
private CallButton mCall; private CallButton mCall;
private ImageView mAddContact; private ImageView mAddContact;
private OnClickListener addContactListener, cancelListener, transferListener; private OnClickListener addContactListener, cancelListener, transferListener;
private boolean shouldEmptyAddressField = true;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -108,6 +109,7 @@ public class DialerFragment extends Fragment {
resetLayout(isCallTransferOngoing); resetLayout(isCallTransferOngoing);
if (getArguments() != null) { if (getArguments() != null) {
shouldEmptyAddressField = false;
String number = getArguments().getString("SipUri"); String number = getArguments().getString("SipUri");
String displayName = getArguments().getString("DisplayName"); String displayName = getArguments().getString("DisplayName");
String photo = getArguments().getString("PhotoUri"); String photo = getArguments().getString("PhotoUri");
@ -145,7 +147,12 @@ public class DialerFragment extends Fragment {
LinphoneActivity.instance().selectMenu(FragmentsAvailable.DIALER); LinphoneActivity.instance().selectMenu(FragmentsAvailable.DIALER);
LinphoneActivity.instance().updateDialerFragment(this); LinphoneActivity.instance().updateDialerFragment(this);
} }
if (shouldEmptyAddressField) {
mAddress.setText(""); mAddress.setText("");
} else {
shouldEmptyAddressField = true;
}
resetLayout(isCallTransferOngoing); resetLayout(isCallTransferOngoing);
} }

1
src/org/linphone/core/LinphoneCallLogImpl.java
View file

@ -61,7 +61,6 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
public int getCallDuration() { public int getCallDuration() {
return getCallDuration(nativePtr); return getCallDuration(nativePtr);
} }
@Override
public int getCallId() { public int getCallId() {
return getCallId(nativePtr); return getCallId(nativePtr);
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 1cc0a418af4718014a614afdbe6f1cd7690a4ccf Subproject commit eb5ca31cfd8f7dbfde549a81455376b59ba121fe