|
@@ -49,7 +49,7 @@ import com.owncloud.android.datamodel.MediaFoldersModel
|
|
import com.owncloud.android.datamodel.MediaProvider
|
|
import com.owncloud.android.datamodel.MediaProvider
|
|
import com.owncloud.android.datamodel.SyncedFolderProvider
|
|
import com.owncloud.android.datamodel.SyncedFolderProvider
|
|
import com.owncloud.android.lib.common.utils.Log_OC
|
|
import com.owncloud.android.lib.common.utils.Log_OC
|
|
-import com.owncloud.android.ui.activity.ManageAccountsActivity
|
|
|
|
|
|
+import com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOVAL
|
|
import com.owncloud.android.ui.activity.SyncedFoldersActivity
|
|
import com.owncloud.android.ui.activity.SyncedFoldersActivity
|
|
import com.owncloud.android.ui.notifications.NotificationUtils
|
|
import com.owncloud.android.ui.notifications.NotificationUtils
|
|
import com.owncloud.android.utils.ThemeUtils
|
|
import com.owncloud.android.utils.ThemeUtils
|
|
@@ -123,10 +123,7 @@ class MediaFoldersDetectionWork constructor(
|
|
val allUsers = userAccountManager.allUsers
|
|
val allUsers = userAccountManager.allUsers
|
|
val activeUsers: MutableList<User> = ArrayList()
|
|
val activeUsers: MutableList<User> = ArrayList()
|
|
for (account in allUsers) {
|
|
for (account in allUsers) {
|
|
- if (!arbitraryDataProvider.getBooleanValue(
|
|
|
|
- account.toPlatformAccount(),
|
|
|
|
- ManageAccountsActivity.PENDING_FOR_REMOVAL
|
|
|
|
- )
|
|
|
|
|
|
+ if (!arbitraryDataProvider.getBooleanValue(account.toPlatformAccount(), PENDING_FOR_REMOVAL)
|
|
) {
|
|
) {
|
|
activeUsers.add(account)
|
|
activeUsers.add(account)
|
|
}
|
|
}
|
|
@@ -176,7 +173,8 @@ class MediaFoldersDetectionWork constructor(
|
|
} else {
|
|
} else {
|
|
mediaFoldersModel = MediaFoldersModel(imageMediaFolderPaths, videoMediaFolderPaths)
|
|
mediaFoldersModel = MediaFoldersModel(imageMediaFolderPaths, videoMediaFolderPaths)
|
|
arbitraryDataProvider.storeOrUpdateKeyValue(
|
|
arbitraryDataProvider.storeOrUpdateKeyValue(
|
|
- ACCOUNT_NAME_GLOBAL, KEY_MEDIA_FOLDERS,
|
|
|
|
|
|
+ ACCOUNT_NAME_GLOBAL,
|
|
|
|
+ KEY_MEDIA_FOLDERS,
|
|
gson.toJson(mediaFoldersModel)
|
|
gson.toJson(mediaFoldersModel)
|
|
)
|
|
)
|
|
}
|
|
}
|
|
@@ -195,7 +193,8 @@ class MediaFoldersDetectionWork constructor(
|
|
intent.putExtra(SyncedFoldersActivity.EXTRA_SHOW_SIDEBAR, true)
|
|
intent.putExtra(SyncedFoldersActivity.EXTRA_SHOW_SIDEBAR, true)
|
|
val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT)
|
|
val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT)
|
|
val notificationBuilder = NotificationCompat.Builder(
|
|
val notificationBuilder = NotificationCompat.Builder(
|
|
- context, NotificationUtils.NOTIFICATION_CHANNEL_GENERAL
|
|
|
|
|
|
+ context,
|
|
|
|
+ NotificationUtils.NOTIFICATION_CHANNEL_GENERAL
|
|
)
|
|
)
|
|
.setSmallIcon(R.drawable.notification_icon)
|
|
.setSmallIcon(R.drawable.notification_icon)
|
|
.setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
|
|
.setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
|