Communication: Show profile picture

app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/db/AppDatabase.kt

@@ -29,7 +29,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.push.communication_not
         CommunicationMessageEntity::class
     ],
     exportSchema = true,
-    version = 11,
+    version = 12,
 )
 @TypeConverters(RoomTypeConverters::class)
 abstract class AppDatabase : RoomDatabase() {

app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/MainActivity.kt

@@ -36,6 +36,7 @@ import de.tum.informatics.www1.artemis.native_app.core.ui.LocalLinkOpener
 import de.tum.informatics.www1.artemis.native_app.core.ui.LocalWindowSizeClassProvider
 import de.tum.informatics.www1.artemis.native_app.core.ui.WindowSizeClassProvider
 import de.tum.informatics.www1.artemis.native_app.core.ui.alert.TextAlertDialog
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.LocalArtemisImageProvider
 import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.courseRegistration
 import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.navigateToCourseRegistration
 import de.tum.informatics.www1.artemis.native_app.feature.courseview.ui.course_overview.course
@@ -53,7 +54,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.lectureview.navigateTo
 import de.tum.informatics.www1.artemis.native_app.feature.login.LoginScreen
 import de.tum.informatics.www1.artemis.native_app.feature.login.loginScreen
 import de.tum.informatics.www1.artemis.native_app.feature.login.navigateToLogin
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.ProvideLocalVisibleMetisContextManager
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.LocalVisibleMetisContextManager
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContextManager
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContextReporter
@@ -73,6 +74,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.android.get
+import org.koin.compose.koinInject
 
 /**
  * Main and only activity used in the android app.
@@ -134,8 +136,8 @@ class MainActivity : AppCompatActivity(),
 
         setContent {
             AppTheme {
-                ProvideLocalVisibleMetisContextManager(
-                    visibleMetisContextManager = visibleMetisContextManager
+                CompositionLocalProvider(
+                    LocalVisibleMetisContextManager provides visibleMetisContextManager,
                 ) {
                     val navController = rememberNavController()
 
@@ -251,7 +253,8 @@ class MainActivity : AppCompatActivity(),
 
         CompositionLocalProvider(
             LocalWindowSizeClassProvider provides windowSizeClassProvider,
-            LocalLinkOpener provides linkOpener
+            LocalLinkOpener provides linkOpener,
+            LocalArtemisImageProvider provides koinInject()
         ) {
             // Use jetpack compose navigation for the navigation logic.
             NavHost(navController = navController, startDestination = startDestination) {

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/common/text_unit_util.kt

@@ -0,0 +1,10 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.common
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.sp
+
+val TextUnit.nonScaledSp
+    @Composable
+    get() = (this.value / LocalDensity.current.fontScale).sp

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/remote_images/ArtemisImageProvider.kt

@@ -0,0 +1,28 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.remote_images
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.compositionLocalOf
+import coil.compose.AsyncImagePainter
+import coil.compose.rememberAsyncImagePainter
+import coil.request.ImageRequest
+
+
+val LocalArtemisImageProvider = compositionLocalOf<ArtemisImageProvider> { error("No ArtemisImageProvider provided") }
+
+/**
+ * Provides a way to load images from the Artemis server. This interface implementation takes care
+ * of authentication and the applicable Artemis server URL.
+ */
+interface ArtemisImageProvider {
+
+    @Composable
+    fun rememberArtemisImageRequest(
+        imagePath: String,
+    ): ImageRequest
+
+    @Composable
+    fun rememberArtemisAsyncImagePainter(
+        imagePath: String,
+    ): AsyncImagePainter = rememberAsyncImagePainter(model = rememberArtemisImageRequest(imagePath))
+}
+

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/remote_images/ArtemisImageProviderImpl.kt

@@ -0,0 +1,37 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.remote_images
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import coil.request.ImageRequest
+import de.tum.informatics.www1.artemis.native_app.core.datastore.AccountService
+import de.tum.informatics.www1.artemis.native_app.core.datastore.ServerConfigurationService
+import de.tum.informatics.www1.artemis.native_app.core.datastore.authToken
+
+class ArtemisImageProviderImpl(
+    private val accountService: AccountService,
+    private val serverConfigurationService: ServerConfigurationService,
+) : ArtemisImageProvider {
+
+    private val imageProvider = BaseImageProviderImpl()
+
+    @Composable
+    override fun rememberArtemisImageRequest(imagePath: String): ImageRequest {
+        val serverUrl by serverConfigurationService.serverUrl.collectAsState(initial = "")
+        val authToken by accountService.authToken.collectAsState(initial = "")
+
+        val context = LocalContext.current
+        return remember(serverUrl, authToken, imagePath) {
+            imageProvider.createImageRequest(
+                context = context,
+                imagePath = imagePath,
+                serverUrl = serverUrl,
+                authorizationToken = authToken,
+                memoryCacheKey = serverUrl + imagePath
+            )
+        }
+    }
+
+}

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/remote_images/BaseImageProviderImpl.kt

@@ -0,0 +1,50 @@
+package de.tum.informatics.www1.artemis.native_app.core.ui.remote_images
+
+import android.content.Context
+import coil.ImageLoader
+import coil.request.ImageRequest
+import io.ktor.http.HttpHeaders
+import io.ktor.http.URLBuilder
+import io.ktor.http.appendPathSegments
+
+class BaseImageProviderImpl : BaseImageProvider {
+    override fun createImageRequest(
+        context: Context,
+        imagePath: String,
+        serverUrl: String,
+        authorizationToken: String,
+        memoryCacheKey: String?
+    ): ImageRequest {
+        val imageUrl = URLBuilder(serverUrl).appendPathSegments(imagePath).buildString()
+
+        val builder = ImageRequest.Builder(context)
+            .addHeader(HttpHeaders.Cookie, "jwt=$authorizationToken")
+            .data(imageUrl)
+            // The following line is needed to for the AsyncImagePainter to work correctly, see:
+            // https://stackoverflow.com/a/74705550/13366254
+            .size(coil.size.Size.ORIGINAL)
+
+        memoryCacheKey?.let {
+            builder.memoryCacheKey(it)
+        }
+        return builder.build()
+    }
+
+    override fun createImageLoader(
+        context: Context,
+        authorizationToken: String
+    ): ImageLoader {
+        return ImageLoader.Builder(context)
+            .okHttpClient {
+                okhttp3.OkHttpClient.Builder()
+                    .addInterceptor { chain ->
+                        val request = chain.request().newBuilder()
+                            .addHeader(HttpHeaders.Cookie, "jwt=$authorizationToken")
+                            .build()
+                        chain.proceed(request)
+                    }
+                    .build()
+            }
+            .build()
+    }
+}

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/remote_images/CourseImageProvider.kt

@@ -19,7 +19,7 @@ interface CourseImageProvider {
 }
 
 private object DefaultCourseImageProvider : CourseImageProvider {
-    private val imageProvider = DefaultImageProvider()
+    private val imageProvider = BaseImageProviderImpl()
 
     @Composable
     override fun rememberCourseImagePainter(

core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/ui_module.kt

@@ -1,6 +1,9 @@
 package de.tum.informatics.www1.artemis.native_app.core.ui
 
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.ArtemisImageProvider
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.ArtemisImageProviderImpl
 import org.koin.dsl.module
 
 val uiModule = module {
+    single<ArtemisImageProvider> { ArtemisImageProviderImpl(get(), get()) }
 }

feature/course-view/src/debug/kotlin/de/tum/informatics/www1/artemis/native_app/feature/courseview/MessagingScreenshots.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -37,7 +38,7 @@ import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.d
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.content.dto.conversation.OneToOneChat
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.db.pojo.PostPojo
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.ui.humanReadableName
-import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.ProvideLocalVisibleMetisContextManager
+import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.LocalVisibleMetisContextManager
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContext
 import de.tum.informatics.www1.artemis.native_app.feature.metis.shared.visiblemetiscontextreporter.VisibleMetisContextManager
 import kotlinx.coroutines.CompletableDeferred
@@ -195,6 +196,15 @@ fun `Metis - Conversation Channel`() {
         ),
     ).reversed()
 
+    val visibleMetisContextManagerStub = object : VisibleMetisContextManager {
+        override fun registerMetisContext(metisContext: VisibleMetisContext) =
+            Unit
+
+        override fun unregisterMetisContext(metisContext: VisibleMetisContext) =
+            Unit
+    }
+
+    // TODO: Provide artemis image provider
     ScreenshotFrame(title = "Send and receive messages directly from the app") {
         CourseUiScreen(
             modifier = Modifier.fillMaxSize(),
@@ -204,14 +214,8 @@ fun `Metis - Conversation Channel`() {
             exerciseTabContent = { },
             lectureTabContent = { },
             communicationTabContent = {
-                ProvideLocalVisibleMetisContextManager(
-                    visibleMetisContextManager = object : VisibleMetisContextManager {
-                        override fun registerMetisContext(metisContext: VisibleMetisContext) =
-                            Unit
-
-                        override fun unregisterMetisContext(metisContext: VisibleMetisContext) =
-                            Unit
-                    }
+                CompositionLocalProvider(
+                    LocalVisibleMetisContextManager provides visibleMetisContextManagerStub,
                 ) {
                     ConversationChatListScreen(
                         modifier = Modifier.fillMaxSize(),
@@ -284,6 +288,7 @@ private fun generateMessage(
             authorName = name,
             authorRole = UserRole.USER,
             authorId = authorId,
+            authorImageUrl = null,
             creationDate = time,
             updatedDate = null,
             resolved = false,

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/service/storage/impl/MetisStorageServiceImpl.kt

@@ -117,7 +117,8 @@ internal class MetisStorageServiceImpl(
             val user = MetisUserEntity(
                 serverId = serverId,
                 id = authorId,
-                displayName = author?.name ?: "NULL"
+                displayName = author?.name ?: "NULL",
+                imageUrl = author?.imageUrl
             )
 
             return Triple(basePost, answer, user)
@@ -138,7 +139,8 @@ internal class MetisStorageServiceImpl(
             ) to MetisUserEntity(
                 serverId = serverId,
                 id = userId,
-                displayName = user?.name ?: return null
+                imageUrl = user?.imageUrl,
+                displayName = user?.name ?: return null,
             )
         }
 
@@ -443,7 +445,8 @@ internal class MetisStorageServiceImpl(
         val postingAuthor = MetisUserEntity(
             serverId = host,
             id = sp.author?.id ?: return null,
-            displayName = sp.author?.name ?: return null
+            displayName = sp.author?.name ?: return null,
+            imageUrl = sp.author?.imageUrl
         )
 
         val (standaloneBasePosting, standalonePosting) = sp.asDb(
@@ -466,7 +469,9 @@ internal class MetisStorageServiceImpl(
         }
 
         // First insert the users as they have no dependencies
-        metisDao.updateUsers(standalonePostReactionsUsers)
+        // TODO: Do not update existing users, as for the reactions we always get null as image_url
+        //       Can be undone when https://github.com/ls1intum/Artemis/pull/9897 is merged.
+//        metisDao.updateUsers(standalonePostReactionsUsers)
         metisDao.insertUsers(standalonePostReactionsUsers)
 
         metisDao.insertOrUpdateUser(postingAuthor)
@@ -571,7 +576,10 @@ internal class MetisStorageServiceImpl(
         val answerPostReactionUsers = answerPostReactionsWithUsers.map { it.second }
 
         metisDao.insertOrUpdateUser(metisUserEntity)
-        metisDao.updateUsers(answerPostReactionUsers)
+
+        // TODO: Do not update existing users, as for the reactions we always get null as image_url
+        //       Can be undone when https://github.com/ls1intum/Artemis/pull/9897 is merged.
+//        metisDao.updateUsers(answerPostReactionUsers)
         metisDao.insertUsers(answerPostReactionUsers)
 
         if (isNewPost) {

feature/metis/conversation/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/ConversationViewModel.kt

@@ -27,7 +27,7 @@ import de.tum.informatics.www1.artemis.native_app.core.model.exercise.Programmin
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.QuizExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.TextExercise
 import de.tum.informatics.www1.artemis.native_app.core.model.exercise.UnknownExercise
-import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.DefaultImageProvider
+import de.tum.informatics.www1.artemis.native_app.core.ui.remote_images.BaseImageProviderImpl
 import de.tum.informatics.www1.artemis.native_app.core.ui.serverUrlStateFlow
 import de.tum.informatics.www1.artemis.native_app.core.websocket.WebsocketProvider
 import de.tum.informatics.www1.artemis.native_app.feature.metis.conversation.R
@@ -710,7 +710,7 @@ internal open class ConversationViewModel(
 
     fun createMarkdownImageLoader(context: Context): Deferred<ImageLoader> {
         return viewModelScope.async(coroutineContext) {
-            val imageProvider = DefaultImageProvider()
+            val imageProvider = BaseImageProviderImpl()
             val authorizationToken = accountService.authToken.first()
             imageProvider.createImageLoader(context, authorizationToken)
         }