change cancelContactBackupJobForAccount to user new User class

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/jobs/AccountRemovalJob.java

@@ -49,7 +49,6 @@ import com.owncloud.android.datamodel.PushConfigurationState;
 import com.owncloud.android.datamodel.SyncedFolder;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
 import com.owncloud.android.datamodel.UploadsStorageManager;
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManager;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
@@ -68,7 +67,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import static android.content.Context.ACCOUNT_SERVICE;
 import static com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOVAL;
@@ -121,7 +119,7 @@ public class AccountRemovalJob extends Job {
 
         User user = optionalUser.get();
         // disable contact backup job
-        ContactsPreferenceActivity.cancelContactBackupJobForAccount(context, user.toPlatformAccount());
+        ContactsPreferenceActivity.cancelContactBackupJobForAccount(context, user);
 
         final boolean userRemoved = userAccountManager.removeUser(user);
         if (userRemoved) {

src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java

@@ -135,19 +135,14 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
     }
 
     public static void cancelContactBackupJobForAccount(Context context, User user) {
-        cancelContactBackupJobForAccount(context, user.toPlatformAccount());
-    }
-
-    @Deprecated
-    public static void cancelContactBackupJobForAccount(Context context, Account account) {
-        Log_OC.d(TAG, "disabling contacts backup job for account: " + account.name);
+        Log_OC.d(TAG, "disabling contacts backup job for account: " + user.getAccountName());
 
         JobManager jobManager = JobManager.create(context);
         Set<JobRequest> jobs = jobManager.getAllJobRequestsForTag(ContactsBackupJob.TAG);
 
         for (JobRequest jobRequest : jobs) {
             PersistableBundleCompat extras = jobRequest.getExtras();
-            if (extras.getString(ContactsBackupJob.ACCOUNT, "").equalsIgnoreCase(account.name)) {
+            if (extras.getString(ContactsBackupJob.ACCOUNT, "").equalsIgnoreCase(user.getAccountName())) {
                 jobManager.cancel(jobRequest.getJobId());
             }
         }

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -40,6 +40,8 @@ import com.evernote.android.job.JobRequest;
 import com.evernote.android.job.util.support.PersistableBundleCompat;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.client.account.User;
+import com.nextcloud.java.util.Optional;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -344,8 +346,12 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
         if (bool) {
             ContactsPreferenceActivity.startContactBackupJob(contactsPreferenceActivity.getAccount());
         } else {
-            ContactsPreferenceActivity.cancelContactBackupJobForAccount(contactsPreferenceActivity,
-                    contactsPreferenceActivity.getAccount());
+            Optional<User> user = contactsPreferenceActivity.getUser();
+
+            if (user.isPresent()) {
+                ContactsPreferenceActivity.cancelContactBackupJobForAccount(contactsPreferenceActivity,
+                                                                            user.get());
+            }
         }
 
         arbitraryDataProvider.storeOrUpdateKeyValue(account.name, PREFERENCE_CONTACTS_AUTOMATIC_BACKUP,