diff options
| author | Mario Danic <mario@lovelyhq.com> | 2019-08-15 17:54:16 +0300 |
|---|---|---|
| committer | Mario Danic <mario@lovelyhq.com> | 2019-08-15 17:54:16 +0300 |
| commit | cde40d6eea968b5a48116e35cca06f0b7e590172 (patch) | |
| tree | b5a94b6d73bd775980ad718e4b8a540bbac9daa6 | |
| parent | b280e891e8a124abde6fc6666e5a146fb4e52f66 (diff) | |
Better cleanupv6.1.6
Signed-off-by: Mario Danic <mario@lovelyhq.com>
4 files changed, 6 insertions, 8 deletions
diff --git a/app/build.gradle b/app/build.gradle index 7a0ebc899..d2f640b32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,8 +38,8 @@ android { targetSdkVersion 28 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - versionCode 107 - versionName "6.1.5" + versionCode 108 + versionName "6.1.6" flavorDimensions "default" renderscriptTargetApi 19 diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java index 6a7c6d375..ef7963ef2 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java +++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java @@ -232,8 +232,7 @@ public interface NcApi { @FormUrlEncoded @POST - Observable<Void> registerDeviceForNotificationsWithProxy(@Header("Authorization") String authorization, - @Url String url, + Observable<Void> registerDeviceForNotificationsWithProxy(@Url String url, @FieldMap Map<String, String> fields); @@ -244,8 +243,7 @@ public interface NcApi { - "userPublicKey": "{{userPublicKey}}" */ @DELETE - Observable<Void> unregisterDeviceForNotificationsWithProxy(@Header("Authorization") String authorization, - @Url String url, + Observable<Void> unregisterDeviceForNotificationsWithProxy(@Url String url, @QueryMap Map<String, String> fields); @FormUrlEncoded diff --git a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java index ba3b0c64f..58c044eb9 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java @@ -116,7 +116,7 @@ public class AccountRemovalWorker extends Worker { finalPushConfigurationState.getDeviceIdentifierSignature()); ncApi.unregisterDeviceForNotificationsWithProxy - ("", ApiUtils.getUrlPushProxy(), queryMap) + (ApiUtils.getUrlPushProxy(), queryMap) .subscribe(new Observer<Void>() { @Override public void onSubscribe(Disposable d) { diff --git a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java index 7d1695cd3..17736077a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/PushUtils.java @@ -269,7 +269,7 @@ public class PushUtils { .getData().getPublicKey()); - ncApi.registerDeviceForNotificationsWithProxy("", + ncApi.registerDeviceForNotificationsWithProxy( ApiUtils.getUrlPushProxy(), proxyMap) .subscribeOn(Schedulers.io()) .subscribe(new Observer<Void>() { |