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

Show error message only once - if the error is not handled, simply show "Unknown error: {error_reason}"

Browse source 
Revert "Display a toast in case of call error"

This reverts commit 63198bc591.

Conflicts:
	src/org/linphone/LinphoneManager.java
This commit is contained in:
Gautier Pelloux-Prayer 2015-02-23 16:39:07 +01:00
parent da1d109458
commit 36c23ce372
3 changed files with 46 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/strings.xml
View file

@ -367,6 +367,7 @@
<string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string> <string name="pref_sipinfo_dtmf">Send SIP INFO DTMFs</string>
<string name="pref_voice_mail">Voice mail uri</string> <string name="pref_voice_mail">Voice mail uri</string>
<string name="voicemail_unread"> unread messages</string> <string name="voicemail_unread"> unread messages</string>
<string name="error_unknown">Unknown error</string>
<string name="error_call_declined">Call declined</string> <string name="error_call_declined">Call declined</string>
<string name="error_user_not_found">User not found</string> <string name="error_user_not_found">User not found</string>
<string name="error_incompatible_media">Incompatible media parameters</string> <string name="error_incompatible_media">Incompatible media parameters</string>

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

@ -131,7 +131,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} else if (!isTablet() && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) { } else if (!isTablet() && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
} }
if (!LinphoneManager.isInstanciated()) { if (!LinphoneManager.isInstanciated()) {
Log.e("No service running: avoid crash by starting the launcher", this.getClass().getName()); Log.e("No service running: avoid crash by starting the launcher", this.getClass().getName());
// super.onCreate called earlier // super.onCreate called earlier
@ -139,7 +139,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
startActivity(getIntent().setClass(this, LinphoneLauncherActivity.class)); startActivity(getIntent().setClass(this, LinphoneLauncherActivity.class));
return; return;
} }
boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_wizard_at_first_start); boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_wizard_at_first_start);
if (LinphonePreferences.instance().isProvisioningLoginViewEnabled()) { if (LinphonePreferences.instance().isProvisioningLoginViewEnabled()) {
Intent wizard = new Intent(); Intent wizard = new Intent();
@ -169,7 +169,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
selectMenu(FragmentsAvailable.DIALER); selectMenu(FragmentsAvailable.DIALER);
} }
} }
mListener = new LinphoneCoreListenerBase(){ mListener = new LinphoneCoreListenerBase(){
@Override @Override
public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) { public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) {
@ -178,10 +178,10 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
((ChatListFragment) messageListFragment).refresh(); ((ChatListFragment) messageListFragment).refresh();
} }
} }
@Override @Override
public void registrationState(LinphoneCore lc, LinphoneProxyConfig proxy, LinphoneCore.RegistrationState state, String smessage) { public void registrationState(LinphoneCore lc, LinphoneProxyConfig proxy, LinphoneCore.RegistrationState state, String smessage) {
if (state.equals(RegistrationState.RegistrationCleared)) { if (state.equals(RegistrationState.RegistrationCleared)) {
if (lc != null) { if (lc != null) {
LinphoneAuthInfo authInfo = lc.findAuthInfo(proxy.getIdentity(), proxy.getRealm(), proxy.getDomain()); LinphoneAuthInfo authInfo = lc.findAuthInfo(proxy.getIdentity(), proxy.getRealm(), proxy.getDomain());
if (authInfo != null) if (authInfo != null)
@ -189,7 +189,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
} }
} }
@Override @Override
public void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message) { public void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message) {
if (state == State.IncomingReceived) { if (state == State.IncomingReceived) {
@ -202,12 +202,14 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
} else if (state == State.CallEnd || state == State.Error || state == State.CallReleased) { } else if (state == State.CallEnd || state == State.Error || state == State.CallReleased) {
// Convert LinphoneCore message for internalization // Convert LinphoneCore message for internalization
if (message != null && message.equals("Call declined.")) { if (message != null && message.equals("Call declined.")) {
displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_LONG); displayCustomToast(getString(R.string.error_call_declined), Toast.LENGTH_LONG);
} else if (message != null && message.equals("Not Found")) { } else if (message != null && message.equals("Not Found")) {
displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_LONG); displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_LONG);
} else if (message != null && message.equals("Unsupported media type")) { } else if (message != null && message.equals("Unsupported media type")) {
displayCustomToast(getString(R.string.error_incompatible_media), Toast.LENGTH_LONG); displayCustomToast(getString(R.string.error_incompatible_media), Toast.LENGTH_LONG);
} else if (message != null && state == State.Error) {
displayCustomToast(getString(R.string.error_unknown) + " - " + message, Toast.LENGTH_LONG);
} }
resetClassicMenuLayoutAndGoBackToCallIfStillRunning(); resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
} }
@ -216,7 +218,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
displayMissedCalls(missedCalls); displayMissedCalls(missedCalls);
} }
}; };
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc != null) { if (lc != null) {
lc.addListener(mListener); lc.addListener(mListener);
@ -281,7 +283,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
missedCalls = (TextView) findViewById(R.id.missedCalls); missedCalls = (TextView) findViewById(R.id.missedCalls);
missedChats = (TextView) findViewById(R.id.missedChats); missedChats = (TextView) findViewById(R.id.missedChats);
} }
private boolean isTablet() { private boolean isTablet() {
return getResources().getBoolean(R.bool.isTablet); return getResources().getBoolean(R.bool.isTablet);
} }
@ -290,7 +292,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
if (isTablet()) { if (isTablet()) {
return; return;
} }
findViewById(R.id.status).setVisibility(View.GONE); findViewById(R.id.status).setVisibility(View.GONE);
findViewById(R.id.fragmentContainer).setPadding(0, 0, 0, 0); findViewById(R.id.fragmentContainer).setPadding(0, 0, 0, 0);
} }
@ -299,7 +301,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
if (isTablet()) { if (isTablet()) {
return; return;
} }
if (statusFragment != null && !statusFragment.isVisible()) { if (statusFragment != null && !statusFragment.isVisible()) {
// Hack to ensure statusFragment is visible after coming back to // Hack to ensure statusFragment is visible after coming back to
// dialer from chat // dialer from chat
@ -426,7 +428,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
R.anim.slide_out_right_to_left); R.anim.slide_out_right_to_left);
} }
} }
if (newFragmentType != FragmentsAvailable.DIALER if (newFragmentType != FragmentsAvailable.DIALER
|| newFragmentType != FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT || newFragmentType != FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT
|| newFragmentType != FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS || newFragmentType != FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS
@ -459,21 +461,21 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) { if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) {
ll.setVisibility(View.VISIBLE); ll.setVisibility(View.VISIBLE);
transaction.addToBackStack(newFragmentType.toString()); transaction.addToBackStack(newFragmentType.toString());
transaction.replace(R.id.fragmentContainer2, newFragment); transaction.replace(R.id.fragmentContainer2, newFragment);
} else { } else {
if (newFragmentType == FragmentsAvailable.DIALER if (newFragmentType == FragmentsAvailable.DIALER
|| newFragmentType == FragmentsAvailable.ABOUT || newFragmentType == FragmentsAvailable.ABOUT
|| newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT || newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT
|| newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS || newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS
|| newFragmentType == FragmentsAvailable.SETTINGS || newFragmentType == FragmentsAvailable.SETTINGS
|| newFragmentType == FragmentsAvailable.ACCOUNT_SETTINGS) { || newFragmentType == FragmentsAvailable.ACCOUNT_SETTINGS) {
ll.setVisibility(View.GONE); ll.setVisibility(View.GONE);
} else { } else {
ll.setVisibility(View.INVISIBLE); ll.setVisibility(View.INVISIBLE);
} }
if (!withoutAnimation && !isAnimationDisabled && currentFragment.shouldAnimate()) { if (!withoutAnimation && !isAnimationDisabled && currentFragment.shouldAnimate()) {
if (newFragmentType.isRightOf(currentFragment)) { if (newFragmentType.isRightOf(currentFragment)) {
transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right); transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
@ -486,12 +488,12 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
transaction.commitAllowingStateLoss(); transaction.commitAllowingStateLoss();
getSupportFragmentManager().executePendingTransactions(); getSupportFragmentManager().executePendingTransactions();
currentFragment = newFragmentType; currentFragment = newFragmentType;
if (newFragmentType == FragmentsAvailable.DIALER if (newFragmentType == FragmentsAvailable.DIALER
|| newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT || newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT
|| newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS || newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS
|| newFragmentType == FragmentsAvailable.SETTINGS || newFragmentType == FragmentsAvailable.SETTINGS
|| newFragmentType == FragmentsAvailable.CONTACTS || newFragmentType == FragmentsAvailable.CONTACTS
|| newFragmentType == FragmentsAvailable.CHATLIST || newFragmentType == FragmentsAvailable.CHATLIST
|| newFragmentType == FragmentsAvailable.HISTORY) { || newFragmentType == FragmentsAvailable.HISTORY) {
@ -763,7 +765,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
getChatStorage().deleteDraft(sipUri); getChatStorage().deleteDraft(sipUri);
} }
public void updateMissedChatCount() { public void updateMissedChatCount() {
displayMissedChats(getChatStorage().getUnreadMessageCount()); displayMissedChats(getChatStorage().getUnreadMessageCount());
@ -839,7 +841,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
// extras.putString("DisplayName", name); // extras.putString("DisplayName", name);
// extras.putString("Photo", photo == null ? null : photo.toString()); // extras.putString("Photo", photo == null ? null : photo.toString());
// changeCurrentFragment(FragmentsAvailable.DIALER, extras); // changeCurrentFragment(FragmentsAvailable.DIALER, extras);
AddressType address = new AddressText(this, null); AddressType address = new AddressText(this, null);
address.setDisplayedName(name); address.setDisplayedName(name);
address.setText(number); address.setText(number);
@ -1047,7 +1049,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
} }
} }
public void removeContactFromLists(Contact contact) { public void removeContactFromLists(Contact contact) {
for (Contact c : contactList) { for (Contact c : contactList) {
if (c != null && c.getID().equals(contact.getID())) { if (c != null && c.getID().equals(contact.getID())) {
@ -1056,7 +1058,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
break; break;
} }
} }
for (Contact c : sipContactList) { for (Contact c : sipContactList) {
if (c != null && c.getID().equals(contact.getID())) { if (c != null && c.getID().equals(contact.getID())) {
sipContactList.remove(c); sipContactList.remove(c);
@ -1085,7 +1087,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i); Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i);
if (contact == null) if (contact == null)
continue; continue;
contact.refresh(getContentResolver()); contact.refresh(getContentResolver());
if (!isContactPresenceDisabled) { if (!isContactPresenceDisabled) {
searchFriendAndAddToContact(contact); searchFriendAndAddToContact(contact);
@ -1098,7 +1100,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i); Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i);
if (contact == null) if (contact == null)
continue; continue;
for (Contact c : sipContactList) { for (Contact c : sipContactList) {
if (c != null && c.getID().equals(contact.getID())) { if (c != null && c.getID().equals(contact.getID())) {
contact = c; contact = c;
@ -1113,7 +1115,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
contactList = new ArrayList<Contact>(); contactList = new ArrayList<Contact>();
sipContactList = new ArrayList<Contact>(); sipContactList = new ArrayList<Contact>();
sipContactsHandler.start(); sipContactsHandler.start();
} }
@ -1148,7 +1150,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
public ChatStorage getChatStorage() { public ChatStorage getChatStorage() {
return ChatStorage.getInstance(); return ChatStorage.getInstance();
} }
public void addContact(String displayName, String sipUri) public void addContact(String displayName, String sipUri)
{ {
if (getResources().getBoolean(R.bool.use_android_native_contact_edit_interface)) { if (getResources().getBoolean(R.bool.use_android_native_contact_edit_interface)) {
@ -1160,7 +1162,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
changeCurrentFragment(FragmentsAvailable.EDIT_CONTACT, extras); changeCurrentFragment(FragmentsAvailable.EDIT_CONTACT, extras);
} }
} }
public void editContact(Contact contact) public void editContact(Contact contact)
{ {
if (getResources().getBoolean(R.bool.use_android_native_contact_edit_interface)) { if (getResources().getBoolean(R.bool.use_android_native_contact_edit_interface)) {
@ -1172,7 +1174,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
changeCurrentFragment(FragmentsAvailable.EDIT_CONTACT, extras); changeCurrentFragment(FragmentsAvailable.EDIT_CONTACT, extras);
} }
} }
public void editContact(Contact contact, String sipAddress) public void editContact(Contact contact, String sipAddress)
{ {
if (getResources().getBoolean(R.bool.use_android_native_contact_edit_interface)) { if (getResources().getBoolean(R.bool.use_android_native_contact_edit_interface)) {
@ -1213,17 +1215,17 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
} }
} }
@Override @Override
protected void onPause() { protected void onPause() {
getIntent().putExtra("PreviousActivity", 0); getIntent().putExtra("PreviousActivity", 0);
super.onPause(); super.onPause();
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (!LinphoneService.isReady()) { if (!LinphoneService.isReady()) {
startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class)); startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
} }
@ -1231,7 +1233,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
prepareContactsInBackground(); prepareContactsInBackground();
updateMissedChatCount(); updateMissedChatCount();
displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount()); displayMissedCalls(LinphoneManager.getLc().getMissedCallsCount());
LinphoneManager.getInstance().changeStatusToOnline(); LinphoneManager.getInstance().changeStatusToOnline();
@ -1243,7 +1245,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
if (callState == State.IncomingReceived) { if (callState == State.IncomingReceived) {
startActivity(new Intent(this, IncomingCallActivity.class)); startActivity(new Intent(this, IncomingCallActivity.class));
} else { } else {
if (call.getCurrentParamsCopy().getVideoEnabled()) { if (call.getCurrentParamsCopy().getVideoEnabled()) {
startVideoActivity(call); startVideoActivity(call);
} else { } else {
@ -1260,7 +1262,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
mOrientationHelper.disable(); mOrientationHelper.disable();
mOrientationHelper = null; mOrientationHelper = null;
} }
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc != null) { if (lc != null) {
lc.removeListener(mListener); lc.removeListener(mListener);
@ -1319,7 +1321,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
LinphoneCall calls[] = LinphoneManager.getLc().getCalls(); LinphoneCall calls[] = LinphoneManager.getLc().getCalls();
if (calls.length > 0) { if (calls.length > 0) {
LinphoneCall call = calls[0]; LinphoneCall call = calls[0];
if (call != null && call.getState() != LinphoneCall.State.IncomingReceived) { if (call != null && call.getState() != LinphoneCall.State.IncomingReceived) {
if (call.getCurrentParamsCopy().getVideoEnabled()) { if (call.getCurrentParamsCopy().getVideoEnabled()) {
startVideoActivity(call); startVideoActivity(call);
@ -1328,7 +1330,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
} }
} }
// If a call is ringing, start incomingcallactivity // If a call is ringing, start incomingcallactivity
Collection<LinphoneCall.State> incoming = new ArrayList<LinphoneCall.State>(); Collection<LinphoneCall.State> incoming = new ArrayList<LinphoneCall.State>();
incoming.add(LinphoneCall.State.IncomingReceived); incoming.add(LinphoneCall.State.IncomingReceived);

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

@ -848,11 +848,6 @@ public class LinphoneManager implements LinphoneCoreListener {
} }
} }
} }
// Give user some hint about the error...
if (state == State.Error && LinphoneActivity.isInstanciated() ) {
LinphoneActivity.instance().displayCustomToast("Call errored: " + message, Toast.LENGTH_LONG);
}
} }
if (state == State.CallEnd) { if (state == State.CallEnd) {
@ -1276,19 +1271,19 @@ public class LinphoneManager implements LinphoneCoreListener {
@Override @Override
public void uploadProgressIndication(LinphoneCore lc, int offset, int total) { public void uploadProgressIndication(LinphoneCore lc, int offset, int total) {
} }
@Override @Override
public void uploadStateChanged(LinphoneCore lc, public void uploadStateChanged(LinphoneCore lc,
LogCollectionUploadState state, String info) { LogCollectionUploadState state, String info) {
} }
@Override @Override
public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status, public void ecCalibrationStatus(LinphoneCore lc, EcCalibratorStatus status,
int delay_ms, Object data) { int delay_ms, Object data) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
} }