gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-04 02:51:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with camera & retries

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-04 23:14:31 +02:00
parent 0ca28326cd
commit 6c8321d053
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -16,7 +16,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 39
versionName "2.0.0beta6"
versionName "2.0.0"
flavorDimensions "default"

17
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -228,8 +228,6 @@ public class CallActivity extends AppCompatActivity {
private SpotlightView spotlightView;
private int camerasCount;
private int cameraSwitchCount;
private static int getSystemUiVisibility() {
int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN;
@ -283,15 +281,15 @@ public class CallActivity extends AppCompatActivity {
baseUrl = userEntity.getBaseUrl();
}
callControls.setZ(100.0f);
basicInitialization();
try {
cache.evictAll();
} catch (IOException e) {
Log.e(TAG, "Failed to evict cache");
}
callControls.setZ(100.0f);
basicInitialization();
if (getIntent().getExtras().containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
handleFromNotification();
} else {
@ -302,6 +300,7 @@ public class CallActivity extends AppCompatActivity {
private void handleFromNotification() {
ncApi.getRooms(credentials, ApiUtils.getUrlForGetRooms(baseUrl))
.retry(3)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<RoomsOverall>() {
@ -313,7 +312,7 @@ public class CallActivity extends AppCompatActivity {
@Override
public void onNext(RoomsOverall roomsOverall) {
for (Room room : roomsOverall.getOcs().getData()) {
if (roomToken.equals(room.getRoomId())) {
if (roomId.equals(room.getRoomId())) {
roomToken = room.getToken();
break;
}
@ -530,8 +529,6 @@ public class CallActivity extends AppCompatActivity {
private VideoCapturer createCameraCapturer(CameraEnumerator enumerator) {
final String[] deviceNames = enumerator.getDeviceNames();
camerasCount = deviceNames.length;
// First, try to find front facing camera
Logging.d(TAG, "Looking for front facing cameras.");
for (String deviceName : deviceNames) {
@ -540,13 +537,11 @@ public class CallActivity extends AppCompatActivity {
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
if (videoCapturer != null) {
cameraSwitchCount = 0;
return videoCapturer;
}
}
}
cameraSwitchCount = -1;
// Front facing camera not found, try something else
Logging.d(TAG, "Looking for other cameras.");
@ -771,6 +766,7 @@ public class CallActivity extends AppCompatActivity {
ncApi.getSignalingSettings(credentials, ApiUtils.getUrlForSignalingSettings(baseUrl))
.subscribeOn(Schedulers.newThread())
.retry(3)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SignalingSettingsOverall>() {
@Override
@ -836,6 +832,7 @@ public class CallActivity extends AppCompatActivity {
private void checkCapabilities() {
ncApi.getCapabilities(credentials, ApiUtils.getUrlForCapabilities(baseUrl))
.retry(3)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CapabilitiesOverall>() {