Archived Conversations 🗃️

app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/11.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 11,
-    "identityHash": "bc802cadfdef41d3eb94ffbb0729eb89",
+      "identityHash": "7edb537b6987d0de6586a6760c970958",
     "entities": [
       {
         "tableName": "User",
@@ -138,7 +138,7 @@
       },
       {
         "tableName": "Conversations",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `displayName` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `avatarVersion` TEXT NOT NULL, `callFlag` INTEGER NOT NULL, `callRecording` INTEGER NOT NULL, `callStartTime` INTEGER NOT NULL, `canDeleteConversation` INTEGER NOT NULL, `canLeaveConversation` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `description` TEXT NOT NULL, `hasCall` INTEGER NOT NULL, `hasPassword` INTEGER NOT NULL, `isCustomAvatar` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `lastMessage` TEXT, `lastPing` INTEGER NOT NULL, `lastReadMessage` INTEGER NOT NULL, `lobbyState` TEXT NOT NULL, `lobbyTimer` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `name` TEXT NOT NULL, `notificationCalls` INTEGER NOT NULL, `notificationLevel` TEXT NOT NULL, `objectType` TEXT NOT NULL, `participantType` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `readOnly` TEXT NOT NULL, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, `sessionId` TEXT NOT NULL, `status` TEXT, `statusClearAt` INTEGER, `statusIcon` TEXT, `statusMessage` TEXT, `type` TEXT NOT NULL, `unreadMention` INTEGER NOT NULL, `unreadMentionDirect` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )",
+          "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `displayName` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `avatarVersion` TEXT NOT NULL, `callFlag` INTEGER NOT NULL, `callRecording` INTEGER NOT NULL, `callStartTime` INTEGER NOT NULL, `canDeleteConversation` INTEGER NOT NULL, `canLeaveConversation` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `description` TEXT NOT NULL, `hasCall` INTEGER NOT NULL, `hasPassword` INTEGER NOT NULL, `isCustomAvatar` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `lastMessage` TEXT, `lastPing` INTEGER NOT NULL, `lastReadMessage` INTEGER NOT NULL, `lobbyState` TEXT NOT NULL, `lobbyTimer` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `name` TEXT NOT NULL, `notificationCalls` INTEGER NOT NULL, `notificationLevel` TEXT NOT NULL, `objectType` TEXT NOT NULL, `participantType` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `readOnly` TEXT NOT NULL, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, `sessionId` TEXT NOT NULL, `status` TEXT, `statusClearAt` INTEGER, `statusIcon` TEXT, `statusMessage` TEXT, `type` TEXT NOT NULL, `unreadMention` INTEGER NOT NULL, `unreadMentionDirect` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, `hasArchived` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "internalId",
@@ -409,6 +409,12 @@
             "columnName": "unreadMessages",
             "affinity": "INTEGER",
             "notNull": true
+          },
+            {
+                "fieldPath": "hasArchived",
+                "columnName": "hasArchived",
+                "affinity": "INTEGER",
+                "notNull": true
           }
         ],
         "primaryKey": {
@@ -713,7 +719,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'bc802cadfdef41d3eb94ffbb0729eb89')"
+        "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7edb537b6987d0de6586a6760c970958')"
     ]
   }
 }

app/src/main/java/com/nextcloud/talk/api/NcApi.java

@@ -727,4 +727,12 @@ Observable<TalkBan> banActor(@Header("Authorization") String authorization,
     @DELETE
     Observable<GenericOverall> unbanActor(@Header("Authorization") String authorization,
                                           @Url String url);
+
+    @POST
+    Observable<GenericOverall> archiveConversation(@Header("Authorization") String authorization,
+                                                   @Url String url);
+
+    @DELETE
+    Observable<GenericOverall> unarchiveConversation(@Header("Authorization") String authorization,
+                                                     @Url String url);
 }

app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -741,6 +741,30 @@ class ConversationInfoActivity :
             }
         }
 
