diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt index 3a15a0136..8d399f1ec 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt +++ b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt @@ -112,14 +112,8 @@ interface NcApiCoroutines { suspend fun deleteConversationAvatar(@Header("Authorization") authorization: String, @Url url: String): RoomOverall @POST - suspend fun archiveConversation( - @Header("Authorization") authorization: String?, - @Url url: String? - ): GenericOverall + suspend fun archiveConversation(@Header("Authorization") authorization: String, @Url url: String): GenericOverall @DELETE - suspend fun unarchiveConversation( - @Header("Authorization") authorization: String?, - @Url url: String? - ): GenericOverall + suspend fun unarchiveConversation(@Header("Authorization") authorization: String, @Url url: String): GenericOverall } diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 401dd114e..8d21c21e9 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -751,7 +751,8 @@ class ConversationInfoActivity : this.lifecycleScope.launch { if (conversation!!.hasArchived) { viewModel.unarchiveConversation(conversationUser, conversationToken) - binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24)) + binding.archiveConversationIcon + .setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24)) binding.archiveConversationText.text = resources.getString(R.string.archive_conversation) binding.archiveConversationTextHint.text = resources.getString(R.string.archive_hint) } else { diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt index 4127f2dc3..1926cbf0e 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt @@ -71,8 +71,9 @@ class RepositoryModule { @Provides fun provideConversationsRepository( - ncApi: NcApi, ncApiCoroutines: NcApiCoroutines, userProvider: - CurrentUserProviderNew + ncApi: NcApi, + ncApiCoroutines: NcApiCoroutines, + userProvider: CurrentUserProviderNew ): ConversationsRepository { return ConversationsRepositoryImpl(ncApi, ncApiCoroutines, userProvider) } diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt index 49011f1ca..5b93f34ca 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt @@ -246,7 +246,6 @@ object Migrations { } fun addArchiveConversations(db: SupportSQLiteDatabase) { - try { db.execSQL( "ALTER TABLE Conversations " +