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

Fixes in setup

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-21 11:59:50 +01:00
parent ce887b3ef0
commit c97c24b5f6
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import java.net.URL; import java.net.URL;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.LinphoneService;
import org.linphone.LinphoneManager.EcCalibrationListener; import org.linphone.LinphoneManager.EcCalibrationListener;
import org.linphone.R; import org.linphone.R;
import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.EcCalibratorStatus;
@ -33,6 +34,7 @@ import de.timroes.axmlrpc.XMLRPCClient;
import de.timroes.axmlrpc.XMLRPCException; import de.timroes.axmlrpc.XMLRPCException;
import de.timroes.axmlrpc.XMLRPCServerException; import de.timroes.axmlrpc.XMLRPCServerException;
import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -68,10 +70,13 @@ public class EchoCancellerCalibrationFragment extends Fragment implements EcCali
public void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs) { public void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SetupActivity.instance()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SetupActivity.instance());
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
Context context = SetupActivity.instance() == null ? LinphoneService.instance().getApplicationContext() : SetupActivity.instance();
if (status == EcCalibratorStatus.DoneNoEcho) { if (status == EcCalibratorStatus.DoneNoEcho) {
editor.putBoolean(getString(R.string.pref_echo_cancellation_key), false); editor.putBoolean(context.getString(R.string.pref_echo_cancellation_key), false);
} else if ((status == EcCalibratorStatus.Done) || (status == EcCalibratorStatus.Failed)) { } else if ((status == EcCalibratorStatus.Done) || (status == EcCalibratorStatus.Failed)) {
editor.putBoolean(getString(R.string.pref_echo_cancellation_key), true); editor.putBoolean(context.getString(R.string.pref_echo_cancellation_key), true);
} }
editor.commit(); editor.commit();
if (mSendEcCalibrationResult) { if (mSendEcCalibrationResult) {

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

@ -218,6 +218,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
public void saveCreatedAccount(String username, String password, String domain) { public void saveCreatedAccount(String username, String password, String domain) {
int newAccountId = mPref.getInt(getString(R.string.pref_extra_accounts), 0); int newAccountId = mPref.getInt(getString(R.string.pref_extra_accounts), 0);
if (newAccountId == -1)
newAccountId = 0;
writePreference(R.string.pref_extra_accounts, newAccountId+1); writePreference(R.string.pref_extra_accounts, newAccountId+1);
if (newAccountId == 0) { if (newAccountId == 0) {