From 6c8321d053202c3dd3edf3f680e987e58f343c5f Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 4 Jun 2018 23:14:31 +0200
Subject: [PATCH] Fix bug with camera & retries

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                |  2 +-
 .../nextcloud/talk/activities/CallActivity.java | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b9a78193a..5dcf27913 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         versionCode 39
-        versionName "2.0.0beta6"
+        versionName "2.0.0"
 
         flavorDimensions "default"
 
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 0d31bad98..4f9a1fd94 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -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>() {