Better cleanup

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

# Conflicts:
#	app/build.gradle

app/build.gradle

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

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

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) {

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>() {