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

Merge pull request #9166 from nextcloud/namespacedAction

Browse source 
Use package specific action
This commit is contained in:
Álvaro Brey 2021-11-04 13:39:46 +01:00 committed by GitHub
commit 30be31f525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
View file

@ -43,6 +43,7 @@ import com.nextcloud.client.account.UserAccountManager
import com.nextcloud.client.core.Clock import com.nextcloud.client.core.Clock
import com.nextcloud.client.preferences.AppPreferences import com.nextcloud.client.preferences.AppPreferences
import com.nextcloud.client.preferences.AppPreferencesImpl import com.nextcloud.client.preferences.AppPreferencesImpl
import com.owncloud.android.MainApp
import com.owncloud.android.R import com.owncloud.android.R
import com.owncloud.android.datamodel.ArbitraryDataProvider import com.owncloud.android.datamodel.ArbitraryDataProvider
import com.owncloud.android.datamodel.MediaFolderType import com.owncloud.android.datamodel.MediaFolderType
@ -76,7 +77,7 @@ class MediaFoldersDetectionWork constructor(
private const val ACCOUNT_NAME_GLOBAL = "global" private const val ACCOUNT_NAME_GLOBAL = "global"
private const val KEY_MEDIA_FOLDERS = "media_folders" private const val KEY_MEDIA_FOLDERS = "media_folders"
const val NOTIFICATION_ID = "NOTIFICATION_ID" const val NOTIFICATION_ID = "NOTIFICATION_ID"
private const val DISABLE_DETECTION_CLICK = "DISABLE_DETECTION_CLICK" private val DISABLE_DETECTION_CLICK = MainApp.getAuthority() + "_DISABLE_DETECTION_CLICK"
} }
private val randomIdGenerator = Random(clock.currentTime) private val randomIdGenerator = Random(clock.currentTime)
@ -86,7 +87,6 @@ class MediaFoldersDetectionWork constructor(
val arbitraryDataProvider = ArbitraryDataProvider(contentResolver) val arbitraryDataProvider = ArbitraryDataProvider(contentResolver)
val syncedFolderProvider = SyncedFolderProvider(contentResolver, preferences, clock) val syncedFolderProvider = SyncedFolderProvider(contentResolver, preferences, clock)
val gson = Gson() val gson = Gson()
val arbitraryDataString: String
val mediaFoldersModel: MediaFoldersModel val mediaFoldersModel: MediaFoldersModel
val imageMediaFolders = MediaProvider.getImageFolders(contentResolver, 1, null, true) val imageMediaFolders = MediaProvider.getImageFolders(contentResolver, 1, null, true)
val videoMediaFolders = MediaProvider.getVideoFolders(contentResolver, 1, null, true) val videoMediaFolders = MediaProvider.getVideoFolders(contentResolver, 1, null, true)
@ -98,7 +98,7 @@ class MediaFoldersDetectionWork constructor(
for (videoMediaFolder in videoMediaFolders) { for (videoMediaFolder in videoMediaFolders) {
imageMediaFolderPaths.add(videoMediaFolder.absolutePath) imageMediaFolderPaths.add(videoMediaFolder.absolutePath)
} }
arbitraryDataString = arbitraryDataProvider.getValue(ACCOUNT_NAME_GLOBAL, KEY_MEDIA_FOLDERS) val arbitraryDataString = arbitraryDataProvider.getValue(ACCOUNT_NAME_GLOBAL, KEY_MEDIA_FOLDERS)
if (!TextUtils.isEmpty(arbitraryDataString)) { if (!TextUtils.isEmpty(arbitraryDataString)) {
mediaFoldersModel = gson.fromJson(arbitraryDataString, MediaFoldersModel::class.java) mediaFoldersModel = gson.fromJson(arbitraryDataString, MediaFoldersModel::class.java)
// merge new detected paths with already notified ones // merge new detected paths with already notified ones
@ -121,7 +121,7 @@ class MediaFoldersDetectionWork constructor(
if (preferences.isShowMediaScanNotifications) { if (preferences.isShowMediaScanNotifications) {
imageMediaFolderPaths.removeAll(mediaFoldersModel.imageMediaFolders) imageMediaFolderPaths.removeAll(mediaFoldersModel.imageMediaFolders)
videoMediaFolderPaths.removeAll(mediaFoldersModel.videoMediaFolders) videoMediaFolderPaths.removeAll(mediaFoldersModel.videoMediaFolders)
if (!imageMediaFolderPaths.isEmpty() || !videoMediaFolderPaths.isEmpty()) { if (imageMediaFolderPaths.isNotEmpty() || videoMediaFolderPaths.isNotEmpty()) {
val allUsers = userAccountManager.allUsers val allUsers = userAccountManager.allUsers
val activeUsers: MutableList<User> = ArrayList() val activeUsers: MutableList<User> = ArrayList()
for (user in allUsers) { for (user in allUsers) {