remove SavedToots (#2141)

* remove SavedToots

* fix tests

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt

@@ -1013,7 +1013,6 @@ class ComposeActivity : BaseActivity(),
     data class ComposeOptions(
             // Let's keep fields var until all consumers are Kotlin
             var scheduledTootId: String? = null,
-            var savedTootUid: Int? = null,
             var draftId: Int? = null,
             var tootText: String? = null,
             var mediaUrls: List<String>? = null,

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt

@@ -45,14 +45,12 @@ class ComposeViewModel @Inject constructor(
         private val mediaUploader: MediaUploader,
         private val serviceClient: ServiceClient,
         private val draftHelper: DraftHelper,
-        private val saveTootHelper: SaveTootHelper,
         private val db: AppDatabase
 ) : RxAwareViewModel() {
 
     private var replyingStatusAuthor: String? = null
     private var replyingStatusContent: String? = null
     internal var startingText: String? = null
-    private var savedTootUid: Int = 0
     private var draftId: Int = 0
     private var scheduledTootId: String? = null
     private var startingContentWarning: String = ""
@@ -216,9 +214,6 @@ class ComposeViewModel @Inject constructor(
     }
 
     fun deleteDraft() {
-        if (savedTootUid != 0) {
-            saveTootHelper.deleteDraft(savedTootUid)
-        }
         if (draftId != 0) {
             draftHelper.deleteDraftAndAttachments(draftId)
                     .subscribe()
@@ -291,7 +286,6 @@ class ComposeViewModel @Inject constructor(
                             replyingStatusContent = null,
                             replyingStatusAuthorUsername = null,
                             accountId = accountManager.activeAccount!!.id,
-                            savedTootUid = savedTootUid,
                             draftId = draftId,
                             idempotencyKey = randomAlphanumericString(16),
                             retries = 0
@@ -406,20 +400,8 @@ class ComposeViewModel @Inject constructor(
         }
 
         // recreate media list
-        val loadedDraftMediaUris = composeOptions?.mediaUrls
-        val loadedDraftMediaDescriptions: List<String?>? = composeOptions?.mediaDescriptions
         val draftAttachments = composeOptions?.draftAttachments
-        if (loadedDraftMediaUris != null && loadedDraftMediaDescriptions != null) {
-            // when coming from SavedTootActivity
-            loadedDraftMediaUris.zip(loadedDraftMediaDescriptions)
-                    .forEach { (uri, description) ->
-                        pickMedia(uri.toUri()).observeForever { errorOrItem ->
-                            if (errorOrItem.isRight() && description != null) {
-                                updateDescription(errorOrItem.asRight().localId, description)
-                            }
-                        }
-                    }
-        } else if (draftAttachments != null) {
+        if (draftAttachments != null) {
             // when coming from DraftActivity
             draftAttachments.forEach { attachment -> pickMedia(attachment.uri, attachment.description) }
         } else composeOptions?.mediaAttachments?.forEach { a ->
@@ -432,7 +414,6 @@ class ComposeViewModel @Inject constructor(
             addUploadedMedia(a.id, mediaType, a.url.toUri(), a.description)
         }
 
-        savedTootUid = composeOptions?.savedTootUid ?: 0
         draftId = composeOptions?.draftId ?: 0
         scheduledTootId = composeOptions?.scheduledTootId
         startingText = composeOptions?.tootText

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftsActivity.kt

@@ -19,19 +19,15 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
 import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
-import com.keylesspalace.tusky.SavedTootActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.databinding.ActivityDraftsBinding
 import com.keylesspalace.tusky.db.DraftEntity
@@ -40,7 +36,6 @@ import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
 import com.uber.autodispose.android.lifecycle.autoDispose
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import retrofit2.HttpException
 import javax.inject.Inject
 
@@ -54,8 +49,6 @@ class DraftsActivity : BaseActivity(), DraftActionListener {
     private lateinit var binding: ActivityDraftsBinding
     private lateinit var bottomSheet: BottomSheetBehavior<LinearLayout>
 
-    private var oldDraftsButton: MenuItem? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
@@ -70,7 +63,7 @@ class DraftsActivity : BaseActivity(), DraftActionListener {
             setDisplayShowHomeEnabled(true)
         }
 
-        binding.draftsErrorMessageView.setup(R.drawable.elephant_friend_empty, R.string.no_saved_status)
+        binding.draftsErrorMessageView.setup(R.drawable.elephant_friend_empty, R.string.no_drafts)
 
         val adapter = DraftsAdapter(this)
 
@@ -92,34 +85,6 @@ class DraftsActivity : BaseActivity(), DraftActionListener {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.drafts, menu)
-        oldDraftsButton = menu.findItem(R.id.action_old_drafts)
-        viewModel.showOldDraftsButton()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .autoDispose(this, Lifecycle.Event.ON_DESTROY)
-                .subscribe { showOldDraftsButton ->
-                    oldDraftsButton?.isVisible = showOldDraftsButton
-                }
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-            R.id.action_old_drafts -> {
-                val intent = Intent(this, SavedTootActivity::class.java)
-                startActivityWithSlideInAnimation(intent)
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun onOpenDraft(draft: DraftEntity) {
 
         if (draft.inReplyToId != null) {

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftsViewModel.kt

@@ -22,7 +22,6 @@ import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.db.DraftEntity
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
-import io.reactivex.Observable
 import io.reactivex.Single
 import javax.inject.Inject
 
@@ -37,11 +36,6 @@ class DraftsViewModel @Inject constructor(
 
     private val deletedDrafts: MutableList<DraftEntity> = mutableListOf()
 
-    fun showOldDraftsButton(): Observable<Boolean> {
-        return database.tootDao().savedTootCount()
-                .map { count -> count > 0 }
-    }
-
     fun deleteDraft(draft: DraftEntity) {
         // this does not immediately delete media files to avoid unnecessary file operations
         // in case the user decides to restore the draft