gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-10 21:45:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

use short-syntax for loops and reformat code to 120 character line limt

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-05-20 11:18:53 +02:00
parent de6683815a
commit 6e56731f15
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 121 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -445,12 +445,12 @@ public class CallController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<RoomsOverall>() { .subscribe(new Observer<RoomsOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(RoomsOverall roomsOverall) { public void onNext(@io.reactivex.annotations.NonNull RoomsOverall roomsOverall) {
for (Conversation conversation : roomsOverall.getOcs().getData()) { for (Conversation conversation : roomsOverall.getOcs().getData()) {
if (roomId.equals(conversation.getRoomId())) { if (roomId.equals(conversation.getRoomId())) {
roomToken = conversation.getToken(); roomToken = conversation.getToken();
@ -462,13 +462,13 @@ public class CallController extends BaseController {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
// unused atm
} }
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} }
@ -500,7 +500,6 @@ public class CallController extends BaseController {
pipVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT); pipVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
pipVideoView.setOnTouchListener(new SelfVideoTouchListener()); pipVideoView.setOnTouchListener(new SelfVideoTouchListener());
} }
gridView.setOnTouchListener(new View.OnTouchListener() { gridView.setOnTouchListener(new View.OnTouchListener() {
@ -942,17 +941,16 @@ public class CallController extends BaseController {
} }
} }
if (isConnectionEstablished()) { if (isConnectionEstablished() && magicPeerConnectionWrapperList != null) {
if (!hasMCU) { if (!hasMCU) {
for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) { for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
magicPeerConnectionWrapperList.get(i).sendChannelData(new DataChannelMessage(message)); magicPeerConnectionWrapper.sendChannelData(new DataChannelMessage(message));
} }
} else { } else {
for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) { for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
if (magicPeerConnectionWrapperList.get(i).getSessionId().equals(webSocketClient.getSessionId())) { if (magicPeerConnectionWrapper.getSessionId().equals(webSocketClient.getSessionId())) {
magicPeerConnectionWrapperList.get(i).sendChannelData(new DataChannelMessage(message)); magicPeerConnectionWrapper.sendChannelData(new DataChannelMessage(message));
break; break;
} }
} }
} }
@ -1103,13 +1101,12 @@ public class CallController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<SignalingSettingsOverall>() { .subscribe(new Observer<SignalingSettingsOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(SignalingSettingsOverall signalingSettingsOverall) { public void onNext(@io.reactivex.annotations.NonNull SignalingSettingsOverall signalingSettingsOverall) {
IceServer iceServer;
if (signalingSettingsOverall != null && signalingSettingsOverall.getOcs() != null && if (signalingSettingsOverall != null && signalingSettingsOverall.getOcs() != null &&
signalingSettingsOverall.getOcs().getSettings() != null) { signalingSettingsOverall.getOcs().getSettings() != null) {
@ -1142,36 +1139,38 @@ public class CallController extends BaseController {
} }
} }
if (apiVersion == ApiUtils.APIv3) { if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) { List<IceServer> stunServers =
for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getStunServers().size(); signalingSettingsOverall.getOcs().getSettings().getStunServers();
i++) { if (apiVersion == ApiUtils.APIv3) {
iceServer = signalingSettingsOverall.getOcs().getSettings().getStunServers().get(i); if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
for (int j = 0; j < iceServer.getUrls().size(); j++) { for (IceServer stunServer : stunServers) {
iceServers.add(new PeerConnection.IceServer(iceServer.getUrls().get(j))); if (stunServer.getUrls() != null) {
for (String url : stunServer.getUrls()) {
iceServers.add(new PeerConnection.IceServer(url));
}
}
} }
} }
} } else {
} else { if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) {
if (signalingSettingsOverall.getOcs().getSettings().getStunServers() != null) { for (IceServer stunServer : stunServers) {
for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getStunServers().size(); iceServers.add(new PeerConnection.IceServer(stunServer.getUrl()));
i++) { }
iceServer = signalingSettingsOverall.getOcs().getSettings().getStunServers().get(i);
iceServers.add(new PeerConnection.IceServer(iceServer.getUrl()));
} }
} }
} }
if (signalingSettingsOverall.getOcs().getSettings().getTurnServers() != null) { if (signalingSettingsOverall.getOcs().getSettings().getTurnServers() != null) {
for (int i = 0; i < signalingSettingsOverall.getOcs().getSettings().getTurnServers().size(); List<IceServer> turnServers =
i++) { signalingSettingsOverall.getOcs().getSettings().getTurnServers();
iceServer = signalingSettingsOverall.getOcs().getSettings().getTurnServers().get(i); for (IceServer turnServer : turnServers) {
for (int j = 0; j < iceServer.getUrls().size(); j++) { if (turnServer.getUrls() != null) {
iceServers.add(new PeerConnection.IceServer( for (String url : turnServer.getUrls()) {
iceServer.getUrls().get(j), iceServers.add(new PeerConnection.IceServer(
iceServer.getUsername(), url, turnServer.getUsername(), turnServer.getCredential()
iceServer.getCredential() ));
)); }
} }
} }
} }
@ -1181,13 +1180,13 @@ public class CallController extends BaseController {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, e.getMessage(), e); Log.e(TAG, e.getMessage(), e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} }
@ -1199,12 +1198,12 @@ public class CallController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CapabilitiesOverall>() { .subscribe(new Observer<CapabilitiesOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(CapabilitiesOverall capabilitiesOverall) { public void onNext(@io.reactivex.annotations.NonNull CapabilitiesOverall capabilitiesOverall) {
// FIXME check for compatible Call API version // FIXME check for compatible Call API version
if (hasExternalSignalingServer) { if (hasExternalSignalingServer) {
setupAndInitiateWebSocketsConnection(); setupAndInitiateWebSocketsConnection();
@ -1214,13 +1213,13 @@ public class CallController extends BaseController {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
// unused atm
} }
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} }
@ -1238,12 +1237,12 @@ public class CallController extends BaseController {
.retry(3) .retry(3)
.subscribe(new Observer<RoomOverall>() { .subscribe(new Observer<RoomOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(RoomOverall roomOverall) { public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
callSession = roomOverall.getOcs().getData().getSessionId(); callSession = roomOverall.getOcs().getData().getSessionId();
ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession); ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession);
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
@ -1253,13 +1252,13 @@ public class CallController extends BaseController {
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
// unused atm
} }
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} else { } else {
@ -1292,27 +1291,31 @@ public class CallController extends BaseController {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<GenericOverall>() { .subscribe(new Observer<GenericOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(@io.reactivex.annotations.NonNull GenericOverall genericOverall) {
if (!currentCallStatus.equals(CallStatus.LEAVING)) { if (!currentCallStatus.equals(CallStatus.LEAVING)) {
setCallState(CallStatus.JOINED); setCallState(CallStatus.JOINED);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true); ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
if (!TextUtils.isEmpty(roomToken)) { if (!TextUtils.isEmpty(roomToken)) {
NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(), conversationUser, roomToken); NotificationUtils.INSTANCE.cancelExistingNotificationsForRoom(getApplicationContext(),
conversationUser,
roomToken);
} }
if (!hasExternalSignalingServer) { if (!hasExternalSignalingServer) {
int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser, int apiVersion = ApiUtils.getSignalingApiVersion(conversationUser,
new int[] {ApiUtils.APIv3, 2, 1}); new int[] {ApiUtils.APIv3, 2, 1});
ncApi.pullSignalingMessages(credentials, ApiUtils.getUrlForSignaling(apiVersion, ncApi.pullSignalingMessages(credentials,
baseUrl, roomToken)) ApiUtils.getUrlForSignaling(apiVersion,
baseUrl,
roomToken))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.repeatWhen(observable -> observable) .repeatWhen(observable -> observable)
@ -1320,26 +1323,19 @@ public class CallController extends BaseController {
.retry(3, observable -> isConnectionEstablished()) .retry(3, observable -> isConnectionEstablished())
.subscribe(new Observer<SignalingOverall>() { .subscribe(new Observer<SignalingOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
signalingDisposable = d; signalingDisposable = d;
} }
@Override @Override
public void onNext(SignalingOverall signalingOverall) { public void onNext(
if (signalingOverall.getOcs().getSignalings() != null) { @io.reactivex.annotations.NonNull
for (int i = 0; i < signalingOverall.getOcs().getSignalings().size(); i++) { SignalingOverall signalingOverall) {
try { receivedSignalingMessages(signalingOverall.getOcs().getSignalings());
receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i));
} catch (IOException e) {
Log.e(TAG, "Failed to process received signaling" +
" message");
}
}
}
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
dispose(signalingDisposable); dispose(signalingDisposable);
} }
@ -1348,19 +1344,18 @@ public class CallController extends BaseController {
dispose(signalingDisposable); dispose(signalingDisposable);
} }
}); });
} }
} }
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
// unused atm
} }
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} }
@ -1402,7 +1397,6 @@ public class CallController extends BaseController {
} else { } else {
initiateCall(); initiateCall();
} }
} else {
} }
break; break;
case "roomJoined": case "roomJoined":
@ -1414,14 +1408,19 @@ public class CallController extends BaseController {
break; break;
case "participantsUpdate": case "participantsUpdate":
if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) { if (webSocketCommunicationEvent.getHashMap().get("roomToken").equals(roomToken)) {
processUsersInRoom((List<HashMap<String, Object>>) webSocketClient.getJobWithId(Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId")))); processUsersInRoom(
(List<HashMap<String, Object>>) webSocketClient
.getJobWithId(
Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
} }
break; break;
case "signalingMessage": case "signalingMessage":
processMessage((NCSignalingMessage) webSocketClient.getJobWithId(Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId")))); processMessage((NCSignalingMessage) webSocketClient.getJobWithId(
Integer.valueOf(webSocketCommunicationEvent.getHashMap().get("jobId"))));
break; break;
case "peerReadyForRequestingOffer": case "peerReadyForRequestingOffer":
webSocketClient.requestOfferForSessionIdWithType(webSocketCommunicationEvent.getHashMap().get("sessionId"), "video"); webSocketClient.requestOfferForSessionIdWithType(
webSocketCommunicationEvent.getHashMap().get("sessionId"), "video");
break; break;
} }
} }
@ -1442,6 +1441,18 @@ public class CallController extends BaseController {
} }
} }
private void receivedSignalingMessages(@Nullable List<Signaling> signalingList) {
if (signalingList != null) {
for (Signaling signaling : signalingList) {
try {
receivedSignalingMessage(signaling);
} catch (IOException e) {
Log.e(TAG, "Failed to process received signaling message", e);
}
}
}
}
private void receivedSignalingMessage(Signaling signaling) throws IOException { private void receivedSignalingMessage(Signaling signaling) throws IOException {
String messageType = signaling.getType(); String messageType = signaling.getType();
@ -2013,31 +2024,23 @@ public class CallController extends BaseController {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(new Observer<SignalingOverall>() { .subscribe(new Observer<SignalingOverall>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
// unused atm
} }
@Override @Override
public void onNext(SignalingOverall signalingOverall) { public void onNext(@io.reactivex.annotations.NonNull SignalingOverall signalingOverall) {
if (signalingOverall.getOcs().getSignalings() != null) { receivedSignalingMessages(signalingOverall.getOcs().getSignalings());
for (int i = 0; i < signalingOverall.getOcs().getSignalings().size(); i++) {
try {
receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i));
} catch (IOException e) {
Log.e(TAG, "", e);
}
}
}
} }
@Override @Override
public void onError(Throwable e) { public void onError(@io.reactivex.annotations.NonNull Throwable e) {
Log.e(TAG, "", e); Log.e(TAG, "", e);
} }
@Override @Override
public void onComplete() { public void onComplete() {
// unused atm
} }
}); });
} else { } else {

34
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -385,8 +385,11 @@ public class CallNotificationController extends BaseController {
avatarImageView.setVisibility(View.VISIBLE); avatarImageView.setVisibility(View.VISIBLE);
ImageRequest imageRequest = ImageRequest imageRequest =
DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(), DisplayUtils.getImageRequestForUrl(
currentConversation.getName(), R.dimen.avatar_size_very_big), null); ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(),
currentConversation.getName(),
R.dimen.avatar_size_very_big),
null);
ImagePipeline imagePipeline = Fresco.getImagePipeline(); ImagePipeline imagePipeline = Fresco.getImagePipeline();
DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null); DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null);
@ -399,11 +402,12 @@ public class CallNotificationController extends BaseController {
true); true);
if (getResources() != null) { if (getResources() != null) {
incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable incomingTextRelativeLayout.setBackground(
.incoming_gradient)); getResources().getDrawable(R.drawable.incoming_gradient));
} }
if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 || AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) { if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
if (getActivity() != null) { if (getActivity() != null) {
Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true); Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
new BlurPostProcessor(5, getActivity()).process(backgroundBitmap); new BlurPostProcessor(5, getActivity()).process(backgroundBitmap);
@ -425,6 +429,7 @@ public class CallNotificationController extends BaseController {
@Override @Override
protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) { protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
// unused atm
} }
}, UiThreadImmediateExecutorService.getInstance()); }, UiThreadImmediateExecutorService.getInstance());
@ -467,10 +472,11 @@ public class CallNotificationController extends BaseController {
} }
private void dispose() { private void dispose() {
Disposable disposable; if (disposablesList != null) {
for (int i = 0; i < disposablesList.size(); i++) { for (Disposable disposable : disposablesList) {
if (!(disposable = disposablesList.get(i)).isDisposed()) { if (!disposable.isDisposed()) {
disposable.dispose(); disposable.dispose();
}
} }
} }
} }
@ -486,7 +492,8 @@ public class CallNotificationController extends BaseController {
"/raw/librem_by_feandesign_call"); "/raw/librem_by_feandesign_call");
} else { } else {
try { try {
RingtoneSettings ringtoneSettings = LoganSquare.parse(callRingtonePreferenceString, RingtoneSettings.class); RingtoneSettings ringtoneSettings = LoganSquare.parse(
callRingtonePreferenceString, RingtoneSettings.class);
ringtoneUri = ringtoneSettings.getRingtoneUri(); ringtoneUri = ringtoneSettings.getRingtoneUri();
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "Failed to parse ringtone settings"); Log.e(TAG, "Failed to parse ringtone settings");
@ -501,8 +508,11 @@ public class CallNotificationController extends BaseController {
mediaPlayer.setDataSource(getActivity(), ringtoneUri); mediaPlayer.setDataSource(getActivity(), ringtoneUri);
mediaPlayer.setLooping(true); mediaPlayer.setLooping(true);
AudioAttributes audioAttributes = new AudioAttributes.Builder().setContentType(AudioAttributes AudioAttributes audioAttributes = new AudioAttributes
.CONTENT_TYPE_SONIFICATION).setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE).build(); .Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
.build();
mediaPlayer.setAudioAttributes(audioAttributes); mediaPlayer.setAudioAttributes(audioAttributes);
mediaPlayer.setOnPreparedListener(mp -> mediaPlayer.start()); mediaPlayer.setOnPreparedListener(mp -> mediaPlayer.start());