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

fix Spot Bugs warning

Browse Source 
Possible null pointer dereference in com.nextcloud.talk.utils.PushUtils.updatePushStateForUser(Map, User) due to return value of called method

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-12-14 17:57:14 +01:00 committed by Andy Scherzinger
parent da8148a134
commit eff4b912bd
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/src/main/java/com/nextcloud/talk/utils/PushUtils.java
View File

@ -235,17 +235,17 @@ public class PushUtils {
List<User> users = userManager.getUsers().blockingGet(); List<User> users = userManager.getUsers().blockingGet();
for (User user : users) { for (User user : users) {
if (!user.getScheduledForDeletion()) { if (!user.getScheduledForDeletion()) {
Map<String, String> nextcloudRegisterPushMap = new HashMap<>(); Map<String, String> nextcloudRegisterPushMap = new HashMap<>();
nextcloudRegisterPushMap.put("format", "json"); nextcloudRegisterPushMap.put("format", "json");
nextcloudRegisterPushMap.put("pushTokenHash", pushTokenHash); nextcloudRegisterPushMap.put("pushTokenHash", pushTokenHash);
nextcloudRegisterPushMap.put("devicePublicKey", devicePublicKeyBase64); nextcloudRegisterPushMap.put("devicePublicKey", devicePublicKeyBase64);
nextcloudRegisterPushMap.put("proxyServer", proxyServer); nextcloudRegisterPushMap.put("proxyServer", proxyServer);
registerDeviceWithNextcloud(ncApi, nextcloudRegisterPushMap, token, user); registerDeviceWithNextcloud(ncApi, nextcloudRegisterPushMap, token, user);
}
} }
}
} }
} else { } else {
@ -260,9 +260,9 @@ public class PushUtils {
String credentials = ApiUtils.getCredentials(user.getUsername(), user.getToken()); String credentials = ApiUtils.getCredentials(user.getUsername(), user.getToken());
ncApi.registerDeviceForNotificationsWithNextcloud( ncApi.registerDeviceForNotificationsWithNextcloud(
credentials, credentials,
ApiUtils.getUrlNextcloudPush(user.getBaseUrl()), ApiUtils.getUrlNextcloudPush(user.getBaseUrl()),
nextcloudRegisterPushMap) nextcloudRegisterPushMap)
.subscribe(new Observer<PushRegistrationOverall>() { .subscribe(new Observer<PushRegistrationOverall>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
@ -338,26 +338,31 @@ public class PushUtils {
pushConfigurationState.setUserPublicKey(proxyMap.get("userPublicKey")); pushConfigurationState.setUserPublicKey(proxyMap.get("userPublicKey"));
pushConfigurationState.setUsesRegularPass(Boolean.FALSE); pushConfigurationState.setUsesRegularPass(Boolean.FALSE);
userManager.updatePushState(user.getId(), pushConfigurationState).subscribe(new SingleObserver<Integer>() { if (user.getId() != null) {
@Override userManager.updatePushState(user.getId(), pushConfigurationState).subscribe(new SingleObserver<Integer>() {
public void onSubscribe(Disposable d) { @Override
// unused atm public void onSubscribe(Disposable d) {
} // unused atm
}
@Override @Override
public void onSuccess(Integer integer) { public void onSuccess(Integer integer) {
eventBus.post(new EventStatus(UserIdUtils.INSTANCE.getIdForUser(user), eventBus.post(new EventStatus(UserIdUtils.INSTANCE.getIdForUser(user),
EventStatus.EventType.PUSH_REGISTRATION, EventStatus.EventType.PUSH_REGISTRATION,
true)); true));
} }
@Override
public void onError(Throwable e) {
eventBus.post(new EventStatus(UserIdUtils.INSTANCE.getIdForUser(user),
EventStatus.EventType.PUSH_REGISTRATION,
false));
}
});
} else {
Log.e(TAG, "failed to update updatePushStateForUser. user.getId() was null");
}
@Override
public void onError(Throwable e) {
eventBus.post(new EventStatus(UserIdUtils.INSTANCE.getIdForUser(user),
EventStatus.EventType.PUSH_REGISTRATION,
false));
}
});
} }
private Key readKeyFromString(boolean readPublicKey, String keyString) { private Key readKeyFromString(boolean readPublicKey, String keyString) {