gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'List.get(i)' with iterator to loop over list

Browse Source 
Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2022-08-29 19:30:01 +02:00
parent 62fa8c9645
commit f10d74f0ed
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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