Do not call directly the capture filter classes
This commit is contained in:
parent
0aa26259e5
commit
d753ca238b
3 changed files with 2 additions and 26 deletions
|
@ -67,8 +67,6 @@ import org.linphone.core.TunnelConfig;
|
|||
import org.linphone.core.VersionUpdateCheckResult;
|
||||
import org.linphone.core.tools.H264Helper;
|
||||
import org.linphone.core.tools.Log;
|
||||
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
|
||||
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration.AndroidCamera;
|
||||
import org.linphone.settings.LinphonePreferences;
|
||||
import org.linphone.utils.AndroidAudioManager;
|
||||
import org.linphone.utils.LinphoneUtils;
|
||||
|
@ -541,33 +539,11 @@ public class LinphoneManager implements SensorEventListener {
|
|||
PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
|
||||
mContext.getPackageName() + ";manager_proximity_sensor");
|
||||
|
||||
resetCameraFromPreferences();
|
||||
|
||||
mAccountCreator = mCore.createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
|
||||
mAccountCreator.setListener(mAccountCreatorListener);
|
||||
mCallGsmON = false;
|
||||
}
|
||||
|
||||
private void resetCameraFromPreferences() {
|
||||
boolean useFrontCam = mPrefs.useFrontCam();
|
||||
int camId = 0;
|
||||
AndroidCamera[] cameras = AndroidCameraConfiguration.retrieveCameras();
|
||||
for (AndroidCamera androidCamera : cameras) {
|
||||
if (androidCamera.frontFacing == useFrontCam) {
|
||||
camId = androidCamera.id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
String[] devices = mCore.getVideoDevicesList();
|
||||
if (camId >= devices.length) {
|
||||
Log.e(
|
||||
"[Manager] Trying to use a camera id that's higher than the linphone's devices list, using 0 to prevent crash...");
|
||||
camId = 0;
|
||||
}
|
||||
String newDevice = devices[camId];
|
||||
mCore.setVideoDevice(newDevice);
|
||||
}
|
||||
|
||||
/* Account linking */
|
||||
|
||||
public void isAccountWithAlias() {
|
||||
|
|
|
@ -77,7 +77,7 @@ public class ChatRoomsAdapter extends SelectableAdapter<ChatRoomViewHolder> {
|
|||
ChatRoom[] rooms = LinphoneManager.getCore().getChatRooms();
|
||||
List<ChatRoom> roomsList = Arrays.asList(rooms);
|
||||
|
||||
if (force) {
|
||||
if (!force) {
|
||||
DiffUtil.DiffResult diffResult =
|
||||
DiffUtil.calculateDiff(new ChatRoomDiffCallback(roomsList, mRooms));
|
||||
diffResult.dispatchUpdatesTo(this);
|
||||
|
|
|
@ -10,7 +10,7 @@ buildscript {
|
|||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.5.0'
|
||||
classpath 'com.android.tools.build:gradle:3.5.1'
|
||||
classpath 'com.google.gms:google-services:4.3.2'
|
||||
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.24.2"
|
||||
|
||||
|
|
Loading…
Reference in a new issue