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

minor refactoring

Browse Source 
- extract method to register device at proxy
- rename method
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-01-12 20:26:29 +01:00
parent 0880a792a8
commit bd4208f709
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 81 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

@ -283,7 +283,7 @@ public interface NcApi {
@FormUrlEncoded @FormUrlEncoded
@POST @POST
Observable<Void> registerDeviceForNotificationsWithProxy(@Url String url, Observable<Void> registerDeviceForNotificationsWithPushProxy(@Url String url,
@FieldMap Map<String, String> fields); @FieldMap Map<String, String> fields);

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

@ -284,7 +284,33 @@ public class PushUtils {
proxyMap.put("userPublicKey", pushRegistrationOverall.getOcs() proxyMap.put("userPublicKey", pushRegistrationOverall.getOcs()
.getData().getPublicKey()); .getData().getPublicKey());
ncApi.registerDeviceForNotificationsWithProxy( registerDeviceWithPushProxy(pushRegistrationOverall, proxyMap, token, userEntity);
}
@Override
public void onError(@NonNull Throwable e) {
eventBus.post(new EventStatus(userEntity.getId(),
EventStatus.EventType.PUSH_REGISTRATION, false));
}
@Override
public void onComplete() {
// unused atm
}
});
}
}
}
}
}
}
private void registerDeviceWithPushProxy(
@androidx.annotation.NonNull PushRegistrationOverall pushRegistrationOverall,
Map<String, String> proxyMap,
String token,
UserEntity userEntity) {
ncApi.registerDeviceForNotificationsWithPushProxy(
ApiUtils.getUrlPushProxy(), proxyMap) ApiUtils.getUrlPushProxy(), proxyMap)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(new Observer<Void>() { .subscribe(new Observer<Void>() {
@ -357,24 +383,6 @@ public class PushUtils {
}); });
} }
@Override
public void onError(@NonNull Throwable e) {
eventBus.post(new EventStatus(userEntity.getId(),
EventStatus.EventType.PUSH_REGISTRATION, false));
}
@Override
public void onComplete() {
// unused atm
}
});
}
}
}
}
}
}
private Key readKeyFromString(boolean readPublicKey, String keyString) { private Key readKeyFromString(boolean readPublicKey, String keyString) {
if (readPublicKey) { if (readPublicKey) {
keyString = keyString.replaceAll("\\n", "").replace("-----BEGIN PUBLIC KEY-----", keyString = keyString.replaceAll("\\n", "").replace("-----BEGIN PUBLIC KEY-----",