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

Update submodules

Browse source
This commit is contained in:
Erwan Croze 2018-01-11 14:28:39 +01:00
parent a9cb1807e6
commit 8cfb274081
6 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/raw/cpim_grammar Normal file
View file

Binary file not shown.

BIN
res/raw/vcard_grammar Normal file
View file

Binary file not shown.

26
src/android/org/linphone/LinphoneManager.java
View file

@ -135,9 +135,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
@ -206,16 +204,11 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
mLPConfigXsd = basePath + "/lpconfig.xsd";
mLinphoneFactoryConfigFile = basePath + "/linphonerc";
mConfigFile = basePath + "/.linphonerc";
mLinphoneRootCaFile = basePath + "/rootca.pem";
mDynamicConfigFile = basePath + "/assistant_create.rc";
mRingSoundFile = basePath + "/ringtone.mkv";
mRingbackSoundFile = basePath + "/ringback.wav";
mPauseSoundFile = basePath + "/hold.mkv";
mChatDatabaseFile = basePath + "/linphone-history.db";
mCallLogDatabaseFile = basePath + "/linphone-log-history.db";
mFriendsDatabaseFile = basePath + "/linphone-friends.db";
mErrorToneFile = basePath + "/error.wav";
mUserCertificatePath = basePath;
mRingSoundFile = basePath + "/ringtone.mkv";
mPrefs = LinphonePreferences.instance();
mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE));
@ -232,17 +225,12 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
/** Called when the activity is first created. */
private final String mLPConfigXsd;
private final String mLinphoneFactoryConfigFile;
private final String mLinphoneRootCaFile;
private final String mDynamicConfigFile;
public final String mConfigFile;
private final String mRingSoundFile;
private final String mRingbackSoundFile;
private final String mPauseSoundFile;
private final String mChatDatabaseFile;
private final String mRingSoundFile;
private final String mCallLogDatabaseFile;
private final String mFriendsDatabaseFile;
private final String mErrorToneFile;
private final String mUserCertificatePath;
private byte[] mUploadingImage;
private Timer mTimer;
@ -701,13 +689,10 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
Log.e(e, "cannot get version name");
}
mLc.setRingback(mRingbackSoundFile);
mLc.setRootCa(mLinphoneRootCaFile);
mLc.setPlayFile(mPauseSoundFile);
mLc.setChatDatabasePath(mChatDatabaseFile);
mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
mLc.setFriendsDatabasePath(mFriendsDatabaseFile);
mLc.setUserCertificatesPath(mUserCertificatePath);
//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled());
@ -791,14 +776,9 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
}
private void copyAssetsFromPackage() throws IOException {
copyIfNotExist(R.raw.notes_of_the_optimistic, mRingSoundFile);
copyIfNotExist(R.raw.ringback, mRingbackSoundFile);
copyIfNotExist(R.raw.hold, mPauseSoundFile);
copyIfNotExist(R.raw.incoming_chat, mErrorToneFile);
copyIfNotExist(R.raw.linphonerc_default, mConfigFile);
copyFromPackage(R.raw.linphonerc_factory, new File(mLinphoneFactoryConfigFile).getName());
copyIfNotExist(R.raw.lpconfig, mLPConfigXsd);
copyFromPackage(R.raw.rootca, new File(mLinphoneRootCaFile).getName());
copyFromPackage(R.raw.assistant_create, new File(mDynamicConfigFile).getName());
}

2
submodules/belcard

@ -1 +1 @@
Subproject commit b9e1951be4575c62e326d761a7f7c79c5cce9cb9
Subproject commit 34e07ea973ab9565fb5b063fa17c772c7c48d5c5

2
submodules/belr

@ -1 +1 @@
Subproject commit 9364d69fb16b058066a129f993558d764a6836cf
Subproject commit 6dc5d2f9d37ba094cf397135c16b47375261be83

2
submodules/linphone

@ -1 +1 @@
Subproject commit e35b483fa1a44dfdebd5ac1061144ac1479e0f9a
Subproject commit f369a7c87dab07c0d51becd377f574ef22811af2