Drafts v2 (#2032)

* cleanup warnings, reorganize some code

* move ComposeAutoCompleteAdapter to compose package

* composeOptions doesn't need to be a class member

* add DraftsActivity and DraftsViewModel

* drafts

* remove unnecessary Unit in ComposeViewModel

* add schema/25.json

* fix db migration

* drafts

* cleanup code

* fix compose activity rotation bug

* fix media descriptions getting lost when restoring a draft

* improve deleting drafts

* fix ComposeActivityTest

* improve draft layout for almost empty drafts

* reformat code

* show toast when opening reply to deleted toot

* improve item_draft layout

app/build.gradle

@@ -82,6 +82,9 @@ android {
     androidExtensions {
         experimental = true
     }
+    buildFeatures {
+        viewBinding true
+    }
     testOptions {
         unitTests {
             returnDefaultValues = true

app/src/main/AndroidManifest.xml

@@ -149,6 +149,7 @@
         <activity android:name=".components.instancemute.InstanceListActivity" />
         <activity android:name=".components.scheduled.ScheduledTootActivity" />
         <activity android:name=".components.announcements.AnnouncementsActivity" />
+        <activity android:name=".components.drafts.DraftsActivity" />
 
         <receiver android:name=".receiver.NotificationClearBroadcastReceiver" />
         <receiver

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -31,6 +31,7 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
+import androidx.core.content.edit
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.emoji.text.EmojiCompat
 import androidx.emoji.text.EmojiCompat.InitCallback
@@ -53,11 +54,13 @@ import com.keylesspalace.tusky.components.announcements.AnnouncementsActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity.Companion.canHandleMimeType
 import com.keylesspalace.tusky.components.conversation.ConversationsRepository
+import com.keylesspalace.tusky.components.drafts.DraftsActivity
 import com.keylesspalace.tusky.components.notifications.NotificationHelper
 import com.keylesspalace.tusky.components.preference.PreferencesActivity
 import com.keylesspalace.tusky.components.scheduled.ScheduledTootActivity
 import com.keylesspalace.tusky.components.search.SearchActivity
 import com.keylesspalace.tusky.db.AccountEntity
+import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.entity.Account
 import com.keylesspalace.tusky.entity.Notification
 import com.keylesspalace.tusky.fragment.SFragment
@@ -105,6 +108,9 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
     @Inject
     lateinit var conversationRepository: ConversationsRepository
 
+    @Inject
+    lateinit var appDb: AppDatabase
+
     private lateinit var header: AccountHeaderView
 
     private var notificationTabPosition = 0
@@ -253,6 +259,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             StreamingService.stopStreaming(this)
             NotificationHelper.disablePullNotifications(this)
         }
+        draftWarning()
     }
 
     override fun onResume() {
@@ -421,7 +428,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                         nameRes = R.string.action_access_saved_toot
                         iconRes = R.drawable.ic_notebook
                         onClick = {
-                            val intent = Intent(context, SavedTootActivity::class.java)
+                            val intent = DraftsActivity.newIntent(context)
                             startActivityWithSlideInAnimation(intent)
                         }
                     },
@@ -765,6 +772,29 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         header.setActiveProfile(accountManager.activeAccount!!.id)
     }
 
+    private fun draftWarning() {
+        val sharedPrefsKey = "show_draft_warning"
+        appDb.tootDao().savedTootCount()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDispose(this, Lifecycle.Event.ON_DESTROY)
+                .subscribe { draftCount ->
+                    val showDraftWarning = preferences.getBoolean(sharedPrefsKey, true)
+                    if (draftCount > 0 && showDraftWarning) {
+                        AlertDialog.Builder(this)
+                                .setMessage(R.string.new_drafts_warning)
+                                .setNegativeButton("Don't show again") { _, _ ->
+                                    preferences.edit(commit = true) {
+                                        putBoolean(sharedPrefsKey, false)
+                                    }
+                                }
+                                .setPositiveButton(android.R.string.ok, null)
+                                .show()
+                    }
+                }
+
+    }
+
     override fun getActionButton(): FloatingActionButton? = composeButton
 
     override fun androidInjector() = androidInjector

app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java

@@ -89,7 +89,7 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd
         setSupportActionBar(toolbar);
         ActionBar bar = getSupportActionBar();
         if (bar != null) {
-            bar.setTitle(getString(R.string.title_saved_toot));
+            bar.setTitle(getString(R.string.title_drafts));
             bar.setDisplayHomeAsUpEnabled(true);
             bar.setDisplayShowHomeEnabled(true);
         }
@@ -166,6 +166,7 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd
         ComposeOptions composeOptions = new ComposeOptions(
                 /*scheduledTootUid*/null,
                 item.getUid(),
+                /*drafId*/null,
                 item.getText(),
                 jsonUrls,
                 descriptions,
@@ -177,6 +178,7 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd
                 item.getInReplyToUsername(),
                 item.getInReplyToText(),
                 /*mediaAttachments*/null,
+                /*draftAttachments*/null,
                 /*scheduledAt*/null,
                 /*sensitive*/null,
                 /*poll*/null,

app/src/main/java/com/keylesspalace/tusky/components/common/CommonComposeViewModel.kt

@@ -35,11 +35,6 @@ import retrofit2.Response
 import java.util.*
 import javax.inject.Inject
 
-/**
- * Throw when trying to add an image when video is already present or the other way around
- */
-class VideoOrImageException : Exception()
-
 open class CommonComposeViewModel(
         private val api: MastodonApi,
         private val accountManager: AccountManager,
@@ -380,3 +375,8 @@ data class ComposeInstanceMetadata(
         val videoLimit: Long,
         val imageLimit: Long
 )
+
+/**
+ * Throw when trying to add an image when video is already present or the other way around
+ */
+class VideoOrImageException : Exception()

app/src/main/java/com/keylesspalace/tusky/components/common/MediaUploader.kt

@@ -186,7 +186,13 @@ class MediaUploaderImpl(
 
             val body = MultipartBody.Part.createFormData("file", filename, fileBody)
 
-            val uploadDisposable = mastodonApi.uploadMedia(body)
+            val description = if (media.description != null) {
+                MultipartBody.Part.createFormData("description", media.description)
+            } else {
+                null
+            }
+
+            val uploadDisposable = mastodonApi.uploadMedia(body, description)
                     .subscribe({ attachment ->
                         emitter.onNext(UploadEvent.FinishedEvent(attachment))
                         emitter.onComplete()

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

@@ -64,7 +64,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BuildConfig
 import com.keylesspalace.tusky.R
-import com.keylesspalace.tusky.adapter.ComposeAutoCompleteAdapter
 import com.keylesspalace.tusky.adapter.EmojiAdapter
 import com.keylesspalace.tusky.adapter.OnEmojiSelectedListener
 import com.keylesspalace.tusky.appstore.*
@@ -73,6 +72,7 @@ import com.keylesspalace.tusky.components.compose.dialog.makeCaptionDialog
 import com.keylesspalace.tusky.components.compose.dialog.showAddPollDialog
 import com.keylesspalace.tusky.components.compose.view.ComposeOptionsListener
 import com.keylesspalace.tusky.db.AccountEntity
+import com.keylesspalace.tusky.db.DraftAttachment
 import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.Attachment
@@ -92,7 +92,6 @@ import java.io.File
 import java.io.IOException
 import java.util.*
 import javax.inject.Inject
-import kotlin.collections.ArrayList
 import kotlin.math.max
 import kotlin.math.min
 import me.thanel.markdownedit.MarkdownEdit
@@ -124,10 +123,10 @@ class ComposeActivity : BaseActivity(),
     // this only exists when a status is trying to be sent, but uploads are still occurring
     private var finishingUploadDialog: ProgressDialog? = null
     private var photoUploadUri: Uri? = null
+
     @VisibleForTesting
     var maximumTootCharacters = DEFAULT_CHARACTER_LIMIT
 
-    private var composeOptions: ComposeOptions? = null
     @VisibleForTesting
     val viewModel: ComposeViewModel by viewModels { viewModelFactory }
     private var suggestFormattingSyntax: String = "text/markdown"
@@ -173,14 +172,14 @@ class ComposeActivity : BaseActivity(),
 
         /* If the composer is started up as a reply to another post, override the "starting" state
          * based on what the intent from the reply request passes. */
-        if (intent != null) {
+
-            this.composeOptions = intent.getParcelableExtra<ComposeOptions?>(COMPOSE_OPTIONS_EXTRA)
+        val composeOptions = intent.getParcelableExtra<ComposeOptions?>(COMPOSE_OPTIONS_EXTRA)
-            viewModel.setup(composeOptions)
+        
-            setupReplyViews(composeOptions?.replyingStatusAuthor)
+        viewModel.setup(composeOptions)
-            val tootText = composeOptions?.tootText
+        setupReplyViews(composeOptions?.replyingStatusAuthor)
-            if (!tootText.isNullOrEmpty()) {
+        val tootText = composeOptions?.tootText
-                composeEditField.setText(tootText)
+        if (!tootText.isNullOrEmpty()) {
-            }
+            composeEditField.setText(tootText)
         }
                 
         if(viewModel.formattingSyntax.length == 0) {
@@ -189,7 +188,7 @@ class ComposeActivity : BaseActivity(),
             suggestFormattingSyntax = viewModel.formattingSyntax
         }
         
-        if (!TextUtils.isEmpty(composeOptions?.scheduledAt)) {
+        if (!composeOptions?.scheduledAt.isNullOrEmpty()) {
             composeScheduleView.setDateTime(composeOptions?.scheduledAt)
         }
 
@@ -210,38 +209,24 @@ class ComposeActivity : BaseActivity(),
                 }
     }
     
-    private fun applyShareIntent(intent: Intent?, savedInstanceState: Bundle?) {
+    private fun applyShareIntent(intent: Intent, savedInstanceState: Bundle?) {
-        if (intent != null && savedInstanceState == null) {
+        if (savedInstanceState == null) {
             /* Get incoming images being sent through a share action from another app. Only do this
              * when savedInstanceState is null, otherwise both the images from the intent and the
              * instance state will be re-queued. */
-            val type = intent.type
+            intent.type?.also { type ->
-            if (type != null) {
                 if (type.startsWith("image/") || type.startsWith("video/") || type.startsWith("audio/")) {
-                    val uriList = ArrayList<Uri>()
+                    when (intent.action) {
-                    if (intent.action != null) {
+                        Intent.ACTION_SEND -> {
-                        when (intent.action) {
+                            intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.let { uri ->
-                            Intent.ACTION_SEND -> {
+                                pickMedia(uri)
-                                val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
+                            }
-                                if (uri != null) {
+                        }
-                                    uriList.add(uri)
+                        Intent.ACTION_SEND_MULTIPLE -> {
-                                }
+                            intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.forEach { uri ->
-                            }
+                                pickMedia(uri)
-                            Intent.ACTION_SEND_MULTIPLE -> {
-                                val list = intent.getParcelableArrayListExtra<Uri>(
-                                        Intent.EXTRA_STREAM)
-                                if (list != null) {
-                                    for (uri in list) {
-                                        if (uri != null) {
-                                            uriList.add(uri)
-                                        }
-                                    }
-                                }
                             }
                         }
-                    }
-                    for (uri in uriList) {
-                        pickMedia(uri)
                     }
                 } else if (type == "text/plain" && intent.action == Intent.ACTION_SEND) {
 
@@ -265,7 +250,7 @@ class ComposeActivity : BaseActivity(),
         }
     }
 
-    private fun setupReplyViews(replyingStatusAuthor: String?) {
+    private fun setupReplyViews(replyingStatusAuthor: String?, replyingStatusContent: String?) {
         if (replyingStatusAuthor != null) {
             composeReplyView.show()
             composeReplyView.text = getString(R.string.replying_to, replyingStatusAuthor)
@@ -289,7 +274,7 @@ class ComposeActivity : BaseActivity(),
                 }
             }
         }
-        composeOptions?.replyingStatusContent?.let { composeReplyContentView.text = it }
+        replyingStatusContent?.let { composeReplyContentView.text = it }
     }
 
     private fun setupContentWarningField(startingContentWarning: String?) {
@@ -899,7 +884,6 @@ class ComposeActivity : BaseActivity(),
         }
     }
 
-
     private fun removePoll() {
         viewModel.poll.value = null
         pollPreview.hide()
@@ -1102,22 +1086,22 @@ class ComposeActivity : BaseActivity(),
     override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
         super.onActivityResult(requestCode, resultCode, intent)
         if (resultCode == Activity.RESULT_OK && requestCode == MEDIA_PICK_RESULT && intent != null) {
-            if(intent.data != null){
+            if (intent.data != null) {
                 // Single media, upload it and done.
                 pickMedia(intent.data!!)
-            }else if(intent.clipData != null){
+            } else if (intent.clipData != null) {
                 val clipData = intent.clipData!!
                 val count = clipData.itemCount
-                if(mediaCount + count > maxUploadMediaNumber){
+                if (mediaCount + count > maxUploadMediaNumber) {
                     // check if exist media + upcoming media > 4, then prob error message.
                     Toast.makeText(this, getString(R.string.error_upload_max_media_reached, maxUploadMediaNumber), Toast.LENGTH_SHORT).show()
-                }else{
+                } else {
                     // if not grater then 4, upload all multiple media.
                     for (i in 0 until count) {
-                            val imageUri = clipData.getItemAt(i).getUri()
+                        val imageUri = clipData.getItemAt(i).getUri()
-                            pickMedia(imageUri)
+                        pickMedia(imageUri)
-                        }
                     }
+                }
             }
         } else if (resultCode == Activity.RESULT_OK && requestCode == MEDIA_TAKE_PHOTO_RESULT) {
             pickMedia(photoUploadUri!!)
@@ -1329,8 +1313,9 @@ class ComposeActivity : BaseActivity(),
     @Parcelize
     data class ComposeOptions(
             // Let's keep fields var until all consumers are Kotlin
-            var scheduledTootUid: String? = null,
+            var scheduledTootId: String? = null,
             var savedTootUid: Int? = null,
+            var draftId: Int? = null,
             var tootText: String? = null,
             var mediaUrls: List<String>? = null,
             var mediaDescriptions: List<String>? = null,
@@ -1342,6 +1327,7 @@ class ComposeActivity : BaseActivity(),
             var replyingStatusAuthor: String? = null,
             var replyingStatusContent: String? = null,
             var mediaAttachments: List<Attachment>? = null,
+            var draftAttachments: List<DraftAttachment>? = null,
             var scheduledAt: String? = null,
             var sensitive: Boolean? = null,
             var poll: NewPoll? = null,
@@ -1369,7 +1355,6 @@ class ComposeActivity : BaseActivity(),
             }
         }
 
-        @JvmStatic
         fun canHandleMimeType(mimeType: String?): Boolean {
             return mimeType != null && (mimeType.startsWith("image/") || mimeType.startsWith("video/") || mimeType.startsWith("audio/") || mimeType == "text/plain")
         }

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeAutoCompleteAdapter.java

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.adapter;
+package com.keylesspalace.tusky.components.compose;
 
 import android.content.Context;
 import android.preference.PreferenceManager;

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

@@ -27,6 +27,7 @@ import com.keylesspalace.tusky.components.common.MediaUploader
 import com.keylesspalace.tusky.components.common.UploadEvent
 import com.keylesspalace.tusky.components.common.mutableLiveData
 import com.keylesspalace.tusky.components.compose.ComposeActivity.QueuedMedia
+import com.keylesspalace.tusky.components.drafts.DraftHelper
 import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
@@ -46,12 +47,12 @@ import retrofit2.Response
 import java.util.*
 import javax.inject.Inject
 
-class ComposeViewModel
+class ComposeViewModel @Inject constructor(
-@Inject constructor(
         private val api: MastodonApi,
         private val accountManager: AccountManager,
         private val mediaUploader: MediaUploader,
         private val serviceClient: ServiceClient,
+        private val draftHelper: DraftHelper,
         private val saveTootHelper: SaveTootHelper,
         private val db: AppDatabase
 ) : CommonComposeViewModel(api, accountManager, mediaUploader, db) {
@@ -60,7 +61,8 @@ class ComposeViewModel
     private var replyingStatusContent: String? = null
     internal var startingText: String? = null
     private var savedTootUid: Int = 0
-    private var scheduledTootUid: String? = null
+    private var draftId: Int = 0
+    private var scheduledTootId: String? = null
     private var startingContentWarning: String = ""
     private var inReplyToId: String? = null
     private var startingVisibility: Status.Visibility = Status.Visibility.UNKNOWN
@@ -71,17 +73,17 @@ class ComposeViewModel
     val markMediaAsSensitive =
             mutableLiveData(accountManager.activeAccount?.defaultMediaSensitivity ?: false)
 
-    fun toggleMarkSensitive() {
-        this.markMediaAsSensitive.value = !this.markMediaAsSensitive.value!!
-    }
-
     val statusVisibility = mutableLiveData(Status.Visibility.UNKNOWN)
     val showContentWarning = mutableLiveData(false)
     val setupComplete = mutableLiveData(false)
     val poll: MutableLiveData<NewPoll?> = mutableLiveData(null)
     val scheduledAt: MutableLiveData<String?> = mutableLiveData(null)
 
-    private val isEditingScheduledToot get() = !scheduledTootUid.isNullOrEmpty()
+    private val isEditingScheduledToot get() = !scheduledTootId.isNullOrEmpty()
+
+    fun toggleMarkSensitive() {
+        this.markMediaAsSensitive.value = this.markMediaAsSensitive.value != true
+    }
 
     fun didChange(content: String?, contentWarning: String?): Boolean {
 
@@ -103,30 +105,37 @@ class ComposeViewModel
     }
 
     fun deleteDraft() {
-        saveTootHelper.deleteDraft(this.savedTootUid)
+        if (savedTootUid != 0) {
+            saveTootHelper.deleteDraft(savedTootUid)
+        }
+        if (draftId != 0) {
+            draftHelper.deleteDraftAndAttachments(draftId)
+                    .subscribe()
+        }
     }
 
     fun saveDraft(content: String, contentWarning: String) {
-        val mediaUris = mutableListOf<String>()
+
-        val mediaDescriptions = mutableListOf<String?>()
+        val mediaUris: MutableList<String> = mutableListOf()
-        for (item in media.value!!) {
+        val mediaDescriptions: MutableList<String?> = mutableListOf()
+        media.value?.forEach { item ->
             mediaUris.add(item.uri.toString())
             mediaDescriptions.add(item.description)
         }
-        saveTootHelper.saveToot(
+        draftHelper.saveDraft(
-                content,
+                draftId = draftId,
-                contentWarning,
+                accountId = accountManager.activeAccount?.id!!,
-                null,
+                inReplyToId = inReplyToId,
-                mediaUris,
+                content = content,
-                mediaDescriptions,
+                contentWarning = contentWarning,
-                savedTootUid,
+                sensitive = markMediaAsSensitive.value!!,
-                inReplyToId,
+                visibility = statusVisibility.value!!,
-                replyingStatusContent,
+                mediaUris = mediaUris,
-                replyingStatusAuthor,
+                mediaDescriptions = mediaDescriptions,
-                statusVisibility.value!!,
+                poll = poll.value,
-                poll.value,
+                formattingSyntax = formattingSyntax,
-                formattingSyntax
+                failedToSend = false
-        )
+        ).subscribe()
     }
 
     /**
@@ -141,7 +150,7 @@ class ComposeViewModel
     ): LiveData<Unit> {
 
         val deletionObservable = if (isEditingScheduledToot) {
-            api.deleteScheduledStatus(scheduledTootUid.toString()).toObservable().map { Unit }
+            api.deleteScheduledStatus(scheduledTootId.toString()).toObservable().map { }
         } else {
             just(Unit)
         }.toLiveData()
@@ -152,20 +161,22 @@ class ComposeViewModel
                     val mediaIds = ArrayList<String>()
                     val mediaUris = ArrayList<Uri>()
                     val mediaDescriptions = ArrayList<String>()
+                    val mediaTypes = ArrayList<QueuedMedia.Type>()
                     for (item in media.value!!) {
                         mediaIds.add(item.id!!)
                         mediaUris.add(item.uri)
                         mediaDescriptions.add(item.description ?: "")
+                        mediaTypes.add(item.type)
                     }
 
                     val tootToSend = TootToSend(
-                            content,
+                            text = content,
-                            spoilerText,
+                            warningText = spoilerText,
-                            statusVisibility.value!!.serverString(),
+                            visibility = statusVisibility.value!!.serverString(),
-                            mediaUris.isNotEmpty() && (markMediaAsSensitive.value!! || showContentWarning.value!!),
+                            sensitive = mediaUris.isNotEmpty() && (markMediaAsSensitive.value!! || showContentWarning.value!!),
-                            mediaIds,
+                            mediaIds = mediaIds,
-                            mediaUris.map { it.toString() },
+                            mediaUris = mediaUris.map { it.toString() },
-                            mediaDescriptions,
+                            mediaDescriptions = mediaDescriptions,
                             scheduledAt = scheduledAt.value,
                             inReplyToId = inReplyToId,
                             poll = poll.value,
@@ -173,9 +184,9 @@ class ComposeViewModel
                             replyingStatusAuthorUsername = null,
                             formattingSyntax = formattingSyntax,
                             preview = preview,
-                            savedJsonUrls = null,
                             accountId = accountManager.activeAccount!!.id,
-                            savedTootUid = 0,
+                            savedTootUid = savedTootUid,
+                            draftId = draftId,
                             idempotencyKey = randomAlphanumericString(16),
                             retries = 0
                     )
@@ -183,20 +194,93 @@ class ComposeViewModel
                     serviceClient.sendToot(tootToSend)
                 }
 
-        return combineLiveData(deletionObservable, sendObservable) { _, _ -> Unit }
+        return combineLiveData(deletionObservable, sendObservable) { _, _ -> }
-
-
     }
 
-    override fun onCleared() {
+    fun updateDescription(localId: Long, description: String): LiveData<Boolean> {
-        for (uploadDisposable in mediaToDisposable.values) {
+        val newList = media.value!!.toMutableList()
-            uploadDisposable.dispose()
+        val index = newList.indexOfFirst { it.localId == localId }
+        if (index != -1) {
+            newList[index] = newList[index].copy(description = description)
+        }
+        media.value = newList
+        val completedCaptioningLiveData = MutableLiveData<Boolean>()
+        media.observeForever(object : Observer<List<QueuedMedia>> {
+            override fun onChanged(mediaItems: List<QueuedMedia>) {
+                val updatedItem = mediaItems.find { it.localId == localId }
+                if (updatedItem == null) {
+                    media.removeObserver(this)
+                } else if (updatedItem.id != null) {
+                    api.updateMedia(updatedItem.id, description)
+                            .subscribe({
+                                completedCaptioningLiveData.postValue(true)
+                            }, {
+                                completedCaptioningLiveData.postValue(false)
+                            })
+                            .autoDispose()
+                    media.removeObserver(this)
+                }
+            }
+        })
+        return completedCaptioningLiveData
+    }
+
+    fun searchAutocompleteSuggestions(token: String): List<ComposeAutoCompleteAdapter.AutocompleteResult> {
+        when (token[0]) {
+            '@' -> {
+                return try {
+                    api.searchAccounts(query = token.substring(1), limit = 10)
+                            .blockingGet()
+                            .map { ComposeAutoCompleteAdapter.AccountResult(it) }
+                } catch (e: Throwable) {
+                    Log.e(TAG, String.format("Autocomplete search for %s failed.", token), e)
+                    emptyList()
+                }
+            }
+            '#' -> {
+                return try {
+                    api.searchObservable(query = token, type = SearchType.Hashtag.apiParameter, limit = 10)
+                            .blockingGet()
+                            .hashtags
+                            .map { ComposeAutoCompleteAdapter.HashtagResult(it) }
+                } catch (e: Throwable) {
+                    Log.e(TAG, String.format("Autocomplete search for %s failed.", token), e)
+                    emptyList()
+                }
+            }
+            ':' -> {
+                val emojiList = emoji.value ?: return emptyList()
+
+                val incomplete = token.substring(1).toLowerCase(Locale.ROOT)
+                val results = ArrayList<ComposeAutoCompleteAdapter.AutocompleteResult>()
+                val resultsInside = ArrayList<ComposeAutoCompleteAdapter.AutocompleteResult>()
+                for (emoji in emojiList) {
+                    val shortcode = emoji.shortcode.toLowerCase(Locale.ROOT)
+                    if (shortcode.startsWith(incomplete)) {
+                        results.add(ComposeAutoCompleteAdapter.EmojiResult(emoji))
+                    } else if (shortcode.indexOf(incomplete, 1) != -1) {
+                        resultsInside.add(ComposeAutoCompleteAdapter.EmojiResult(emoji))
+                    }
+                }
+                if (results.isNotEmpty() && resultsInside.isNotEmpty()) {
+                    results.add(ComposeAutoCompleteAdapter.ResultSeparator())
+                }
+                results.addAll(resultsInside)
+                return results
+            }
+            else -> {
+                Log.w(TAG, "Unexpected autocompletion token: $token")
+                return emptyList()
+            }
         }
-        super.onCleared()
     }
 
     fun setup(composeOptions: ComposeActivity.ComposeOptions?) {
-        super.setup()
+
+        if (setupComplete.value == true) {
+            return
+        }
+
         val preferredVisibility = accountManager.activeAccount!!.defaultPostPrivacy
 
         val replyVisibility = composeOptions?.replyVisibility ?: Status.Visibility.UNKNOWN
@@ -204,6 +288,7 @@ class ComposeViewModel
                 preferredVisibility.num.coerceAtLeast(replyVisibility.num))
 
         inReplyToId = composeOptions?.inReplyToId
+
         modifiedInitialState = composeOptions?.modifiedInitialState == true
 
         val contentWarning = composeOptions?.contentWarning
@@ -215,10 +300,11 @@ class ComposeViewModel
         }
 
         // recreate media list
-        // when coming from SavedTootActivity
         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(), null).observeForever { errorOrItem ->
@@ -227,8 +313,11 @@ class ComposeViewModel
                             }
                         }
                     }
+        } else if (draftAttachments != null) {
+            // when coming from DraftActivity
+            draftAttachments.forEach { attachment -> pickMedia(attachment.uri, attachment.description) }
         } else composeOptions?.mediaAttachments?.forEach { a ->
-            // when coming from redraft
+            // when coming from redraft or ScheduledTootActivity
             val mediaType = when (a.type) {
                 Attachment.Type.VIDEO, Attachment.Type.GIFV -> QueuedMedia.Type.VIDEO
                 Attachment.Type.UNKNOWN, Attachment.Type.IMAGE -> QueuedMedia.Type.IMAGE
@@ -237,12 +326,11 @@ class ComposeViewModel
             addUploadedMedia(a.id, mediaType, a.url.toUri(), a.description)
         }
 
-
         savedTootUid = composeOptions?.savedTootUid ?: 0
-        scheduledTootUid = composeOptions?.scheduledTootUid
+        draftId = composeOptions?.draftId ?: 0
+        scheduledTootId = composeOptions?.scheduledTootId
         startingText = composeOptions?.tootText
 
-
         val tootVisibility = composeOptions?.visibility ?: Status.Visibility.UNKNOWN
         if (tootVisibility.num != Status.Visibility.UNKNOWN.num) {
             startingVisibility = tootVisibility
@@ -259,7 +347,6 @@ class ComposeViewModel
             startingText = builder.toString()
         }
 
-
         scheduledAt.value = composeOptions?.scheduledAt
 
         composeOptions?.sensitive?.let { markMediaAsSensitive.value = it }
@@ -282,6 +369,13 @@ class ComposeViewModel
         scheduledAt.value = newScheduledAt
     }
 
+    override fun onCleared() {
+        for (uploadDisposable in mediaToDisposable.values) {
+            uploadDisposable.dispose()
+        }
+        super.onCleared()
+    }
+
     private companion object {
         const val TAG = "ComposeViewModel"
     }

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

@@ -0,0 +1,161 @@
+/* Copyright 2021 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.drafts
+
+import android.content.Context
+import android.net.Uri
+import android.util.Log
+import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import com.keylesspalace.tusky.BuildConfig
+import com.keylesspalace.tusky.db.AppDatabase
+import com.keylesspalace.tusky.db.DraftAttachment
+import com.keylesspalace.tusky.db.DraftEntity
+import com.keylesspalace.tusky.entity.NewPoll
+import com.keylesspalace.tusky.entity.Status
+import com.keylesspalace.tusky.util.IOUtils
+import io.reactivex.Completable
+import io.reactivex.Single
+import io.reactivex.schedulers.Schedulers
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+
+class DraftHelper @Inject constructor(
+        val context: Context,
+        db: AppDatabase
+) {
+
+    private val draftDao = db.draftDao()
+
+    fun saveDraft(
+            draftId: Int,
+            accountId: Long,
+            inReplyToId: String?,
+            content: String?,
+            contentWarning: String?,
+            sensitive: Boolean,
+            visibility: Status.Visibility,
+            mediaUris: List<String>,
+            mediaDescriptions: List<String?>,
+            poll: NewPoll?,
+            formattingSyntax: String,
+            failedToSend: Boolean
+    ): Completable {
+        return Single.fromCallable {
+
+            val draftDirectory = context.getExternalFilesDir("Tusky")
+
+            if (draftDirectory == null || !(draftDirectory.exists())) {
+                Log.e("DraftHelper", "Error obtaining directory to save media.")
+                throw Exception()
+            }
+
+            val uris = mediaUris.map { uriString ->
+                uriString.toUri()
+            }.map { uri ->
+                if (uri.isNotInFolder(draftDirectory)) {
+                    uri.copyToFolder(draftDirectory)
+                } else {
+                    uri
+                }
+            }
+
+            val types = uris.map { uri ->
+                val mimeType = context.contentResolver.getType(uri)
+                when (mimeType?.substring(0, mimeType.indexOf('/'))) {
+                    "video" -> DraftAttachment.Type.VIDEO
+                    "image" -> DraftAttachment.Type.IMAGE
+                    "audio" -> DraftAttachment.Type.AUDIO
+                    else -> throw IllegalStateException("unknown media type")
+                }
+            }
+
+            val attachments: MutableList<DraftAttachment> = mutableListOf()
+            for (i in mediaUris.indices) {
+                attachments.add(
+                        DraftAttachment(
+                                uriString = uris[i].toString(),
+                                description = mediaDescriptions[i],
+                                type = types[i]
+                        )
+                )
+            }
+
+            DraftEntity(
+                    id = draftId,
+                    accountId = accountId,
+                    inReplyToId = inReplyToId,
+                    content = content,
+                    contentWarning = contentWarning,
+                    sensitive = sensitive,
+                    visibility = visibility,
+                    attachments = attachments,
+                    poll = poll,
+                    formattingSyntax = formattingSyntax,
+                    failedToSend = failedToSend
+            )
+
+        }.flatMapCompletable { draft ->
+            draftDao.insertOrReplace(draft)
+        }.subscribeOn(Schedulers.io())
+    }
+
+    fun deleteDraftAndAttachments(draftId: Int): Completable {
+        return draftDao.find(draftId)
+                .flatMapCompletable { draft ->
+                    deleteDraftAndAttachments(draft)
+                }
+    }
+
+    fun deleteDraftAndAttachments(draft: DraftEntity): Completable {
+        return deleteAttachments(draft)
+                .andThen(draftDao.delete(draft.id))
+    }
+
+    fun deleteAttachments(draft: DraftEntity): Completable {
+        return Completable.fromCallable {
+            draft.attachments.forEach { attachment ->
+                if (context.contentResolver.delete(attachment.uri, null, null) == 0) {
+                    Log.e("DraftHelper", "Did not delete file ${attachment.uriString}")
+                }
+            }
+        }.subscribeOn(Schedulers.io())
+    }
+
+    private fun Uri.isNotInFolder(folder: File): Boolean {
+        val filePath = path ?: return true
+        return File(filePath).parentFile == folder
+    }
+
+    private fun Uri.copyToFolder(folder: File): Uri {
+        val contentResolver = context.contentResolver
+
+        val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+
+        val mimeType = contentResolver.getType(this)
+        val map = MimeTypeMap.getSingleton()
+        val fileExtension = map.getExtensionFromMimeType(mimeType)
+
+        val filename = String.format("Tusky_Draft_Media_%s.%s", timeStamp, fileExtension)
+        val file = File(folder, filename)
+        IOUtils.copyToFile(contentResolver, this, file)
+        return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", file)
+    }
+
+}

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

@@ -0,0 +1,81 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.drafts
+
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.db.DraftAttachment
+
+class DraftMediaAdapter(
+        private val attachmentClick: () -> Unit
+) : ListAdapter<DraftAttachment, DraftMediaAdapter.DraftMediaViewHolder>(
+        object: DiffUtil.ItemCallback<DraftAttachment>() {
+            override fun areItemsTheSame(oldItem: DraftAttachment, newItem: DraftAttachment): Boolean {
+                return oldItem == newItem
+            }
+
+            override fun areContentsTheSame(oldItem: DraftAttachment, newItem: DraftAttachment): Boolean {
+                return oldItem == newItem
+            }
+
+        }
+) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DraftMediaViewHolder {
+        return DraftMediaViewHolder(AppCompatImageView(parent.context))
+    }
+
+    override fun onBindViewHolder(holder: DraftMediaViewHolder, position: Int) {
+        getItem(position)?.let { attachment ->
+            if (attachment.type == DraftAttachment.Type.AUDIO) {
+                holder.imageView.setImageResource(R.drawable.ic_music_box_preview_24dp)
+            } else {
+                Glide.with(holder.itemView.context)
+                        .load(attachment.uri)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .dontAnimate()
+                        .into(holder.imageView)
+            }
+        }
+    }
+
+    inner class DraftMediaViewHolder(val imageView: ImageView)
+        : RecyclerView.ViewHolder(imageView) {
+        init {
+            val thumbnailViewSize =
+                    imageView.context.resources.getDimensionPixelSize(R.dimen.compose_media_preview_size)
+            val layoutParams = ConstraintLayout.LayoutParams(thumbnailViewSize, thumbnailViewSize)
+            val margin = itemView.context.resources
+                    .getDimensionPixelSize(R.dimen.compose_media_preview_margin)
+            val marginBottom = itemView.context.resources
+                    .getDimensionPixelSize(R.dimen.compose_media_preview_margin_bottom)
+            layoutParams.setMargins(margin, 0, margin, marginBottom)
+            imageView.layoutParams = layoutParams
+            imageView.scaleType = ImageView.ScaleType.CENTER_CROP
+            imageView.setOnClickListener {
+                attachmentClick()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,197 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.drafts
+
+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
+import com.keylesspalace.tusky.di.ViewModelFactory
+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
+
+class DraftsActivity : BaseActivity(), DraftActionListener {
+
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
+    private val viewModel: DraftsViewModel by viewModels { viewModelFactory }
+
+    private lateinit var binding: ActivityDraftsBinding
+    private lateinit var bottomSheet: BottomSheetBehavior<LinearLayout>
+
+    private var oldDraftsButton: MenuItem? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityDraftsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        setSupportActionBar(binding.includedToolbar.toolbar)
+        supportActionBar?.apply {
+            title = getString(R.string.title_drafts)
+            setDisplayHomeAsUpEnabled(true)
+            setDisplayShowHomeEnabled(true)
+        }
+
+        binding.draftsErrorMessageView.setup(R.drawable.elephant_friend_empty, R.string.no_saved_status)
+
+        val adapter = DraftsAdapter(this)
+
+        binding.draftsRecyclerView.adapter = adapter
+        binding.draftsRecyclerView.layoutManager = LinearLayoutManager(this)
+        binding.draftsRecyclerView.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
+
+        bottomSheet = BottomSheetBehavior.from(binding.bottomSheet.root)
+
+        viewModel.drafts.observe(this) { draftList ->
+            if (draftList.isEmpty()) {
+                binding.draftsRecyclerView.hide()
+                binding.draftsErrorMessageView.show()
+            } else {
+                binding.draftsRecyclerView.show()
+                binding.draftsErrorMessageView.hide()
+                adapter.submitList(draftList)
+            }
+        }
+    }
+
+    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) {
+            bottomSheet.state = BottomSheetBehavior.STATE_COLLAPSED
+            viewModel.getToot(draft.inReplyToId)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .autoDispose(this)
+                    .subscribe({ status ->
+                        val composeOptions = ComposeActivity.ComposeOptions(
+                                draftId = draft.id,
+                                tootText = draft.content,
+                                contentWarning = draft.contentWarning,
+                                inReplyToId = draft.inReplyToId,
+                                replyingStatusContent = status.content.toString(),
+                                replyingStatusAuthor = status.account.localUsername,
+                                draftAttachments = draft.attachments,
+                                poll = draft.poll,
+                                sensitive = draft.sensitive,
+                                visibility = draft.visibility
+                        )
+
+                        bottomSheet.state = BottomSheetBehavior.STATE_HIDDEN
+
+                        startActivity(ComposeActivity.startIntent(this, composeOptions))
+
+                    }, { throwable ->
+
+                        bottomSheet.state = BottomSheetBehavior.STATE_HIDDEN
+
+                        Log.w(TAG, "failed loading reply information", throwable)
+
+                        if (throwable is HttpException && throwable.code() == 404) {
+                            // the original status to which a reply was drafted has been deleted
+                            // let's open the ComposeActivity without reply information
+                            Toast.makeText(this, getString(R.string.drafts_toot_reply_removed), Toast.LENGTH_LONG).show()
+                            openDraftWithoutReply(draft)
+                        } else {
+                            Snackbar.make(binding.root, getString(R.string.drafts_failed_loading_reply), Snackbar.LENGTH_SHORT)
+                                    .show()
+                        }
+                    })
+        } else {
+            openDraftWithoutReply(draft)
+        }
+    }
+
+    private fun openDraftWithoutReply(draft: DraftEntity) {
+        val composeOptions = ComposeActivity.ComposeOptions(
+                draftId = draft.id,
+                tootText = draft.content,
+                contentWarning = draft.contentWarning,
+                draftAttachments = draft.attachments,
+                poll = draft.poll,
+                sensitive = draft.sensitive,
+                visibility = draft.visibility
+        )
+
+        startActivity(ComposeActivity.startIntent(this, composeOptions))
+    }
+
+    override fun onDeleteDraft(draft: DraftEntity) {
+        viewModel.deleteDraft(draft)
+        Snackbar.make(binding.root, getString(R.string.draft_deleted), Snackbar.LENGTH_LONG)
+                .setAction(R.string.action_undo) {
+                    viewModel.restoreDraft(draft)
+                }
+                .show()
+    }
+
+    companion object {
+        const val TAG = "DraftsActivity"
+
+        fun newIntent(context: Context) = Intent(context, DraftsActivity::class.java)
+    }
+}

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

@@ -0,0 +1,92 @@
+/* Copyright 2021 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.drafts
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.paging.PagedListAdapter
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.databinding.ItemDraftBinding
+import com.keylesspalace.tusky.db.DraftEntity
+import com.keylesspalace.tusky.util.BindingViewHolder
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.visible
+
+interface DraftActionListener {
+    fun onOpenDraft(draft: DraftEntity)
+    fun onDeleteDraft(draft: DraftEntity)
+}
+
+class DraftsAdapter(
+        private val listener: DraftActionListener
+) : PagedListAdapter<DraftEntity, BindingViewHolder<ItemDraftBinding>>(
+        object : DiffUtil.ItemCallback<DraftEntity>() {
+            override fun areItemsTheSame(oldItem: DraftEntity, newItem: DraftEntity): Boolean {
+                return oldItem.id == newItem.id
+            }
+
+            override fun areContentsTheSame(oldItem: DraftEntity, newItem: DraftEntity): Boolean {
+                return oldItem == newItem
+            }
+        }
+) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BindingViewHolder<ItemDraftBinding> {
+
+        val binding = ItemDraftBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+
+        val viewHolder = BindingViewHolder(binding)
+
+        binding.draftMediaPreview.layoutManager = LinearLayoutManager(binding.root.context, RecyclerView.HORIZONTAL, false)
+        binding.draftMediaPreview.adapter = DraftMediaAdapter {
+            getItem(viewHolder.adapterPosition)?.let { draft ->
+                listener.onOpenDraft(draft)
+            }
+        }
+
+        return viewHolder
+    }
+
+    override fun onBindViewHolder(holder: BindingViewHolder<ItemDraftBinding>, position: Int) {
+        getItem(position)?.let { draft ->
+            holder.binding.root.setOnClickListener {
+                listener.onOpenDraft(draft)
+            }
+            holder.binding.deleteButton.setOnClickListener {
+                listener.onDeleteDraft(draft)
+            }
+            holder.binding.draftSendingInfo.visible(draft.failedToSend)
+
+            holder.binding.contentWarning.visible(!draft.contentWarning.isNullOrEmpty())
+            holder.binding.contentWarning.text = draft.contentWarning
+            holder.binding.content.text = draft.content
+
+            holder.binding.draftMediaPreview.visible(draft.attachments.isNotEmpty())
+            (holder.binding.draftMediaPreview.adapter as DraftMediaAdapter).submitList(draft.attachments)
+
+            if (draft.poll != null) {
+                holder.binding.draftPoll.show()
+                holder.binding.draftPoll.setPoll(draft.poll)
+            } else {
+                holder.binding.draftPoll.hide()
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,69 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.drafts
+
+import androidx.lifecycle.ViewModel
+import androidx.paging.toLiveData
+import com.keylesspalace.tusky.db.AccountManager
+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
+
+class DraftsViewModel @Inject constructor(
+    val database: AppDatabase,
+    val accountManager: AccountManager,
+    val api: MastodonApi,
+    val draftHelper: DraftHelper
+) : ViewModel() {
+
+    val drafts = database.draftDao().loadDrafts(accountManager.activeAccount?.id!!).toLiveData(pageSize = 20)
+
+    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
+        database.draftDao().delete(draft.id)
+                .subscribe()
+        deletedDrafts.add(draft)
+    }
+
+    fun restoreDraft(draft: DraftEntity) {
+        database.draftDao().insertOrReplace(draft)
+                .subscribe()
+        deletedDrafts.remove(draft)
+    }
+
+    fun getToot(tootId: String): Single<Status> {
+        return api.statusSingle(tootId)
+    }
+
+    override fun onCleared() {
+        deletedDrafts.forEach {
+            draftHelper.deleteAttachments(it).subscribe()
+        }
+    }
+
+}

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt

@@ -124,7 +124,7 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
 
     override fun edit(item: ScheduledStatus) {
         val intent = ComposeActivity.startIntent(this, ComposeActivity.ComposeOptions(
-                scheduledTootUid = item.id,
+                scheduledTootId = item.id,
                 tootText = item.params.text,
                 contentWarning = item.params.spoilerText,
                 mediaAttachments = item.mediaAttachments,

app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java

@@ -28,8 +28,9 @@ import com.keylesspalace.tusky.components.conversation.ConversationEntity;
  * DB version & declare DAO
  */
 
-@Database(entities = {TootEntity.class, AccountEntity.class, InstanceEntity.class, TimelineStatusEntity.class,
+@Database(entities = { TootEntity.class, DraftEntity.class, AccountEntity.class, InstanceEntity.class, TimelineStatusEntity.class,
-                TimelineAccountEntity.class, ConversationEntity.class, ChatEntity.class, ChatMessageEntity.class}, version = 26)
+                TimelineAccountEntity.class, ConversationEntity.class, ChatEntity.class, ChatMessageEntity.class
+        }, version = 27)
 public abstract class AppDatabase extends RoomDatabase {
 
     public abstract TootDao tootDao();
@@ -38,6 +39,7 @@ public abstract class AppDatabase extends RoomDatabase {
     public abstract ConversationsDao conversationDao();
     public abstract TimelineDao timelineDao();
     public abstract ChatsDao chatsDao();
+    public abstract DraftDao draftDao();
 
     public static final Migration MIGRATION_2_3 = new Migration(2, 3) {
         @Override
@@ -46,7 +48,6 @@ public abstract class AppDatabase extends RoomDatabase {
             database.execSQL("INSERT INTO TootEntity2 SELECT * FROM TootEntity;");
             database.execSQL("DROP TABLE TootEntity;");
             database.execSQL("ALTER TABLE TootEntity2 RENAME TO TootEntity;");
-
         }
     };
 
@@ -384,4 +385,24 @@ public abstract class AppDatabase extends RoomDatabase {
             database.execSQL("ALTER TABLE `AccountEntity` ADD COLUMN `notificationsMove` INTEGER NOT NULL DEFAULT 1");
         }
     };
+
+    public static final Migration MIGRATION_26_27 = new Migration(26, 27) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `DraftEntity` (" +
+                            "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                            "`accountId` INTEGER NOT NULL, " +
+                            "`inReplyToId` TEXT," +
+                            "`content` TEXT," +
+                            "`contentWarning` TEXT," +
+                            "`sensitive` INTEGER NOT NULL," +
+                            "`visibility` INTEGER NOT NULL," +
+                            "`attachments` TEXT NOT NULL," +
+                            "`poll` TEXT," +
+                            "`formattingSyntax` TEXT NOT NULL," +
+                            "`failedToSend` INTEGER NOT NULL)"
+            );
+        }
+    };
 }

app/src/main/java/com/keylesspalace/tusky/db/Converters.kt

@@ -24,10 +24,7 @@ import com.google.gson.reflect.TypeToken
 import com.keylesspalace.tusky.TabData
 import com.keylesspalace.tusky.components.conversation.ConversationAccountEntity
 import com.keylesspalace.tusky.createTabDataFromId
-import com.keylesspalace.tusky.entity.Attachment
+import com.keylesspalace.tusky.entity.*
-import com.keylesspalace.tusky.entity.Emoji
-import com.keylesspalace.tusky.entity.Poll
-import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.json.SpannedTypeAdapter
 import com.keylesspalace.tusky.util.trimTrailingWhitespace
 import java.net.URLDecoder
@@ -151,4 +148,23 @@ class Converters {
         return gson.fromJson(pollJson, Poll::class.java)
     }
 
+    @TypeConverter
+    fun newPollToJson(newPoll: NewPoll?): String? {
+        return gson.toJson(newPoll)
+    }
+
+    @TypeConverter
+    fun jsonToNewPoll(newPollJson: String?): NewPoll? {
+        return gson.fromJson(newPollJson, NewPoll::class.java)
+    }
+
+    @TypeConverter
+    fun draftAttachmentListToJson(draftAttachments: List<DraftAttachment>?): String? {
+        return gson.toJson(draftAttachments)
+    }
+
+    @TypeConverter
+    fun jsonToDraftAttachmentList(draftAttachmentListJson: String?): List<DraftAttachment>? {
+        return gson.fromJson(draftAttachmentListJson, object : TypeToken<List<DraftAttachment>>() {}.type)
+    }
 }

app/src/main/java/com/keylesspalace/tusky/db/DraftDao.kt

@@ -0,0 +1,40 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.db
+
+import androidx.paging.DataSource
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.reactivex.Completable
+import io.reactivex.Single
+
+@Dao
+interface DraftDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertOrReplace(draft: DraftEntity): Completable
+
+    @Query("SELECT * FROM DraftEntity WHERE accountId = :accountId ORDER BY id ASC")
+    fun loadDrafts(accountId: Long): DataSource.Factory<Int, DraftEntity>
+
+    @Query("DELETE FROM DraftEntity WHERE id = :id")
+    fun delete(id: Int): Completable
+
+    @Query("SELECT * FROM DraftEntity WHERE id = :id")
+    fun find(id: Int): Single<DraftEntity?>
+}

app/src/main/java/com/keylesspalace/tusky/db/DraftEntity.kt

@@ -0,0 +1,55 @@
+/* Copyright 2020 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.db
+
+import android.net.Uri
+import android.os.Parcelable
+import androidx.core.net.toUri
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import androidx.room.TypeConverters
+import com.keylesspalace.tusky.entity.NewPoll
+import com.keylesspalace.tusky.entity.Status
+import kotlinx.android.parcel.Parcelize
+
+@Entity
+@TypeConverters(Converters::class)
+data class DraftEntity(
+        @PrimaryKey(autoGenerate = true) val id: Int = 0,
+        val accountId: Long,
+        val inReplyToId: String?,
+        val content: String?,
+        val contentWarning: String?,
+        val sensitive: Boolean,
+        val visibility: Status.Visibility,
+        val attachments: List<DraftAttachment>,
+        val poll: NewPoll?,
+        val failedToSend: Boolean
+)
+
+@Parcelize
+data class DraftAttachment(
+        val uriString: String,
+        val description: String?,
+        val type: Type
+): Parcelable {
+    val uri: Uri
+        get() = uriString.toUri()
+
+    enum class Type {
+        IMAGE, VIDEO, AUDIO;
+    }
+}

app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt

@@ -26,7 +26,7 @@ import com.keylesspalace.tusky.entity.Status
         // Avoiding rescanning status table when accounts table changes. Recommended by Room(c).
         indices = [Index("authorServerId", "timelineUserId")]
 )
-@TypeConverters(TootEntity.Converters::class)
+@TypeConverters(Converters::class)
 data class TimelineStatusEntity(
         val serverId: String, // id never flips: we need it for sorting so it's a real id
         val url: String?,

app/src/main/java/com/keylesspalace/tusky/db/TootDao.java

@@ -16,12 +16,12 @@
 package com.keylesspalace.tusky.db;
 
 import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
 import java.util.List;
 
+import io.reactivex.Observable;
+
 /**
  * Created by cto3543 on 28/06/2017.
  *
@@ -30,8 +30,6 @@ import java.util.List;
 
 @Dao
 public interface TootDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    void insertOrReplace(TootEntity users);
 
     @Query("SELECT * FROM TootEntity ORDER BY uid DESC")
     List<TootEntity> loadAll();
@@ -41,4 +39,7 @@ public interface TootDao {
 
     @Query("SELECT * FROM TootEntity WHERE uid = :uid")
     TootEntity find(int uid);
-}
+
+    @Query("SELECT COUNT(*) FROM TootEntity")
+    Observable<Integer> savedTootCount();
+}

app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt

@@ -19,6 +19,7 @@ import com.keylesspalace.tusky.*
 import com.keylesspalace.tusky.components.chat.ChatActivity
 import com.keylesspalace.tusky.components.announcements.AnnouncementsActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity
+import com.keylesspalace.tusky.components.drafts.DraftsActivity
 import com.keylesspalace.tusky.components.instancemute.InstanceListActivity
 import com.keylesspalace.tusky.components.preference.PreferencesActivity
 import com.keylesspalace.tusky.components.report.ReportActivity
@@ -111,4 +112,7 @@ abstract class ActivitiesModule {
 
     @ContributesAndroidInjector
     abstract fun contributesAnnouncementsActivity(): AnnouncementsActivity
+
+    @ContributesAndroidInjector
+    abstract fun contributesDraftActivity(): DraftsActivity
 }

app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt

@@ -81,7 +81,7 @@ class AppModule {
                         AppDatabase.MIGRATION_16_17, AppDatabase.MIGRATION_17_18, AppDatabase.MIGRATION_18_19,
                         AppDatabase.MIGRATION_19_20, AppDatabase.MIGRATION_20_21, AppDatabase.MIGRATION_21_22,
                         AppDatabase.MIGRATION_22_23, AppDatabase.MIGRATION_23_24, AppDatabase.MIGRATION_24_25,
-                        AppDatabase.MIGRATION_25_26)
+                        AppDatabase.MIGRATION_25_26, AppDatabase.MIGRATION_26_27)
                 .build()
     }
 

app/src/main/java/com/keylesspalace/tusky/di/ViewModelFactory.kt

@@ -8,6 +8,7 @@ import com.keylesspalace.tusky.components.chat.ChatViewModel
 import com.keylesspalace.tusky.components.announcements.AnnouncementsViewModel
 import com.keylesspalace.tusky.components.compose.ComposeViewModel
 import com.keylesspalace.tusky.components.conversation.ConversationsViewModel
+import com.keylesspalace.tusky.components.drafts.DraftsViewModel
 import com.keylesspalace.tusky.components.report.ReportViewModel
 import com.keylesspalace.tusky.components.scheduled.ScheduledTootViewModel
 import com.keylesspalace.tusky.components.search.SearchViewModel
@@ -97,5 +98,10 @@ abstract class ViewModelModule {
     @ViewModelKey(AnnouncementsViewModel::class)
     internal abstract fun announcementsViewModel(viewModel: AnnouncementsViewModel): ViewModel
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(DraftsViewModel::class)
+    internal abstract fun draftsViewModel(viewModel: DraftsViewModel): ViewModel
+
     //Add more ViewModels here
 }

app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt

@@ -126,7 +126,8 @@ interface MastodonApi {
     @Multipart
     @POST("api/v1/media")
     fun uploadMedia(
-            @Part file: MultipartBody.Part
+            @Part file: MultipartBody.Part,
+            @Part description: MultipartBody.Part? = null
     ): Single<Attachment>
 
     @FormUrlEncoded
@@ -149,6 +150,11 @@ interface MastodonApi {
             @Path("id") statusId: String
     ): Call<Status>
 
+    @GET("api/v1/statuses/{id}")
+    fun statusSingle(
+            @Path("id") statusId: String
+    ): Single<Status>
+
     @GET("api/v1/statuses/{id}/context")
     fun statusContext(
             @Path("id") statusId: String

app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt

@@ -112,25 +112,25 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() {
                 SendTootService.sendTootIntent(
                         context,
                         TootToSend(
-                                text,
+                                text = text,
-                                spoiler,
+                                warningText = spoiler,
-                                (visibility as Status.Visibility).serverString(),
+                                visibility = visibility.serverString(),
-                                false,
+                                sensitive = false,
-                                emptyList(),
+                                mediaIds = emptyList(),
-                                emptyList(),
+                                mediaUris = emptyList(),
-                                emptyList(),
+                                mediaDescriptions = emptyList(),
-                                null,
+                                scheduledAt = null,
-                                citedStatusId,
+                                inReplyToId = citedStatusId,
-                                null,
+                                poll = null,
-                                null,
+                                replyingStatusContent = null,
-                                null,
+                                replyingStatusAuthorUsername = null,
-                                null,
+                                formattingSyntax = "",
-                                "",
+                                preview = false,
-                                false,
+                                accountId = account.id,
-                                account.id,
+                                savedTootUid = -1,
-                                0,
+                                draftId = -1,
-                                randomAlphanumericString(16),
+                                idempotencyKey = randomAlphanumericString(16),
-                                0
+                                retries = 0
                         )
                 )
             } else {

app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt

@@ -16,6 +16,7 @@ import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.*
 import com.keylesspalace.tusky.components.notifications.NotificationHelper
+import com.keylesspalace.tusky.components.drafts.DraftHelper
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.di.Injectable
@@ -43,7 +44,8 @@ class SendTootService : Service(), Injectable {
     lateinit var eventHub: EventHub
     @Inject
     lateinit var database: AppDatabase
-
+    @Inject
+    lateinit var draftHelper: DraftHelper
     @Inject
     lateinit var saveTootHelper: SaveTootHelper
 
@@ -152,6 +154,10 @@ class SendTootService : Service(), Injectable {
                         if (postToSend.savedTootUid != 0) {
                             saveTootHelper.deleteDraft(postToSend.savedTootUid)
                         }
+                        if (tootToSend.draftId != 0) {
+                            draftHelper.deleteDraftAndAttachments(tootToSend.draftId)
+                                    .subscribe()
+                        }
 
                         when {
                             postToSend.preview -> response.body()?.let(::StatusPreviewEvent)?.let(eventHub::dispatch)
@@ -291,18 +297,20 @@ class SendTootService : Service(), Injectable {
 
     private fun saveTootToDrafts(toot: TootToSend) {
 
-        saveTootHelper.saveToot(toot.text,
+        draftHelper.saveDraft(
-                toot.warningText,
+                draftId = toot.draftId,
-                toot.savedJsonUrls,
+                accountId = toot.accountId,
-                toot.mediaUris,
+                inReplyToId = toot.inReplyToId,
-                toot.mediaDescriptions,
+                content = toot.text,
-                toot.savedTootUid,
+                contentWarning = toot.warningText,
-                toot.inReplyToId,
+                sensitive = toot.sensitive,
-                toot.replyingStatusContent,
+                visibility = Status.Visibility.byString(toot.visibility),
-                toot.replyingStatusAuthorUsername,
+                mediaUris = toot.mediaUris,
-                Status.Visibility.byString(toot.visibility),
+                mediaDescriptions = toot.mediaDescriptions,
-                toot.poll,
+                poll = toot.poll,
-                toot.formattingSyntax)
+                formattingSyntax = toot.formattingSyntax
+                failedToSend = true
+        ).subscribe()
     }
 
     private fun cancelSendingIntent(tootId: Int): PendingIntent {
@@ -405,11 +413,11 @@ data class TootToSend(
         val poll: NewPoll?,
         val replyingStatusContent: String?,
         val replyingStatusAuthorUsername: String?,
-        val savedJsonUrls: List<String>?,
         val formattingSyntax: String,
         val preview: Boolean,
-        private val accountId: Long,
+        val accountId: Long,
         val savedTootUid: Int,
+        val draftId: Int,
         val idempotencyKey: String,
         var retries: Int
 ) : Parcelable, PostToSend {

app/src/main/java/com/keylesspalace/tusky/util/BindingViewHolder.kt

@@ -0,0 +1,8 @@
+package com.keylesspalace.tusky.util
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+
+class BindingViewHolder<T : ViewBinding>(
+        val binding: T
+) : RecyclerView.ViewHolder(binding.root)

app/src/main/java/com/keylesspalace/tusky/util/RxAwareViewModel.kt

@@ -1,5 +1,6 @@
 package com.keylesspalace.tusky.util
 
+import androidx.annotation.CallSuper
 import androidx.lifecycle.ViewModel
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
@@ -9,6 +10,7 @@ open class RxAwareViewModel : ViewModel() {
 
     fun Disposable.autoDispose() = disposables.add(this)
 
+    @CallSuper
     override fun onCleared() {
         super.onCleared()
         disposables.clear()

app/src/main/java/com/keylesspalace/tusky/util/SaveTootHelper.java

@@ -1,33 +1,18 @@
 package com.keylesspalace.tusky.util;
 
-import android.annotation.SuppressLint;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
-import android.os.AsyncTask;
-import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.MimeTypeMap;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.FileProvider;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.keylesspalace.tusky.BuildConfig;
 import com.keylesspalace.tusky.db.AppDatabase;
 import com.keylesspalace.tusky.db.TootDao;
 import com.keylesspalace.tusky.db.TootEntity;
-import com.keylesspalace.tusky.entity.NewPoll;
-import com.keylesspalace.tusky.entity.Status;
 
-import java.io.File;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -45,62 +30,6 @@ public final class SaveTootHelper {
         this.context = context;
     }
 
-    @SuppressLint("StaticFieldLeak")
-    public boolean saveToot(@NonNull String content,
-                            @NonNull String contentWarning,
-                            @Nullable List<String> savedJsonUrls,
-                            @NonNull List<String> mediaUris,
-                            @NonNull List<String> mediaDescriptions,
-                            int savedTootUid,
-                            @Nullable String inReplyToId,
-                            @Nullable String replyingStatusContent,
-                            @Nullable String replyingStatusAuthorUsername,
-                            @NonNull Status.Visibility statusVisibility,
-                            @Nullable NewPoll poll,
-                            @NonNull String formattingSyntax) {
-
-        if (TextUtils.isEmpty(content) && mediaUris.isEmpty() && poll == null) {
-            return false;
-        }
-
-        // Get any existing file's URIs.
-
-        String mediaUrlsSerialized = null;
-        String mediaDescriptionsSerialized = null;
-
-        if (!ListUtils.isEmpty(mediaUris)) {
-            List<String> savedList = saveMedia(mediaUris, savedJsonUrls);
-            if (!ListUtils.isEmpty(savedList)) {
-                mediaUrlsSerialized = gson.toJson(savedList);
-                if (!ListUtils.isEmpty(savedJsonUrls)) {
-                    deleteMedia(setDifference(savedJsonUrls, savedList));
-                }
-            } else {
-                return false;
-            }
-            mediaDescriptionsSerialized = gson.toJson(mediaDescriptions);
-        } else if (!ListUtils.isEmpty(savedJsonUrls)) {
-            /* If there were URIs in the previous draft, but they've now been removed, those files
-             * can be deleted. */
-            deleteMedia(savedJsonUrls);
-        }
-        final TootEntity toot = new TootEntity(savedTootUid, content, mediaUrlsSerialized, mediaDescriptionsSerialized, contentWarning,
-                inReplyToId,
-                replyingStatusContent,
-                replyingStatusAuthorUsername,
-                statusVisibility,
-                poll, formattingSyntax);
-
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                tootDao.insertOrReplace(toot);
-                return null;
-            }
-        }.execute();
-        return true;
-    }
-
     public void deleteDraft(int tootId) {
         TootEntity item = tootDao.find(tootId);
         if (item != null) {
@@ -125,82 +54,4 @@ public final class SaveTootHelper {
         tootDao.delete(item.getUid());
     }
 
-    @Nullable
-    private List<String> saveMedia(@NonNull List<String> mediaUris,
-                                   @Nullable List<String> existingUris) {
-
-        File directory = context.getExternalFilesDir("Husky");
-
-        if (directory == null || !(directory.exists())) {
-            Log.e(TAG, "Error obtaining directory to save media.");
-            return null;
-        }
-
-        ContentResolver contentResolver = context.getContentResolver();
-        ArrayList<File> filesSoFar = new ArrayList<>();
-        ArrayList<String> results = new ArrayList<>();
-        for (String mediaUri : mediaUris) {
-            /* If the media was already saved in a previous draft, there's no need to save another
-             * copy, just add the existing URI to the results. */
-            if (existingUris != null) {
-                int index = existingUris.indexOf(mediaUri);
-                if (index != -1) {
-                    results.add(mediaUri);
-                    continue;
-                }
-            }
-            // Otherwise, save the media.
-
-            Uri uri = Uri.parse(mediaUri);
-
-            String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
-
-            String mimeType = contentResolver.getType(uri);
-            MimeTypeMap map = MimeTypeMap.getSingleton();
-            String fileExtension = map.getExtensionFromMimeType(mimeType);
-            String filename = String.format("Tusky_Draft_Media_%s.%s", timeStamp, fileExtension);
-            File file = new File(directory, filename);
-            filesSoFar.add(file);
-            boolean copied = IOUtils.copyToFile(contentResolver, uri, file);
-            if (!copied) {
-                /* If any media files were created in prior iterations, delete those before
-                 * returning. */
-                for (File earlierFile : filesSoFar) {
-                    boolean deleted = earlierFile.delete();
-                    if (!deleted) {
-                        Log.i(TAG, "Could not delete the file " + earlierFile.toString());
-                    }
-                }
-                return null;
-            }
-            Uri resultUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", file);
-            results.add(resultUri.toString());
-        }
-        return results;
-    }
-
-    private void deleteMedia(List<String> mediaUris) {
-        for (String uriString : mediaUris) {
-            Uri uri = Uri.parse(uriString);
-            if (context.getContentResolver().delete(uri, null, null) == 0) {
-                Log.e(TAG, String.format("Did not delete file %s.", uriString));
-            }
-        }
-    }
-
-    /**
-     * A∖B={x∈A|x∉B}
-     *
-     * @return all elements of set A that are not in set B.
-     */
-    private static List<String> setDifference(List<String> a, List<String> b) {
-        List<String> c = new ArrayList<>();
-        for (String s : a) {
-            if (!b.contains(s)) {
-                c.add(s);
-            }
-        }
-        return c;
-    }
-
 }

app/src/main/res/drawable/ic_alert_circle.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M11,15H13V17H11V15M11,7H13V13H11V7M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20Z" />
+</vector>

app/src/main/res/drawable/ic_notebook.xml

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M3,7V5H5V4C5,2.89 5.9,2 7,2H13V9L15.5,7.5L18,9V2H19C20.05,2 21,2.95 21,4V20C21,21.05 20.05,22 19,22H7C5.95,22 5,21.05 5,20V19H3V17H5V13H3V11H5V7H3M7,11H5V13H7V11M7,7V5H5V7H7M7,19V17H5V19H7Z" />
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M3,7V5H5V4C5,2.89 5.9,2 7,2H13V9L15.5,7.5L18,9V2H19C20.05,2 21,2.95 21,4V20C21,21.05 20.05,22 19,22H7C5.95,22 5,21.05 5,20V19H3V17H5V13H3V11H5V7H3M7,11H5V13H7V11M7,7V5H5V7H7M7,19V17H5V19H7Z" />
 </vector>

app/src/main/res/layout-sw640dp/fragment_view_thread.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/windowBackgroundColor">
+    android:background="?attr/windowBackgroundColor"
+    tools:viewBindingIgnore="true">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"

app/src/main/res/layout/activity_compose.xml

@@ -202,10 +202,12 @@
                 android:id="@+id/pollPreview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:minWidth="@dimen/poll_preview_min_width"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
         </LinearLayout>
+
     </androidx.core.widget.NestedScrollView>
 
     <LinearLayout

app/src/main/res/layout/activity_drafts.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".components.drafts.DraftsActivity">
+
+    <include
+        android:id="@+id/includedToolbar"
+        layout="@layout/toolbar_basic" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/draftsRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    <com.keylesspalace.tusky.view.BackgroundMessageView
+        android:id="@+id/draftsErrorMessageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@android:color/transparent"
+        android:visibility="gone"
+        android:layout_gravity="center"
+        tools:src="@drawable/elephant_error"
+        tools:visibility="visible" />
+
+    <include
+        android:id="@+id/bottomSheet"
+        layout="@layout/item_status_bottom_sheet" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_view_thread.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipeRefreshLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="top">
+    android:layout_gravity="top"
+    tools:viewBindingIgnore="true">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"

app/src/main/res/layout/item_draft.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp"
+    android:background="?attr/selectableItemBackground"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp">
+
+    <TextView
+        android:id="@+id/draftSendingInfo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:drawablePadding="4dp"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center_vertical"
+        android:text="@string/drafts_toot_failed_to_send"
+        android:textColor="@color/tusky_red"
+        android:textSize="?attr/status_text_medium"
+        app:drawableStartCompat="@drawable/ic_alert_circle"
+        app:drawableTint="@color/tusky_red"
+        app:layout_constraintEnd_toStartOf="@id/deleteButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.emoji.widget.EmojiTextView
+        android:id="@+id/contentWarning"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:fontFamily="sans-serif-medium"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintEnd_toStartOf="@id/deleteButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/draftSendingInfo"
+        tools:text="Some content warning" />
+
+    <androidx.emoji.widget.EmojiTextView
+        android:id="@+id/content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintEnd_toStartOf="@id/deleteButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/contentWarning"
+        tools:text="Some toot content. May be very long." />
+
+    <ImageButton
+        android:id="@+id/deleteButton"
+        style="@style/TuskyImageButton"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="12dp"
+        android:contentDescription="@string/action_delete"
+        android:padding="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:srcCompat="@drawable/ic_clear_24dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/draftMediaPreview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/content" />
+
+    <com.keylesspalace.tusky.components.compose.view.PollPreviewView
+        android:id="@+id/draftPoll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:minWidth="@dimen/poll_preview_min_width"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/draftMediaPreview"
+        app:layout_goneMarginEnd="8dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/toolbar_basic.xml

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/appbar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="@dimen/actionbar_elevation"
+    app:layout_collapseMode="pin">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/appbar"
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="?attr/actionBarSize" />
-        android:elevation="@dimen/actionbar_elevation"
-        app:layout_collapseMode="pin">
 
-        <androidx.appcompat.widget.Toolbar
+</com.google.android.material.appbar.AppBarLayout>
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-</merge>

app/src/main/res/menu/drafts.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_old_drafts"
+        android:icon="@drawable/ic_notebook"
+        android:title="@string/old_drafts"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+</menu>

app/src/main/res/values/dimens.xml

@@ -46,6 +46,7 @@
     <dimen name="card_radius">5dp</dimen>
 
     <dimen name="poll_preview_padding">12dp</dimen>
+    <dimen name="poll_preview_min_width">120dp</dimen>
 
     <dimen name="adaptive_bitmap_inner_size">72dp</dimen>
     <dimen name="adaptive_bitmap_outer_size">108dp</dimen>

app/src/main/res/values/strings.xml

@@ -585,6 +585,7 @@
     <string name="pref_title_wellbeing_mode">Wellbeing</string>
     <string name="account_note_hint">Your private note about this account</string>
     <string name="account_note_saved">Saved!</string>
+
     <string name="wellbeing_mode_notice">Some information that might affect your mental wellbeing will be hidden. This includes:\n\n
         - Favorite/Boost/Follow notifications\n
         - Favorite/Boost count on toots\n
@@ -611,8 +612,6 @@
     <string name="error_upload_max_media_reached">You cannot upload more than %1$d media attachments.</string>
     <string name="dialog_delete_list_warning">Do you really want to delete the list %s?</string>
     <string name="drafts_toot_failed_to_send">This toot failed to send!</string>
-
-
     <string name="new_drafts_warning">
         The draft feature in Tusky has been completely redesigned to be faster, more user friendly and less buggy.\n
         You can still access your old drafts via a button on the new drafts screen,

app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt

@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-
 package com.keylesspalace.tusky
 
 import android.content.Intent
@@ -26,6 +25,7 @@ import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.components.compose.ComposeViewModel
 import com.keylesspalace.tusky.components.common.DEFAULT_CHARACTER_LIMIT
 import com.keylesspalace.tusky.components.common.MediaUploader
+import com.keylesspalace.tusky.components.drafts.DraftHelper
 import com.keylesspalace.tusky.db.*
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.*
@@ -145,6 +145,7 @@ class ComposeActivityTest {
                 accountManagerMock,
                 mock(MediaUploader::class.java),
                 mock(ServiceClient::class.java),
+                mock(DraftHelper::class.java),
                 mock(SaveTootHelper::class.java),
                 dbMock
         )