mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 21:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8577 from nextcloud/tokenRemoval

Browse source 
Delete app password on account removal
This commit is contained in:
Tobias Kaminsky 2021-08-11 11:44:15 +02:00 committed by GitHub
commit 4bd14b34b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt
View file

@ -33,6 +33,7 @@ import com.nextcloud.client.account.User
import com.nextcloud.client.account.UserAccountManager
import com.nextcloud.client.core.Clock
import com.nextcloud.client.preferences.AppPreferencesImpl
import com.nextcloud.common.NextcloudClient
import com.nextcloud.java.util.Optional
import com.owncloud.android.MainApp
import com.owncloud.android.R
@ -45,6 +46,7 @@ import com.owncloud.android.datamodel.UploadsStorageManager
import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.users.DeleteAppPasswordRemoteOperation
import com.owncloud.android.lib.resources.users.RemoteWipeSuccessRemoteOperation
import com.owncloud.android.providers.DocumentsStorageProvider
import com.owncloud.android.ui.activity.ContactsPreferenceActivity
@ -133,6 +135,14 @@ class AccountRemovalWork(
// notify Document Provider
DocumentsStorageProvider.notifyRootsChanged(context)
// delete app password
val deleteAppPasswordRemoteOperation = DeleteAppPasswordRemoteOperation()
val optionNextcloudClient = createNextcloudClient(user)
if (optionNextcloudClient.isPresent) {
deleteAppPasswordRemoteOperation.execute(optionNextcloudClient.get())
}
if (userRemoved) {
eventBus.post(AccountRemovedEvent())
}
@ -202,4 +212,17 @@ class AccountRemovalWork(
Optional.empty()
}
}
private fun createNextcloudClient(user: User): Optional<NextcloudClient> {
@Suppress("TooGenericExceptionCaught") // needs migration to newer api to get rid of exceptions
return try {
val context = MainApp.getAppContext()
val factory = OwnCloudClientManagerFactory.getDefaultSingleton()
val client = factory.getNextcloudClientFor(user.toOwnCloudAccount(), context)
Optional.of(client)
} catch (e: Exception) {
Log_OC.e(this, "Could not create client", e)
Optional.empty()
}
}
}