mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-21 04:29:45 +01:00
Fix "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" SpotBugs complaint
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
16ca03cb5c
commit
4790e7b7e4
@ -74,56 +74,64 @@ public class AddParticipantsToConversation extends Worker {
|
|||||||
String credentials = ApiUtils.getCredentials(user.getUsername(), user.getToken());
|
String credentials = ApiUtils.getCredentials(user.getUsername(), user.getToken());
|
||||||
|
|
||||||
RetrofitBucket retrofitBucket;
|
RetrofitBucket retrofitBucket;
|
||||||
for (String userId : selectedUserIds) {
|
if (selectedUserIds != null) {
|
||||||
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipant(apiVersion, user.getBaseUrl(),
|
for (String userId : selectedUserIds) {
|
||||||
conversationToken,
|
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipant(apiVersion, user.getBaseUrl(),
|
||||||
userId);
|
conversationToken,
|
||||||
|
userId);
|
||||||
|
|
||||||
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.blockingSubscribe();
|
.blockingSubscribe();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String groupId : selectedGroupIds) {
|
if (selectedGroupIds != null) {
|
||||||
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
|
for (String groupId : selectedGroupIds) {
|
||||||
apiVersion,
|
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
|
||||||
user.getBaseUrl(),
|
apiVersion,
|
||||||
conversationToken,
|
user.getBaseUrl(),
|
||||||
"groups",
|
conversationToken,
|
||||||
groupId
|
"groups",
|
||||||
);
|
groupId
|
||||||
|
);
|
||||||
|
|
||||||
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.blockingSubscribe();
|
.blockingSubscribe();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String circleId : selectedCircleIds) {
|
if (selectedCircleIds != null) {
|
||||||
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
|
for (String circleId : selectedCircleIds) {
|
||||||
apiVersion,
|
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
|
||||||
user.getBaseUrl(),
|
apiVersion,
|
||||||
conversationToken,
|
user.getBaseUrl(),
|
||||||
"circles",
|
conversationToken,
|
||||||
circleId
|
"circles",
|
||||||
);
|
circleId
|
||||||
|
);
|
||||||
|
|
||||||
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.blockingSubscribe();
|
.blockingSubscribe();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String email : selectedEmails) {
|
if (selectedEmails != null) {
|
||||||
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
|
for (String email : selectedEmails) {
|
||||||
apiVersion,
|
retrofitBucket = ApiUtils.getRetrofitBucketForAddParticipantWithSource(
|
||||||
user.getBaseUrl(),
|
apiVersion,
|
||||||
conversationToken,
|
user.getBaseUrl(),
|
||||||
"emails",
|
conversationToken,
|
||||||
email
|
"emails",
|
||||||
);
|
email
|
||||||
|
);
|
||||||
|
|
||||||
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
ncApi.addParticipant(credentials, retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.blockingSubscribe();
|
.blockingSubscribe();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
eventBus.post(new EventStatus(user.getId(), EventStatus.EventType.PARTICIPANTS_UPDATE, true));
|
eventBus.post(new EventStatus(user.getId(), EventStatus.EventType.PARTICIPANTS_UPDATE, true));
|
||||||
|
Loading…
Reference in New Issue
Block a user