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

Better cleanup

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	app/build.gradle
This commit is contained in:
Mario Danic 2019-08-15 16:54:16 +02:00
parent 28e24992fd
commit e5cb10e386
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -38,8 +38,13 @@ android {
targetSdkVersion 28 targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
<<<<<<< HEAD
versionCode 107 versionCode 107
versionName "6.2.0" versionName "6.2.0"
=======
versionCode 108
versionName "6.1.6"
>>>>>>> cde40d6e... Better cleanup
flavorDimensions "default" flavorDimensions "default"
renderscriptTargetApi 19 renderscriptTargetApi 19

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

@ -232,8 +232,7 @@ public interface NcApi {
@FormUrlEncoded @FormUrlEncoded
@POST @POST
Observable<Void> registerDeviceForNotificationsWithProxy(@Header("Authorization") String authorization, Observable<Void> registerDeviceForNotificationsWithProxy(@Url String url,
@Url String url,
@FieldMap Map<String, String> fields); @FieldMap Map<String, String> fields);
@ -244,8 +243,7 @@ public interface NcApi {
- "userPublicKey": "{{userPublicKey}}" - "userPublicKey": "{{userPublicKey}}"
*/ */
@DELETE @DELETE
Observable<Void> unregisterDeviceForNotificationsWithProxy(@Header("Authorization") String authorization, Observable<Void> unregisterDeviceForNotificationsWithProxy(@Url String url,
@Url String url,
@QueryMap Map<String, String> fields); @QueryMap Map<String, String> fields);
@FormUrlEncoded @FormUrlEncoded

2
app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
View File

@ -116,7 +116,7 @@ public class AccountRemovalWorker extends Worker {
finalPushConfigurationState.getDeviceIdentifierSignature()); finalPushConfigurationState.getDeviceIdentifierSignature());
ncApi.unregisterDeviceForNotificationsWithProxy ncApi.unregisterDeviceForNotificationsWithProxy
("", ApiUtils.getUrlPushProxy(), queryMap) (ApiUtils.getUrlPushProxy(), queryMap)
.subscribe(new Observer<Void>() { .subscribe(new Observer<Void>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {

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

@ -269,7 +269,7 @@ public class PushUtils {
.getData().getPublicKey()); .getData().getPublicKey());
ncApi.registerDeviceForNotificationsWithProxy("", ncApi.registerDeviceForNotificationsWithProxy(
ApiUtils.getUrlPushProxy(), proxyMap) ApiUtils.getUrlPushProxy(), proxyMap)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(new Observer<Void>() { .subscribe(new Observer<Void>() {