瀏覽代碼

Merge pull request #6075 from nextcloud/userCast

Fix wrong extra_account, which used user instead of account
Andy Scherzinger 5 年之前
父節點
當前提交
fe4175ae59
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt

+ 3 - 3
src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt

@@ -166,9 +166,9 @@ class ContactsBackupWork(
         )
     }
 
-    private fun expireFiles(daysToExpire: Int, backupFolderString: String, account: User) { // -1 disables expiration
+    private fun expireFiles(daysToExpire: Int, backupFolderString: String, user: User) { // -1 disables expiration
         if (daysToExpire > -1) {
-            val storageManager = FileDataStorageManager(account.toPlatformAccount(),
+            val storageManager = FileDataStorageManager(user.toPlatformAccount(),
                 applicationContext.getContentResolver())
             val backupFolder: OCFile = storageManager.getFileByPath(backupFolderString)
             val cal = Calendar.getInstance()
@@ -184,7 +184,7 @@ class ContactsBackupWork(
                     // delete backups
                     val service = Intent(applicationContext, OperationsService::class.java)
                     service.action = OperationsService.ACTION_REMOVE
-                    service.putExtra(OperationsService.EXTRA_ACCOUNT, account)
+                    service.putExtra(OperationsService.EXTRA_ACCOUNT, user.toPlatformAccount())
                     service.putExtra(OperationsService.EXTRA_REMOTE_PATH, backup.remotePath)
                     service.putExtra(OperationsService.EXTRA_REMOVE_ONLY_LOCAL, false)
                     operationsServiceBinder!!.queueNewOperation(service)