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

Fix crash text received

Browse source 
Change echo calibration wizard
This commit is contained in:
Margaux Clerc 2015-08-12 17:55:55 +02:00
parent a0738ca90d
commit 7d7b7b7139
6 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -92,8 +92,11 @@ public class ContactsManager {
initializeContactManager(context,contentResolver); initializeContactManager(context,contentResolver);
Account newAccount = new Account(context.getString(R.string.sync_account_name), context.getString(R.string.sync_account_type)); Account newAccount = new Account(context.getString(R.string.sync_account_name), context.getString(R.string.sync_account_type));
AccountManager accountManager = (AccountManager) context.getSystemService(context.ACCOUNT_SERVICE); AccountManager accountManager = (AccountManager) context.getSystemService(context.ACCOUNT_SERVICE);
accountManager.addAccountExplicitly(newAccount, null, null); if(accountManager.addAccountExplicitly(newAccount, null, null)){
mAccount = newAccount; mAccount = newAccount;
} else {
mAccount = null;
}
} }
public String getDisplayName(String firstName, String lastName) { public String getDisplayName(String firstName, String lastName) {

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

@ -800,11 +800,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) { public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {
} }
public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,
LinphoneAddress from, String message) {
//deprecated
}
@Override @Override
public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) { public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) {
Log.d("DTMF received: " + dtmf); Log.d("DTMF received: " + dtmf);

9
src/org/linphone/setup/EchoCancellerCalibrationFragment.java
View file

@ -81,8 +81,6 @@ public class EchoCancellerCalibrationFragment extends Fragment {
return view; return view;
} }
public void enableEcCalibrationResultSending(boolean enabled) { public void enableEcCalibrationResultSending(boolean enabled) {
mSendEcCalibrationResult = enabled; mSendEcCalibrationResult = enabled;
} }
@ -111,9 +109,10 @@ public class EchoCancellerCalibrationFragment extends Fragment {
} }
}; };
Log.i("Add echo canceller calibration result: manufacturer=" + Build.MANUFACTURER + " model=" + Build.MODEL + " status=" + status + " delay=" + delayMs + "ms"); Boolean hasBuiltInEchoCanceler = LinphoneManager.getLc().hasBuiltInEchoCanceler();
client.callAsync(listener, "add_ec_calibration_result", Build.MANUFACTURER, Build.MODEL, status.toString(), delayMs); Log.i("Add echo canceller calibration result: manufacturer=" + Build.MANUFACTURER + " model=" + Build.MODEL + " status=" + status + " delay=" + delayMs + "ms" + " hasBuiltInEchoCanceler " + hasBuiltInEchoCanceler);
} client.callAsync(listener, "add_ec_calibration_result", Build.MANUFACTURER, Build.MODEL, status.toString(), delayMs, hasBuiltInEchoCanceler);
}
catch(Exception ex) {} catch(Exception ex) {}
} }
} }

2
src/org/linphone/setup/SetupActivity.java
View file

@ -224,7 +224,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
cancel.setEnabled(false); cancel.setEnabled(false);
} else { } else {
if (mPrefs.isFirstLaunch()) { if (mPrefs.isFirstLaunch()) {
mPrefs.setEchoCancellation(LinphoneManager.getLc().needsEchoCanceler()); mPrefs.setEchoCancellation(LinphoneManager.getLc().hasBuiltInEchoCanceler());
} }
success(); success();
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 098ddaead686928c735c05c2c808600eef55ae0b Subproject commit 075f13f233c21caec79ca0e3ed3796f0e0082e4f

7
tests/src/org/linphone/test/LinphoneTestManager.java
View file

@ -338,13 +338,6 @@ public class LinphoneTestManager implements LinphoneCoreListener{
} }
@Override
public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,
LinphoneAddress from, String message) {
// TODO Auto-generated method stub
}
@Override @Override
public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr,
LinphoneChatMessage message) { LinphoneChatMessage message) {