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

When picking contact without phone go to dialer anyway.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-11-16 16:10:59 +01:00
parent ec3b407138
commit 7f9558567c
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/org/linphone/AbstractContactPickerActivity.java
View file

@ -122,6 +122,7 @@ public abstract class AbstractContactPickerActivity extends Activity implements
case 0: case 0:
String msg = String.format(getString(R.string.no_phone_numbers), contactName); String msg = String.format(getString(R.string.no_phone_numbers), contactName);
Toast.makeText(this, msg, Toast.LENGTH_LONG).show(); Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
((ContactPicked) getParent()).goToDialer();
break; break;
case 1: case 1:
returnSelectedValues(phones.get(0), contactName.toString(), getPhotoUri(id)); returnSelectedValues(phones.get(0), contactName.toString(), getPhotoUri(id));

14
src/org/linphone/LinphoneActivity.java
View file

@ -192,7 +192,7 @@ public class LinphoneActivity extends TabActivity implements
R.string.tab_contact, R.drawable.contact_orange); R.string.tab_contact, R.drawable.contact_orange);
gotToDialer(); selectDialerTab();
} }
@Override @Override
@ -202,7 +202,7 @@ public class LinphoneActivity extends TabActivity implements
Log.i("LinphoneActivity received an intent without data, recreating GUI if needed"); Log.i("LinphoneActivity received an intent without data, recreating GUI if needed");
if (!LinphoneManager.getLc().isIncall()) return; if (!LinphoneManager.getLc().isIncall()) return;
if(LinphoneManager.getLc().isInComingInvitePending()) { if(LinphoneManager.getLc().isInComingInvitePending()) {
gotToDialer(); selectDialerTab();
} else { } else {
startIncallActivity(); startIncallActivity();
} }
@ -413,10 +413,10 @@ public class LinphoneActivity extends TabActivity implements
public void setAddressAndGoToDialer(String number, String name, Uri photo) { public void setAddressAndGoToDialer(String number, String name, Uri photo) {
DialerActivity.instance().setContactAddress(number, name, photo); DialerActivity.instance().setContactAddress(number, name, photo);
instance.gotToDialer(); selectDialerTab();
} }
private void gotToDialer() { private void selectDialerTab() {
getTabHost().setCurrentTabByTag(DIALER_TAB); getTabHost().setCurrentTabByTag(DIALER_TAB);
} }
@ -585,8 +585,14 @@ public class LinphoneActivity extends TabActivity implements
// removing is done directly in LinphoneActivity.onPause() // removing is done directly in LinphoneActivity.onPause()
} }
} }
@Override
public void goToDialer() {
selectDialerTab();
}
} }
interface ContactPicked { interface ContactPicked {
void setAddressAndGoToDialer(String number, String name, Uri photo); void setAddressAndGoToDialer(String number, String name, Uri photo);
void goToDialer();
} }

11
src/org/linphone/UriPickerActivity.java
View file

@ -74,11 +74,11 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
R.string.tab_contact, R.drawable.contact_orange); R.string.tab_contact, R.drawable.contact_orange);
gotToDialer(); selectDialerTab();
} }
private void gotToDialer() { private void selectDialerTab() {
getTabHost().setCurrentTabByTag(DIALER_TAB); getTabHost().setCurrentTabByTag(DIALER_TAB);
} }
@ -158,7 +158,12 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
public void setAddressAndGoToDialer(String number, String name, Uri photo) { public void setAddressAndGoToDialer(String number, String name, Uri photo) {
DialerActivity dialer = (DialerActivity) getLocalActivityManager().getActivity(DIALER_TAB); DialerActivity dialer = (DialerActivity) getLocalActivityManager().getActivity(DIALER_TAB);
dialer.setContactAddress(number, name, photo); dialer.setContactAddress(number, name, photo);
gotToDialer(); selectDialerTab();
} }
@Override
public void goToDialer() {
selectDialerTab();
}
} }