+        if (!spreedCapabilities.features!!.contains(ARCHIVED_CONVERSATIONS)) {
+            binding.archiveConversationBtn.visibility = GONE
+        }
+
+        binding.archiveConversationBtn.setOnClickListener {
+            if (conversation!!.hasArchived) {
+                viewModel.unarchiveConversation(conversationUser, conversationToken)
+                binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24))
+                binding.archiveConversationText.text = resources.getString(R.string.archive_conversation)
+            } else {
+                viewModel.archiveConversation(conversationUser, conversationToken)
+                binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.ic_eye))
+                binding.archiveConversationText.text = resources.getString(R.string.unarchive_conversation)
+            }
+        }
+
+        if (conversation!!.hasArchived) {
+            binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.ic_eye))
+            binding.archiveConversationText.text = resources.getString(R.string.unarchive_conversation)
+        } else {
+            binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24))
+            binding.archiveConversationText.text = resources.getString(R.string.archive_conversation)
+        }
+
         if (!isDestroyed) {
             binding.dangerZoneOptions.visibility = VISIBLE
 
@@ -1445,6 +1469,7 @@ class ConversationInfoActivity :
         private const val DEMOTE_OR_PROMOTE = 1
         private const val REMOVE_FROM_CONVERSATION = 2
         private const val BAN_FROM_CONVERSATION = 3
+        private const val ARCHIVED_CONVERSATIONS = "archived-conversations"
     }
 
     /**

app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt

@@ -18,6 +18,7 @@ import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.json.capabilities.SpreedCapability
 import com.nextcloud.talk.models.json.generic.GenericOverall
 import com.nextcloud.talk.models.json.participants.TalkBan
+import com.nextcloud.talk.repositories.conversations.ConversationsRepository
 import com.nextcloud.talk.utils.ApiUtils
 import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -26,7 +27,8 @@ import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 
 class ConversationInfoViewModel @Inject constructor(
-    private val chatNetworkDataSource: ChatNetworkDataSource
+    private val chatNetworkDataSource: ChatNetworkDataSource,
+    private val conversationsRepository: ConversationsRepository
 ) : ViewModel() {
 
     object LifeCycleObserver : DefaultLifecycleObserver {
@@ -200,6 +202,56 @@ class ConversationInfoViewModel @Inject constructor(
             })
     }
 
+    fun archiveConversation(user: User, token: String) {
+        val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V1))
+        val url = ApiUtils.getUrlForArchive(apiVersion, user.baseUrl, token)
+        conversationsRepository.archiveConversation(user.getCredentials(), url)
+            .subscribeOn(Schedulers.io())
+            ?.observeOn(AndroidSchedulers.mainThread())
+            ?.subscribe(object : Observer<GenericOverall> {
+                override fun onSubscribe(p0: Disposable) {
+                    // unused
+                }
+
+                override fun onError(e: Throwable) {
+                    Log.d("Julius", "Error in archive $e")
+                }
+
+                override fun onComplete() {
+                    // unused atm
+                }
+
+                override fun onNext(n: GenericOverall) {
+                    Log.d("Julius", "Archived successful")
+                }
+            })
+    }
+
+    fun unarchiveConversation(user: User, token: String) {
+        val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V1))
+        val url = ApiUtils.getUrlForArchive(apiVersion, user.baseUrl, token)
+        conversationsRepository.unarchiveConversation(user.getCredentials(), url)
+            .subscribeOn(Schedulers.io())
+            ?.observeOn(AndroidSchedulers.mainThread())
+            ?.subscribe(object : Observer<GenericOverall> {
+                override fun onSubscribe(p0: Disposable) {
+                    // unused
+                }
+
+                override fun onError(e: Throwable) {
+                    Log.d("Julius", "Error in unarchive $e")
+                }
+
+                override fun onComplete() {
+                    // unused atm
+                }
+
+                override fun onNext(n: GenericOverall) {
+                    Log.d("Julius", "unArchived successful")
+                }
+            })
+    }
+
     inner class GetRoomObserver : Observer<ConversationModel> {
         override fun onSubscribe(d: Disposable) {
             // unused atm

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -210,7 +210,9 @@ class ConversationsListActivity :
     private var filterState =
         mutableMapOf(
             FilterConversationFragment.MENTION to false,
-            FilterConversationFragment.UNREAD to false
+            FilterConversationFragment.UNREAD to false,
+            FilterConversationFragment.ARCHIVE to false,
+            FilterConversationFragment.DEFAULT to true
         )
     val searchBehaviorSubject = BehaviorSubject.createDefault(false)
     private lateinit var accountIconBadge: BadgeDrawable
@@ -380,7 +382,7 @@ class ConversationsListActivity :
                     sortConversations(conversationItemsWithHeader)
 
                     // Filter Conversations
-                    if (!filterState.containsValue(true)) filterableConversationItems = conversationItems
+                    if (!containsTrue()) filterableConversationItems = conversationItems
                     filterConversation()
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     Handler().postDelayed({ checkToShowUnreadBubble() }, UNREAD_BUBBLE_DELAY.toLong())
@@ -395,6 +397,14 @@ class ConversationsListActivity :
         }
     }
 
+    private fun containsTrue(): Boolean {
+        for ((k, v) in filterState) {
+            if (k != FilterConversationFragment.DEFAULT && v) return true
+        }
+
+        return false
+    }
+
     fun filterConversation() {
         val accountId = UserIdUtils.getIdForUser(userManager.currentUser.blockingGet())
         filterState[FilterConversationFragment.UNREAD] = (
@@ -413,22 +423,24 @@ class ConversationsListActivity :
             ).blockingGet()?.value ?: ""
             ) == "true"
 
+        filterState[FilterConversationFragment.ARCHIVE] = (
+            arbitraryStorageManager.getStorageSetting(
+                accountId,
+                FilterConversationFragment.ARCHIVE,
+                ""
+            ).blockingGet()?.value ?: ""
+            ) == "true"
+
         val newItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
-        if (filterState[FilterConversationFragment.UNREAD] == false &&
-            filterState[FilterConversationFragment.MENTION] == false
-        ) {
-            adapter!!.updateDataSet(conversationItems, true)
-        } else {
-            val items = conversationItems
-            for (i in items) {
-                val conversation = (i as ConversationItem).model
-                if (filter(conversation)) {
-                    newItems.add(i)
-                }
+        val items = conversationItems
+        for (i in items) {
+            val conversation = (i as ConversationItem).model
+            if (filter(conversation)) {
+                newItems.add(i)
             }
-            adapter!!.updateDataSet(newItems, true)
-            setFilterableItems(newItems)
         }
+        adapter!!.updateDataSet(newItems, true)
+        setFilterableItems(newItems)
 
         updateFilterConversationButtonColor()
     }
@@ -449,10 +461,19 @@ class ConversationsListActivity :
                             )
 
                     FilterConversationFragment.UNREAD -> result = result && (conversation.unreadMessages > 0)
+
+                    FilterConversationFragment.DEFAULT -> {
+                        result = if (filterState[FilterConversationFragment.ARCHIVE] == true) {
+                            result && conversation.hasArchived
+                        } else {
+                            result && !conversation.hasArchived
+                        }
+                    }
                 }
             }
         }
 
+        Log.d("Julius", "Conversation: ${conversation.name} Result: $result")
         return result
     }
 
@@ -649,7 +670,7 @@ class ConversationsListActivity :
                 override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                     initSearchDisposable()
                     adapter!!.setHeadersShown(true)
-                    if (!filterState.containsValue(true)) filterableConversationItems = searchableConversationItems
+                    if (!containsTrue()) filterableConversationItems = searchableConversationItems
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     adapter!!.showAllHeaders()
                     binding.swipeRefreshLayoutView?.isEnabled = false
@@ -659,7 +680,7 @@ class ConversationsListActivity :
 
                 override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
                     adapter!!.setHeadersShown(false)
-                    if (!filterState.containsValue(true)) filterableConversationItems = conversationItemsWithHeader
+                    if (!containsTrue()) filterableConversationItems = conversationItemsWithHeader
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     adapter!!.hideAllHeaders()
                     if (searchHelper != null) {
@@ -1826,7 +1847,7 @@ class ConversationsListActivity :
     }
 
     fun updateFilterConversationButtonColor() {
-        if (filterState.containsValue(true)) {
+        if (containsTrue()) {
             binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) }
         } else {
             binding.filterConversationsButton.let {

app/src/main/java/com/nextcloud/talk/data/database/mappers/ConversationMapUtils.kt

@@ -59,7 +59,8 @@ fun ConversationModel.asEntity() =
         callStartTime = callStartTime,
         recordingConsentRequired = recordingConsentRequired,
         remoteServer = remoteServer,
-        remoteToken = remoteToken
+        remoteToken = remoteToken,
+        hasArchived = hasArchived
     )
 
 fun ConversationEntity.asModel() =
@@ -109,7 +110,8 @@ fun ConversationEntity.asModel() =
         callStartTime = callStartTime,
         recordingConsentRequired = recordingConsentRequired,
         remoteServer = remoteServer,
-        remoteToken = remoteToken
+        remoteToken = remoteToken,
+        hasArchived = hasArchived
     )
 
 fun Conversation.asEntity(accountId: Long) =
@@ -158,5 +160,6 @@ fun Conversation.asEntity(accountId: Long) =
         callStartTime = callStartTime,
         recordingConsentRequired = recordingConsentRequired,
         remoteServer = remoteServer,
-        remoteToken = remoteToken
+        remoteToken = remoteToken,
+        hasArchived = hasArchived
     )

app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt

@@ -92,7 +92,8 @@ data class ConversationEntity(
     @ColumnInfo(name = "type") var type: ConversationEnums.ConversationType,
     @ColumnInfo(name = "unreadMention") var unreadMention: Boolean = false,
     @ColumnInfo(name = "unreadMentionDirect") var unreadMentionDirect: Boolean,
-    @ColumnInfo(name = "unreadMessages") var unreadMessages: Int = 0
+    @ColumnInfo(name = "unreadMessages") var unreadMessages: Int = 0,
+    @ColumnInfo(name = "hasArchived") var hasArchived: Boolean = false
     // missing/not needed: attendeeId
     // missing/not needed: attendeePin
     // missing/not needed: attendeePermissions

app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt

@@ -59,6 +59,7 @@ class ConversationModel(
     var recordingConsentRequired: Int = 0,
     var remoteServer: String? = null,
     var remoteToken: String? = null,
+    var hasArchived: Boolean = false,
 
     // attributes that don't come from API. This should be changed?!
     var password: String? = null
@@ -120,7 +121,8 @@ class ConversationModel(
                 callStartTime = conversation.callStartTime,
                 recordingConsentRequired = conversation.recordingConsentRequired,
                 remoteServer = conversation.remoteServer,
-                remoteToken = conversation.remoteToken
+                remoteToken = conversation.remoteToken,
+                hasArchived = conversation.hasArchived
             )
         }
     }

app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt

@@ -159,5 +159,8 @@ data class Conversation(
     var remoteServer: String? = "",
 
     @JsonField(name = ["remoteToken"])
-    var remoteToken: String? = ""
+    var remoteToken: String? = "",
+
+    @JsonField(name = ["isArchived"])
+    var hasArchived: Boolean = false
 ) : Parcelable

app/src/main/java/com/nextcloud/talk/repositories/conversations/ConversationsRepository.kt

@@ -7,6 +7,7 @@
  */
 package com.nextcloud.talk.repositories.conversations
 
