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

refactoring PushUtils

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-01-13 12:15:15 +01:00
parent a7c298b224
commit 412af46ed5
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,11 +230,11 @@ public class PushUtils {
String pushTokenHash = generateSHA512Hash(token).toLowerCase(); String pushTokenHash = generateSHA512Hash(token).toLowerCase();
PublicKey devicePublicKey = (PublicKey) readKeyFromFile(true); PublicKey devicePublicKey = (PublicKey) readKeyFromFile(true);
if (devicePublicKey != null) { if (devicePublicKey != null) {
byte[] publicKeyBytes = Base64.encode(devicePublicKey.getEncoded(), Base64.NO_WRAP); byte[] devicePublicKeyBytes = Base64.encode(devicePublicKey.getEncoded(), Base64.NO_WRAP);
String publicKey = new String(publicKeyBytes); String devicePublicKeyBase64 = new String(devicePublicKeyBytes);
publicKey = publicKey.replaceAll("(.{64})", "$1\n"); devicePublicKeyBase64 = devicePublicKeyBase64.replaceAll("(.{64})", "$1\n");
publicKey = "-----BEGIN PUBLIC KEY-----\n" + publicKey + "\n-----END PUBLIC KEY-----\n"; devicePublicKeyBase64 = "-----BEGIN PUBLIC KEY-----\n" + devicePublicKeyBase64 + "\n-----END PUBLIC KEY-----\n";
if (userUtils.anyUserExists()) { if (userUtils.anyUserExists()) {
String providerValue; String providerValue;
@ -253,20 +253,32 @@ public class PushUtils {
accountPushData = null; accountPushData = null;
} }
if (((TextUtils.isEmpty(providerValue) || accountPushData == null) && !userEntity.getScheduledForDeletion()) || if (((TextUtils.isEmpty(providerValue) || accountPushData == null)
&& !userEntity.getScheduledForDeletion()) ||
(accountPushData != null && !accountPushData.getPushToken().equals(token) && !userEntity.getScheduledForDeletion())) { (accountPushData != null && !accountPushData.getPushToken().equals(token) && !userEntity.getScheduledForDeletion())) {
Map<String, String> queryMap = new HashMap<>(); Map<String, String> nextcloudRegisterPushMap = new HashMap<>();
queryMap.put("format", "json"); nextcloudRegisterPushMap.put("format", "json");
queryMap.put("pushTokenHash", pushTokenHash); nextcloudRegisterPushMap.put("pushTokenHash", pushTokenHash);
queryMap.put("devicePublicKey", publicKey); nextcloudRegisterPushMap.put("devicePublicKey", devicePublicKeyBase64);
queryMap.put("proxyServer", proxyServer); nextcloudRegisterPushMap.put("proxyServer", proxyServer);
credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); registerDeviceWithNextcloud(nextcloudRegisterPushMap, token, userEntity);
}
}
}
}
} else {
Log.e(TAG, "push token was empty when trying to register at nextcloud server");
}
}
private void registerDeviceWithNextcloud(Map<String, String> nextcloudRegisterPushMap, String token, UserEntity userEntity) {
String credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
ncApi.registerDeviceForNotificationsWithNextcloud( ncApi.registerDeviceForNotificationsWithNextcloud(
credentials, credentials,
ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl()), queryMap) ApiUtils.getUrlNextcloudPush(userEntity.getBaseUrl()), nextcloudRegisterPushMap)
.subscribe(new Observer<PushRegistrationOverall>() { .subscribe(new Observer<PushRegistrationOverall>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
@ -284,7 +296,7 @@ public class PushUtils {
proxyMap.put("userPublicKey", pushRegistrationOverall.getOcs() proxyMap.put("userPublicKey", pushRegistrationOverall.getOcs()
.getData().getPublicKey()); .getData().getPublicKey());
registerDeviceWithPushProxy(pushRegistrationOverall, proxyMap, token, userEntity); registerDeviceWithPushProxy(proxyMap, userEntity);
} }
@Override @Override
@ -299,21 +311,9 @@ public class PushUtils {
} }
}); });
} }
}
}
}
} else {
Log.e(TAG, "push token was empty when trying to register at nextcloud server");
}
}
private void registerDeviceWithPushProxy( private void registerDeviceWithPushProxy(Map<String, String> proxyMap, UserEntity userEntity) {
@androidx.annotation.NonNull PushRegistrationOverall pushRegistrationOverall, ncApi.registerDeviceForNotificationsWithPushProxy(ApiUtils.getUrlPushProxy(), proxyMap)
Map<String, String> proxyMap,
String token,
UserEntity userEntity) {
ncApi.registerDeviceForNotificationsWithPushProxy(
ApiUtils.getUrlPushProxy(), proxyMap)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(new Observer<Void>() { .subscribe(new Observer<Void>() {
@Override @Override
@ -323,26 +323,45 @@ public class PushUtils {
@Override @Override
public void onNext(@NonNull Void aVoid) { public void onNext(@NonNull Void aVoid) {
PushConfigurationState pushConfigurationState = try {
new PushConfigurationState(); createOrUpdateUser(proxyMap, userEntity);
pushConfigurationState.setPushToken(token); } catch (IOException e) {
pushConfigurationState.setDeviceIdentifier( Log.e(TAG, "IOException while updating user", e);
pushRegistrationOverall.getOcs() }
.getData().getDeviceIdentifier()); }
pushConfigurationState.setDeviceIdentifierSignature(
pushRegistrationOverall @Override
.getOcs().getData().getSignature()); public void onError(@NonNull Throwable e) {
pushConfigurationState.setUserPublicKey( eventBus.post(new EventStatus(userEntity.getId(),
pushRegistrationOverall.getOcs() EventStatus.EventType.PUSH_REGISTRATION, false));
.getData().getPublicKey()); }
@Override
public void onComplete() {
// unused atm
}
});
}
private void createOrUpdateUser(Map<String, String> proxyMap, UserEntity userEntity) throws IOException {
PushConfigurationState pushConfigurationState = new PushConfigurationState();
pushConfigurationState.setPushToken(proxyMap.get("pushToken"));
pushConfigurationState.setDeviceIdentifier(proxyMap.get("deviceIdentifier"));
pushConfigurationState.setDeviceIdentifierSignature(proxyMap.get("deviceIdentifierSignature"));
pushConfigurationState.setUserPublicKey(proxyMap.get("userPublicKey"));
pushConfigurationState.setUsesRegularPass(false); pushConfigurationState.setUsesRegularPass(false);
try {
userUtils.createOrUpdateUser(null, userUtils.createOrUpdateUser(null,
null, null, null,
null,
userEntity.getDisplayName(), userEntity.getDisplayName(),
LoganSquare.serialize(pushConfigurationState), null, LoganSquare.serialize(pushConfigurationState),
null, userEntity.getId(), null, null, null) null,
null,
userEntity.getId(),
null,
null,
null)
.subscribe(new Observer<UserEntity>() { .subscribe(new Observer<UserEntity>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
@ -356,26 +375,7 @@ public class PushUtils {
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
eventBus.post(new EventStatus eventBus.post(new EventStatus(userEntity.getId(), EventStatus.EventType.PUSH_REGISTRATION, false));
(userEntity.getId(),
EventStatus.EventType
.PUSH_REGISTRATION, false));
}
@Override
public void onComplete() {
// unused atm
}
});
} catch (IOException e) {
Log.e(TAG, "IOException while updating user", e);
}
}
@Override
public void onError(@NonNull Throwable e) {
eventBus.post(new EventStatus(userEntity.getId(),
EventStatus.EventType.PUSH_REGISTRATION, false));
} }
@Override @Override