Implement archive functionality using system API

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt

@@ -64,7 +64,6 @@ class MainActivity : SimpleActivity() {
         updateMaterialActivityViews(main_coordinator, conversations_list, useTransparentNavigation = true, useTopSearchMenu = true)
 
         if (savedInstanceState == null) {
-            checkAndDeleteOldArchivedConversations()
             handleAppPasswordProtection {
                 wasProtectionHandled = it
                 if (it) {

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt

@@ -11,15 +11,12 @@ import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.extensions.config
-import com.simplemobiletools.smsmessenger.extensions.conversationsDB
-import com.simplemobiletools.smsmessenger.extensions.removeAllArchivedConversations
 import com.simplemobiletools.smsmessenger.helpers.*
 import kotlinx.android.synthetic.main.activity_settings.*
 import java.util.*
 
 class SettingsActivity : SimpleActivity() {
     private var blockedNumbersAtPause = -1
-    private var archiveConversations = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
@@ -50,8 +47,6 @@ class SettingsActivity : SimpleActivity() {
         setupGroupMessageAsMMS()
         setupLockScreenVisibility()
         setupMMSFileSizeLimit()
-        setupUseRecycleBin()
-        setupEmptyRecycleBin()
         setupAppPasswordProtection()
         updateTextColors(settings_nested_scrollview)
 
@@ -64,7 +59,6 @@ class SettingsActivity : SimpleActivity() {
             settings_general_settings_label,
             settings_outgoing_messages_label,
             settings_notifications_label,
-            settings_archive_label,
             settings_security_label
         ).forEach {
             it.setTextColor(getProperPrimaryColor())
@@ -250,43 +244,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupUseRecycleBin() {
-        updateRecycleBinButtons()
-        settings_use_archive.isChecked = config.useArchive
-        settings_use_archive_holder.setOnClickListener {
-            settings_use_archive.toggle()
-            config.useArchive = settings_use_archive.isChecked
-            updateRecycleBinButtons()
-        }
-    }
-
-    private fun updateRecycleBinButtons() {
-        settings_empty_archive_holder.beVisibleIf(config.useArchive)
-    }
-
-    private fun setupEmptyRecycleBin() {
-        ensureBackgroundThread {
-            archiveConversations = conversationsDB.getArchivedCount()
-            runOnUiThread {
-                settings_empty_archive_size.text =
-                    resources.getQuantityString(R.plurals.delete_conversations, archiveConversations, archiveConversations)
-            }
-        }
-
-        settings_empty_archive_holder.setOnClickListener {
-            if (archiveConversations == 0) {
-                toast(R.string.archive_is_empty)
-            } else {
-                ConfirmationDialog(this, "", R.string.empty_archive_confirmation, R.string.yes, R.string.no) {
-                    removeAllArchivedConversations()
-                    archiveConversations = 0
-                    settings_empty_archive_size.text =
-                        resources.getQuantityString(R.plurals.delete_conversations, archiveConversations, archiveConversations)
-                }
-            }
-        }
-    }
-
     private fun setupAppPasswordProtection() {
         settings_app_password_protection.isChecked = config.isAppPasswordProtectionOn
         settings_app_password_protection_holder.setOnClickListener {

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

@@ -55,7 +55,6 @@ import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.adapters.AttachmentsAdapter
 import com.simplemobiletools.smsmessenger.adapters.AutoCompleteTextViewAdapter
 import com.simplemobiletools.smsmessenger.adapters.ThreadAdapter
-import com.simplemobiletools.smsmessenger.dialogs.DeleteConfirmationDialog
 import com.simplemobiletools.smsmessenger.dialogs.InvalidNumberDialog
 import com.simplemobiletools.smsmessenger.dialogs.RenameConversationDialog
 import com.simplemobiletools.smsmessenger.dialogs.ScheduleMessageDialog
@@ -245,6 +244,8 @@ class ThreadActivity : SimpleActivity() {
         val firstPhoneNumber = participants.firstOrNull()?.phoneNumbers?.firstOrNull()?.value
         thread_toolbar.menu.apply {
             findItem(R.id.delete).isVisible = threadItems.isNotEmpty()
+            findItem(R.id.archive).isVisible = threadItems.isNotEmpty() && conversation?.isArchived == false
+            findItem(R.id.unarchive).isVisible = threadItems.isNotEmpty() && conversation?.isArchived == true
             findItem(R.id.rename_conversation).isVisible = participants.size > 1 && conversation != null
             findItem(R.id.conversation_details).isVisible = conversation != null
             findItem(R.id.block_number).title = addLockedLabelIfNeeded(R.string.block_number)
@@ -269,6 +270,8 @@ class ThreadActivity : SimpleActivity() {
             when (menuItem.itemId) {
                 R.id.block_number -> tryBlocking()
                 R.id.delete -> askConfirmDelete()
+                R.id.archive -> archiveConversation()
+                R.id.unarchive -> unarchiveConversation()
                 R.id.rename_conversation -> renameConversation()
                 R.id.conversation_details -> showConversationDetails()
                 R.id.add_number_to_contact -> addNumberToContact()
@@ -889,18 +892,10 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun askConfirmDelete() {
-        val confirmationMessage = if (config.useArchive) {
-            R.string.archive_whole_conversation_confirmation
-        } else {
-            R.string.delete_whole_conversation_confirmation
-        }
-        DeleteConfirmationDialog(this, getString(confirmationMessage), config.useArchive) { skipRecycleBin ->
+        val confirmationMessage = R.string.delete_whole_conversation_confirmation
+        ConfirmationDialog(this, getString(confirmationMessage)) {
             ensureBackgroundThread {
-                if (skipRecycleBin || config.useArchive.not()) {
-                    deleteConversation(threadId)
-                } else {
-                    moveConversationToRecycleBin(threadId)
-                }
+                deleteConversation(threadId)
                 runOnUiThread {
                     refreshMessages()
                     finish()
@@ -909,6 +904,26 @@ class ThreadActivity : SimpleActivity() {
         }
     }
 
+    private fun archiveConversation() {
+        ensureBackgroundThread {
+            updateConversationArchivedStatus(threadId, true)
+            runOnUiThread {
+                refreshMessages()
+                finish()
+            }
+        }
+    }
+
+    private fun unarchiveConversation() {
+        ensureBackgroundThread {
+            updateConversationArchivedStatus(threadId, false)
+            runOnUiThread {
+                refreshMessages()
+                finish()
+            }
+        }
+    }
+
     private fun dialNumber() {
         val phoneNumber = participants.first().phoneNumbers.first().normalizedNumber
         dialNumber(phoneNumber)
@@ -1337,7 +1352,7 @@ class ThreadActivity : SimpleActivity() {
             }
         }
         messagesDB.insertOrUpdate(message)
-        conversationsDB.deleteThreadFromArchivedConversations(message.threadId)
+        updateConversationArchivedStatus(message.threadId, false)
     }
 
     // show selected contacts, properly split to new lines when appropriate