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

Set user-certificates directory. It was not created and not passed to the library.

Browse source
This commit is contained in:
Simon Morlat 2018-09-05 17:50:00 +02:00
parent faeba40500
commit 2683440cef
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,6 +193,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
mCallLogDatabaseFile = basePath + "/linphone-log-history.db"; mCallLogDatabaseFile = basePath + "/linphone-log-history.db";
mFriendsDatabaseFile = basePath + "/linphone-friends.db"; mFriendsDatabaseFile = basePath + "/linphone-friends.db";
mRingSoundFile = basePath + "/ringtone.mkv"; mRingSoundFile = basePath + "/ringtone.mkv";
mUserCertsPath = basePath + "/user-certs";
mPrefs = LinphonePreferences.instance(); mPrefs = LinphonePreferences.instance();
mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE)); mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE));
@ -202,6 +203,13 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
mSensorManager = (SensorManager) c.getSystemService(Context.SENSOR_SERVICE); mSensorManager = (SensorManager) c.getSystemService(Context.SENSOR_SERVICE);
mProximity = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); mProximity = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
mR = c.getResources(); mR = c.getResources();
File f=new File(mUserCertsPath);
if(!f.exists()){
if(!f.mkdir()){
Log.e(mUserCertsPath+" can't be created.");
}
}
} }
private static final int LINPHONE_VOLUME_STREAM = STREAM_VOICE_CALL; private static final int LINPHONE_VOLUME_STREAM = STREAM_VOICE_CALL;
@ -217,6 +225,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
private final String mRingSoundFile; private final String mRingSoundFile;
private final String mCallLogDatabaseFile; private final String mCallLogDatabaseFile;
private final String mFriendsDatabaseFile; private final String mFriendsDatabaseFile;
private final String mUserCertsPath;
private Timer mTimer; private Timer mTimer;
private Map<String, Integer> mUnreadChatsPerRoom; private Map<String, Integer> mUnreadChatsPerRoom;
@ -702,10 +711,10 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
Log.e(e, "cannot get version name"); Log.e(e, "cannot get version name");
} }
mLc.setChatDatabasePath(mChatDatabaseFile); mLc.setChatDatabasePath(mChatDatabaseFile);
mLc.setCallLogsDatabasePath(mCallLogDatabaseFile); mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
mLc.setFriendsDatabasePath(mFriendsDatabaseFile); mLc.setFriendsDatabasePath(mFriendsDatabaseFile);
mLc.setUserCertificatesPath(mUserCertsPath);
//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile); //mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled()); enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled());

2
submodules/linphone

@ -1 +1 @@
Subproject commit 8ce4bac39652a9c267d24f60e686a9383fb17e14 Subproject commit fc19d242a581dbca8756ec121bca4046676bc0ed