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

Add new ringtones and fix assistant keyboard

Browse source
This commit is contained in:
Margaux Clerc 2016-03-04 11:26:27 +01:00 committed by Jehan Monnier
parent 4e8da73745
commit 10f6c732d1
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/raw/toy_mono.wav
View file

Binary file not shown.

2
res/values-fi/strings.xml
View file

@ -42,7 +42,6 @@
<string name="decline">Hylkää</string>
<string name="conference">Kokous</string>
<!--Launch screen-->
<string name="app_description">ilmainen SIP VOIP pääteohjelma</string>
<!--Assistant-->
<string name="welcome">Tervetuloa</string>
<string name="assistant">Avustaja</string>
@ -74,7 +73,6 @@
<string name="wizard_username_unavailable">Tämä käyttäjätunnus on jo käytössä.</string>
<string name="wizard_username_incorrect">Sinun käyttäjätunnus ei ole kelvollinen.</string>
<string name="wizard_email_incorrect">Sähkpostisi ei ole kelvollinen.</string>
<string name="wizard_password_incorrect">Salasanasi ei ole kelvollinen.</string>
<string name="wizard_passwords_unmatched">Antamasi salasanat ovat erillaiset.</string>
<string name="setup_confirm_username">Sinun käyttäjätunnus tulee olemaan %s.\r\n\r\nIt voiden muuttua, jotta vaatiukset täyttyisivät .\r\nHyväksytkö?</string>
<string name="first_launch_no_login_password">Anna käyttäjätunnus ja salasana</string>

3
res/values-fr/strings.xml
View file

@ -42,7 +42,6 @@
<string name="decline">Refuser</string>
<string name="conference">Conférence</string>
<!--Launch screen-->
<string name="app_description">Le client SIP <i>libre</i></string>
<!--Assistant-->
<string name="welcome">Bienvenue</string>
<string name="assistant">Assistant</string>
@ -76,7 +75,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
<string name="wizard_username_unavailable">Ce nom d\'utilisateur est déjà pris.</string>
<string name="wizard_username_incorrect">Votre nom d\'utilisateur est invalide.</string>
<string name="wizard_email_incorrect">Votre email est invalide.</string>
<string name="wizard_password_incorrect">Votre mot de passe est invalide.</string>
<string name="wizard_password_incorrect">Votre mot de passe n\'est pas valide.</string>
<string name="wizard_passwords_unmatched">Les mots de passes ne correspondent pas.</string>
<string name="setup_confirm_username">Votre nom d\'utilisateur sera %s.\r\n\r\nIl peut différer de votre saisie.\r\nContinuer ?</string>
<string name="first_launch_no_login_password">Entrez votre nom d\'utilisateur et votre mot de passe</string>

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

@ -165,7 +165,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
mLinphoneRootCaFile = basePath + "/rootca.pem";
mRingSoundFile = basePath + "/oldphone_mono.wav";
mRingbackSoundFile = basePath + "/ringback.wav";
mPauseSoundFile = basePath + "/toy_mono.wav";
mPauseSoundFile = basePath + "/dont_wait_too_long.wav";
mChatDatabaseFile = basePath + "/linphone-history.db";
mCallLogDatabaseFile = basePath + "/linphone-log-history.db";
mErrorToneFile = basePath + "/error.wav";
@ -689,7 +689,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
private void copyAssetsFromPackage() throws IOException {
copyIfNotExist(R.raw.oldphone_mono, mRingSoundFile);
copyIfNotExist(R.raw.ringback, mRingbackSoundFile);
copyIfNotExist(R.raw.toy_mono, mPauseSoundFile);
copyIfNotExist(R.raw.dont_wait_too_long, mPauseSoundFile);
copyIfNotExist(R.raw.incoming_chat, mErrorToneFile);
copyIfNotExist(R.raw.linphonerc_default, mLinphoneConfigFile);
copyFromPackage(R.raw.linphonerc_factory, new File(mLinphoneFactoryConfigFile).getName());

2
src/org/linphone/assistant/AssistantActivity.java
View file

@ -48,7 +48,6 @@ import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
@ -164,6 +163,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
}
private void changeFragment(Fragment newFragment) {
hideKeyboard();
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.replace(R.id.fragment_container, newFragment);
transaction.commitAllowingStateLoss();

1
src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
View file

@ -70,6 +70,7 @@ public class EchoCancellerCalibrationFragment extends Fragment {
LinphoneManager.getInstance().startEcCalibration(mListener);
} catch (LinphoneCoreException e) {
Log.e(e, "Unable to calibrate EC");
AssistantActivity.instance().isEchoCalibrationFinished();
}
return view;
}