+import com.nextcloud.talk.models.json.generic.GenericOverall
 import io.reactivex.Observable
 
 interface ConversationsRepository {
@@ -29,4 +30,8 @@ interface ConversationsRepository {
         val successful: Boolean
     )
     fun resendInvitations(token: String): Observable<ResendInvitationsResult>
+
+    fun archiveConversation(credentials: String, url: String): Observable<GenericOverall>
+
+    fun unarchiveConversation(credentials: String, url: String): Observable<GenericOverall>
 }

app/src/main/java/com/nextcloud/talk/repositories/conversations/ConversationsRepositoryImpl.kt

@@ -11,6 +11,7 @@ import com.bluelinelabs.logansquare.LoganSquare
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.json.conversations.password.PasswordOverall
+import com.nextcloud.talk.models.json.generic.GenericOverall
 import com.nextcloud.talk.repositories.conversations.ConversationsRepository.AllowGuestsResult
 import com.nextcloud.talk.repositories.conversations.ConversationsRepository.PasswordResult
 import com.nextcloud.talk.repositories.conversations.ConversationsRepository.ResendInvitationsResult
@@ -89,6 +90,14 @@ class ConversationsRepositoryImpl(
         }
     }
 
+    override fun archiveConversation(credentials: String, url: String): Observable<GenericOverall> {
+        return api.archiveConversation(credentials, url)
+    }
+
+    override fun unarchiveConversation(credentials: String, url: String): Observable<GenericOverall> {
+        return api.unarchiveConversation(credentials, url)
+    }
+
     private fun apiVersion(): Int {
         return ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4))
     }