@@ -9,6 +9,7 @@ package com.nextcloud.ui.fileactions
99
1010import android.content.Context
1111import android.content.Intent
12+ import android.graphics.drawable.Drawable
1213import android.os.Bundle
1314import android.view.LayoutInflater
1415import android.view.View
@@ -87,32 +88,37 @@ class ClientIntegration(
8788 val client = OwnCloudClientManagerFactory .getDefaultSingleton()
8889 .getNextcloudClientFor(user.toOwnCloudAccount(), context)
8990
90- val drawable = GlideHelper .fetchDrawable(
91- context,
92- client,
93- client.baseUri.toString() + endpoint.icon,
94- width = px,
95- height = px
96- )?.mutate()
97-
98- val tintedDrawable = drawable?.let { viewThemeUtils.platform.tintDrawable(context, it) }
91+ val drawable = GlideHelper
92+ .getDrawable(context, client, client.baseUri.toString() + endpoint.icon)?.mutate()
9993
10094 withContext(Dispatchers .Main ) {
101- icon.setImageDrawable(tintedDrawable)
95+ val tintedDrawable = drawable?.let { viewThemeUtils.platform.tintDrawable(context, it) }
96+ if (tintedDrawable != null ) {
97+ icon.setImageDrawable(tintedDrawable)
98+ } else {
99+ getDefaultTintedIconDrawable(viewThemeUtils)?.let {
100+ icon.setImageDrawable(it)
101+ }
102+ }
102103 }
103104 }
104105 } else {
105- val tintedDrawable = viewThemeUtils.platform.tintDrawable(
106- context,
107- AppCompatResources .getDrawable(context, R .drawable.ic_activity)!!
108- )
109-
110- icon.setImageDrawable(tintedDrawable)
106+ getDefaultTintedIconDrawable(viewThemeUtils)?.let {
107+ icon.setImageDrawable(it)
108+ }
111109 }
112110 }
113111 return itemBinding.root
114112 }
115113
114+ private fun getDefaultTintedIconDrawable (viewThemeUtils : ViewThemeUtils ): Drawable ? {
115+ val drawable = AppCompatResources .getDrawable(context, R .drawable.ic_activity) ? : return null
116+ return viewThemeUtils.platform.tintDrawable(
117+ context,
118+ drawable
119+ )
120+ }
121+
116122 private fun requestClientIntegration (endpoint : Endpoint , fileId : String , filePath : String ) {
117123 sheet.lifecycleScope.launch(Dispatchers .IO ) {
118124 val client = OwnCloudClientManagerFactory .getDefaultSingleton()
0 commit comments