Skip to content

fix(account): switching #17739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 5 commits into from
Oct 5, 2026
Merged

fix(account): switching #17739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31de9aa
dont use singleton instance for thumbnails
alperozturk96 Sep 30, 2026
37ce1b5
make the theme cache (memory-only) user account name aware instead url
alperozturk96 Sep 30, 2026
2ee31cb
set account name as well
alperozturk96 Sep 30, 2026
fe01e39
use Provider for view theme utils since ViewThemeUtils can change and…
alperozturk96 Sep 30, 2026
f9f16f7
OCCapability capability = result.getResultData();
alperozturk96 Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapterIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
fileThumbnailGenerator = FileThumbnailGenerator(
storageManager = Provider { sut.storageManager },
preferences = preferences,
viewThemeUtils = sut.viewThemeUtils,
viewThemeUtils = Provider { sut.viewThemeUtils },
context = targetContext,
accountManager = accountManager
),
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/nextcloud/client/di/AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ AppNotificationManager notificationsManager(Context context,
return new AppNotificationManagerImpl(context,
context.getResources(),
platformNotificationsManager,
viewThemeUtilsProvider.get());
viewThemeUtilsProvider);
}

@Provides
Expand Down Expand Up @@ -274,7 +274,6 @@ CertificateValidator certificateValidator() {
}

@Provides
@Singleton
FolderThumbnailGenerator folderThumbnailGenerator(
AppPreferences appPreferences,
ViewThemeUtils viewThemeUtils,
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import com.owncloud.android.ui.preview.PreviewImageActivity
import com.owncloud.android.ui.preview.PreviewImageFragment
import com.owncloud.android.utils.theme.ViewThemeUtils
import javax.inject.Inject
import javax.inject.Provider

class AppNotificationManagerImpl @Inject constructor(
private val context: Context,
private val resources: Resources,
private val platformNotificationsManager: NotificationManager,
private val viewThemeUtils: ViewThemeUtils
private val viewThemeUtils: Provider<ViewThemeUtils>
) : AppNotificationManager {

companion object {
Expand All @@ -39,7 +40,7 @@ class AppNotificationManagerImpl @Inject constructor(
private fun builder(channelId: String): NotificationCompat.Builder {
val builder =
NotificationCompat.Builder(context, channelId)
viewThemeUtils.androidx.themeNotificationCompatBuilder(context, builder)
viewThemeUtils.get().androidx.themeNotificationCompatBuilder(context, builder)
return builder
}

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/nextcloud/utils/thumbnail/FileThumbnailGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import kotlin.math.roundToInt
class FileThumbnailGenerator @Inject constructor(
private val storageManager: Provider<FileDataStorageManager>,
private val preferences: AppPreferences,
private val viewThemeUtils: ViewThemeUtils,
private val viewThemeUtils: Provider<ViewThemeUtils>,
private val context: Context,
private val accountManager: UserAccountManager
) {
Expand Down Expand Up @@ -222,10 +222,11 @@ class FileThumbnailGenerator @Inject constructor(
}
}

private fun OCFile.mimeIcon(): Drawable? = MimeTypeUtil.getFileTypeIcon(mimeType, fileName, context, viewThemeUtils)
private fun OCFile.mimeIcon(): Drawable? =
MimeTypeUtil.getFileTypeIcon(mimeType, fileName, context, viewThemeUtils.get())

private fun OCFile.placeholder(): Bitmap = synchronized(placeholders) {
placeholders.getOrPut(mimeType.orEmpty()) {
placeholders.getOrPut("${accountManager.user.accountName}:${mimeType.orEmpty()}") {
val drawable = mimeIcon()
?: ResourcesCompat.getDrawable(context.resources, R.drawable.file_image, null)
?: Color.GRAY.toDrawable()
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/nextcloud/utils/thumbnail/ThumbnailGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ package com.nextcloud.utils.thumbnail
import android.widget.ImageView
import com.owncloud.android.datamodel.OCFile
import javax.inject.Inject
import javax.inject.Singleton

@Singleton
class ThumbnailGenerator @Inject constructor(
val fileThumbnailGenerator: FileThumbnailGenerator,
val folderThumbnailGenerator: FolderThumbnailGenerator
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/owncloud/android/utils/theme/MaterialSchemesProviderImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ internal class MaterialSchemesProviderImpl @Inject constructor(
private val themeCache: MutableMap<String, MaterialSchemes> = ConcurrentHashMap()

override fun getMaterialSchemesForUser(user: User): MaterialSchemes {
val url: String = user.server.uri.toString()

@alperozturk96 alperozturk96 Sep 30, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

user.server.uri.toString() -> only gives us something like http://localhost:8080

val accountName = user.accountName

if (!themeCache.containsKey(url)) {
if (!themeCache.containsKey(accountName)) {
val capability = CapabilityUtils.getCapability(user, context)
themeCache[url] = getMaterialSchemesForCapability(capability)
themeCache[accountName] = getMaterialSchemesForCapability(capability)
}

return themeCache[url]!!
return themeCache[accountName]!!
}

override fun getMaterialSchemesForCapability(capability: OCCapability): MaterialSchemes {
Expand Down
Loading