From f10d74f0ed34a37a9f6f58ec09686068a7dc1d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Mon, 29 Aug 2022 19:30:01 +0200
Subject: [PATCH] Replace 'List.get(i)' with iterator to loop over list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 .../talk/activities/CallActivity.java         | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

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 eca9367db..0f691f353 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -1707,8 +1707,8 @@ public class CallActivity extends CallBaseActivity {
             }
         }
 
-        for (int i = 0; i < peerConnectionWrapperList.size(); i++) {
-            endPeerConnection(peerConnectionWrapperList.get(i).getSessionId(), false);
+        for (PeerConnectionWrapper wrapper : peerConnectionWrapperList) {
+            endPeerConnection(wrapper.getSessionId(), false);
         }
 
         if (localStream != null) {
@@ -1887,10 +1887,10 @@ public class CallActivity extends CallBaseActivity {
     }
 
     private PeerConnectionWrapper getPeerConnectionWrapperForSessionIdAndType(String sessionId, String type) {
-        for (int i = 0; i < peerConnectionWrapperList.size(); i++) {
-            if (peerConnectionWrapperList.get(i).getSessionId().equals(sessionId)
-                && peerConnectionWrapperList.get(i).getVideoStreamType().equals(type)) {
-                return peerConnectionWrapperList.get(i);
+        for (PeerConnectionWrapper wrapper : peerConnectionWrapperList) {
+            if (wrapper.getSessionId().equals(sessionId)
+                && wrapper.getVideoStreamType().equals(type)) {
+                return wrapper;
             }
         }
 
@@ -1980,10 +1980,8 @@ public class CallActivity extends CallBaseActivity {
 
     private void endPeerConnection(String sessionId, boolean justScreen) {
         List<PeerConnectionWrapper> peerConnectionWrappers;
-        PeerConnectionWrapper peerConnectionWrapper;
         if (!(peerConnectionWrappers = getPeerConnectionWrapperListForSessionId(sessionId)).isEmpty()) {
-            for (int i = 0; i < peerConnectionWrappers.size(); i++) {
-                peerConnectionWrapper = peerConnectionWrappers.get(i);
+            for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrappers) {
                 if (peerConnectionWrapper.getSessionId().equals(sessionId)) {
                     if (VIDEO_STREAM_TYPE_SCREEN.equals(peerConnectionWrapper.getVideoStreamType()) || !justScreen) {
                         runOnUiThread(() -> removeMediaStream(sessionId));
@@ -2104,10 +2102,8 @@ public class CallActivity extends CallBaseActivity {
         nickChangedPayload.put("userid", conversationUser.getUserId());
         nickChangedPayload.put("name", conversationUser.getDisplayName());
         dataChannelMessage.setPayload(nickChangedPayload);
-        final PeerConnectionWrapper peerConnectionWrapper;
-        for (int i = 0; i < peerConnectionWrapperList.size(); i++) {
-            if (peerConnectionWrapperList.get(i).isMCUPublisher()) {
-                peerConnectionWrapper = peerConnectionWrapperList.get(i);
+        for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
+            if (peerConnectionWrapper.isMCUPublisher()) {
                 Observable
                     .interval(1, TimeUnit.SECONDS)
                     .repeatUntil(() -> (!isConnectionEstablished() || isDestroyed()))