Clean up delete

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

app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalJob.java

@@ -113,23 +113,23 @@ public class AccountRemovalJob extends Job {
 
                                                     @Override
                                                     public void onNext(Void aVoid) {
-                                                        userUtils.deleteUser(userEntity.getUsername(),
-                                                                userEntity.getBaseUrl()).subscribe(new CompletableObserver() {
-                                                            @Override
-                                                            public void onSubscribe(Disposable d) {
+                                                        userUtils.deleteUser(userEntity.getId()).subscribe(new
+                                                                                                                   CompletableObserver() {
+                                                                                                                       @Override
+                                                                                                                       public void onSubscribe(Disposable d) {
 
-                                                            }
+                                                                                                                       }
 
-                                                            @Override
-                                                            public void onComplete() {
+                                                                                                                       @Override
+                                                                                                                       public void onComplete() {
 
-                                                            }
+                                                                                                                       }
 
-                                                            @Override
-                                                            public void onError(Throwable e) {
+                                                                                                                       @Override
+                                                                                                                       public void onError(Throwable e) {
 
-                                                            }
-                                                        });
+                                                                                                                       }
+                                                                                                                   });
                                                     }
 
                                                     @Override
@@ -156,8 +156,7 @@ public class AccountRemovalJob extends Job {
                                 }
                             });
                 } else {
-                    userUtils.deleteUser(userEntity.getUsername(),
-                            userEntity.getBaseUrl())
+                    userUtils.deleteUser(userEntity.getId())
                             .subscribeOn(Schedulers.newThread())
                             .subscribe(new CompletableObserver() {
                                 @Override
@@ -178,8 +177,7 @@ public class AccountRemovalJob extends Job {
                 }
             } catch (IOException e) {
                 Log.d(TAG, "Something went wrong while removing job at parsing PushConfigurationState");
-                userUtils.deleteUser(userEntity.getUsername(),
-                        userEntity.getBaseUrl())
+                userUtils.deleteUser(userEntity.getId())
                         .subscribeOn(Schedulers.newThread())
                         .subscribe(new CompletableObserver() {
                             @Override

app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java

@@ -87,9 +87,8 @@ public class UserUtils {
         return (UserEntity) findUserQueryResult.firstOrNull();
     }
 
-    public Completable deleteUser(String username, String serverUrl) {
-        Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.USERNAME.eq(username).
-                and(UserEntity.BASE_URL.eq(serverUrl))).limit(1).get();
+    public Completable deleteUser(long internalId) {
+        Result findUserQueryResult = dataStore.select(User.class).where(UserEntity.ID.eq(internalId)).limit(1).get();
 
         UserEntity user = (UserEntity) findUserQueryResult.firstOrNull();