Merge pull request #301 from gavine99/stage-3-final-allow-editing-of-a-scheduled-message-296

changes to allow editing of scheduled messages
This commit is contained in:
octoshrimpy
2025-02-20 10:33:34 -05:00
committed by GitHub
8 changed files with 134 additions and 15 deletions
@@ -28,9 +28,9 @@ import android.os.Build
import android.provider.ContactsContract import android.provider.ContactsContract
import android.provider.Settings import android.provider.Settings
import android.provider.Telephony import android.provider.Telephony
import android.webkit.MimeTypeMap
import androidx.core.content.FileProvider
import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.BuildConfig
import dev.octoshrimpy.quik.compat.TelephonyCompat
import dev.octoshrimpy.quik.extensions.resourceExists
import dev.octoshrimpy.quik.feature.backup.BackupActivity import dev.octoshrimpy.quik.feature.backup.BackupActivity
import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.blocking.BlockingActivity
import dev.octoshrimpy.quik.feature.compose.ComposeActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity
@@ -44,6 +44,7 @@ import dev.octoshrimpy.quik.manager.AnalyticsManager
import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.BillingManager
import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.NotificationManager
import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.manager.PermissionManager
import dev.octoshrimpy.quik.model.ScheduledMessage
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@@ -100,9 +101,42 @@ class Navigator @Inject constructor(
intent.putExtra(Intent.EXTRA_TEXT, body) intent.putExtra(Intent.EXTRA_TEXT, body)
intent.putExtra("mode", mode) intent.putExtra("mode", mode)
attachments?.takeIf { it.isNotEmpty() }?.let { attachments
intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(attachments)) ?.takeIf { it.isNotEmpty() }
} ?.mapNotNull {
if (it.resourceExists(context)) it
else null
}
?.let { intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(it)) }
startActivity(intent)
}
fun showCompose(scheduledMessage: ScheduledMessage) {
val scheduledThreadId = TelephonyCompat.getOrCreateThreadId(
context,
scheduledMessage.recipients
)
val intent = Intent(context, ComposeActivity::class.java)
intent.putExtra(Intent.EXTRA_TEXT, scheduledMessage.body)
intent.putExtra("threadId", scheduledThreadId)
intent.putExtra("subscriptionId", scheduledMessage.subId)
intent.putExtra("sendAsGroup", scheduledMessage.sendAsGroup)
intent.putExtra("scheduleDateTime", scheduledMessage.date)
scheduledMessage.recipients
.takeIf { it.isNotEmpty() }
?.let { intent.putStringArrayListExtra("addresses", ArrayList(it)) }
scheduledMessage.attachments
.takeIf { it.isNotEmpty() }
?.mapNotNull {
val uri = Uri.parse(it)
if (uri.resourceExists(context)) uri
else null
}
?.let { intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(it)) }
startActivity(intent) startActivity(intent)
} }
@@ -81,9 +81,24 @@ class ComposeActivityModule {
@Provides @Provides
@Named("mode") @Named("mode")
fun provideSharedAction(activity: ComposeActivity): String { fun provideSharedAction(activity: ComposeActivity): String =
return activity.intent.getStringExtra("mode") ?: ""; activity.intent.getStringExtra("mode") ?: ""
}
@Provides
@Named("subscriptionId")
fun provideSubscriptionId(activity: ComposeActivity): Int =
activity.intent.getIntExtra("subscriptionId", -1)
@Provides
@Named("sendAsGroup")
fun provideSendAsGroup(activity: ComposeActivity): Boolean? =
if (!activity.intent.hasExtra("sendAsGroup")) null
else activity.intent.getBooleanExtra("sendAsGroup", false)
@Provides
@Named("scheduleDateTime")
fun provideSharedScheduleDateTime(activity: ComposeActivity): Long =
activity.intent.getLongExtra("scheduleDateTime", 0L)
@Provides @Provides
@IntoMap @IntoMap
@@ -91,8 +91,11 @@ class ComposeViewModel @Inject constructor(
@Named("threadId") private val threadId: Long, @Named("threadId") private val threadId: Long,
@Named("addresses") private val addresses: List<String>, @Named("addresses") private val addresses: List<String>,
@Named("text") private val sharedText: String, @Named("text") private val sharedText: String,
@Named("attachments") private val sharedAttachments: List<Attachment>, @Named("attachments") val sharedAttachments: List<Attachment>,
@Named("mode") private val mode: String, @Named("mode") private val mode: String,
@Named("subscriptionId") val sharedSubscriptionId: Int,
@Named("sendAsGroup") val sharedSendAsGroup: Boolean?,
@Named("scheduleDateTime") val sharedScheduledDateTime: Long,
private val contactRepo: ContactRepository, private val contactRepo: ContactRepository,
private val context: Context, private val context: Context,
private val activeConversationManager: ActiveConversationManager, private val activeConversationManager: ActiveConversationManager,
@@ -134,7 +137,20 @@ class ComposeViewModel @Inject constructor(
private var bluetoothMicManager: BluetoothMicManager? = null private var bluetoothMicManager: BluetoothMicManager? = null
init { init {
// set shared attachments into state, if any // set shared subscription into state if set
subscriptionManager.activeSubscriptionInfoList.firstOrNull {
it.subscriptionId == sharedSubscriptionId
}?.let { newState { copy(subscription = it)} }
// set shared scheduled datetime into state if set
if (sharedScheduledDateTime != 0L)
newState { copy (scheduled = sharedScheduledDateTime) }
// set shared sendAsGroup into state if set
if (sharedSendAsGroup != null)
newState { copy(sendAsGroup = sharedSendAsGroup) }
// set shared attachments into state
newState { copy(attachments = sharedAttachments) } newState { copy(attachments = sharedAttachments) }
val initialConversation = threadId.takeIf { it != 0L } val initialConversation = threadId.takeIf { it != 0L }
@@ -49,6 +49,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override val optionsItemIntent: Subject<Int> = PublishSubject.create() override val optionsItemIntent: Subject<Int> = PublishSubject.create()
override val deleteScheduledMessages: Subject<List<Long>> = PublishSubject.create() override val deleteScheduledMessages: Subject<List<Long>> = PublishSubject.create()
override val sendScheduledMessages: Subject<List<Long>> = PublishSubject.create() override val sendScheduledMessages: Subject<List<Long>> = PublishSubject.create()
override val editScheduledMessage: Subject<Long> = PublishSubject.create()
override val backPressedIntent: Subject<Unit> = PublishSubject.create() override val backPressedIntent: Subject<Unit> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
@@ -85,12 +86,16 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
}) })
// show/hide menu items // show/hide menu items
toolbar.menu.findItem(R.id.delete)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.select_all)?.isVisible = toolbar.menu.findItem(R.id.select_all)?.isVisible =
((scheduledMessageAdapter.itemCount > 1) && (state.selectedMessages != 0)) ((scheduledMessageAdapter.itemCount > 1) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.copy)?.isVisible = (state.selectedMessages != 0) toolbar.menu.findItem(R.id.delete)?.isVisible =
toolbar.menu.findItem(R.id.send_now)?.isVisible = (state.selectedMessages != 0) ((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.copy)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.send_now)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages != 0))
toolbar.menu.findItem(R.id.edit_message)?.isVisible =
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages == 1))
// show compose button // show compose button
compose.isVisible = state.upgraded compose.isVisible = state.upgraded
@@ -123,6 +128,17 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
.show() .show()
} }
override fun showEditMessageDialog(message: Long) {
android.app.AlertDialog.Builder(this)
.setTitle(R.string.dialog_edit_scheduled_message_title)
.setMessage(R.string.dialog_edit_scheduled_message)
.setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ ->
editScheduledMessage.onNext(message)
}
.setNegativeButton(R.string.button_cancel, null)
.show()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean { override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.scheduled_messages, menu) menuInflater.inflate(R.menu.scheduled_messages, menu)
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)
@@ -29,12 +29,14 @@ interface ScheduledView : QkView<ScheduledState> {
val optionsItemIntent: Observable<Int> val optionsItemIntent: Observable<Int>
val deleteScheduledMessages: Observable<List<Long>> val deleteScheduledMessages: Observable<List<Long>>
val sendScheduledMessages: Observable<List<Long>> val sendScheduledMessages: Observable<List<Long>>
val editScheduledMessage: Observable<Long>
val backPressedIntent: Observable<Unit> val backPressedIntent: Observable<Unit>
fun clearSelection() fun clearSelection()
fun toggleSelectAll() fun toggleSelectAll()
fun showDeleteDialog(messages: List<Long>) fun showDeleteDialog(messages: List<Long>)
fun showSendNowDialog(messages: List<Long>) fun showSendNowDialog(messages: List<Long>)
fun showEditMessageDialog(message: Long)
fun finishActivity() fun finishActivity()
} }
@@ -81,6 +81,13 @@ class ScheduledViewModel @Inject constructor(
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { view.showSendNowDialog(it) } .subscribe { view.showSendNowDialog(it) }
// edit message menu item selected
view.optionsItemIntent
.filter { it == R.id.edit_message }
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage -> selectedMessage.first() }
.autoDisposable(view.scope())
.subscribe { view.showEditMessageDialog(it) }
// delete message(s) (fired after the confirmation dialog has been shown) // delete message(s) (fired after the confirmation dialog has been shown)
view.deleteScheduledMessages view.deleteScheduledMessages
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@@ -101,6 +108,20 @@ class ScheduledViewModel @Inject constructor(
view.clearSelection() view.clearSelection()
} }
// edit message (fired after the confirmation dialog has been shown)
view.editScheduledMessage
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.autoDisposable(view.scope())
.subscribe {
scheduledMessageRepo.getScheduledMessage(it)?.let {
navigator.showCompose(it)
scheduledMessageRepo.deleteScheduledMessage(it.id)
}
view.clearSelection()
}
// navigate back or unselect // navigate back or unselect
view.optionsItemIntent view.optionsItemIntent
.filter { it == android.R.id.home } .filter { it == android.R.id.home }
@@ -44,7 +44,14 @@
<item <item
android:id="@+id/send_now" android:id="@+id/send_now"
android:icon="@drawable/ic_send_black_24dp" android:icon="@drawable/ic_send_black_24dp"
android:title="@string/main_menu_send_now" android:title="@string/scheduled_menu_send_now"
android:visible="false"
app:showAsAction="never" />
<item
android:id="@+id/edit_message"
android:icon="@drawable/ic_schedule_send_black_24dp"
android:title="@string/scheduled_menu_edit_message"
android:visible="false" android:visible="false"
app:showAsAction="never" /> app:showAsAction="never" />
@@ -58,6 +58,7 @@
<string name="main_menu_unread">Mark unread</string> <string name="main_menu_unread">Mark unread</string>
<string name="main_menu_block">Block</string> <string name="main_menu_block">Block</string>
<string name="main_menu_send_now">Send now</string> <string name="main_menu_send_now">Send now</string>
<string name="main_menu_edit_message">Edit message</string>
<string name="main_menu_rename_conversation">Rename conversation</string> <string name="main_menu_rename_conversation">Rename conversation</string>
<string name="main_syncing">Syncing messages…</string> <string name="main_syncing">Syncing messages…</string>
<string name="main_sender_you">You: %s</string> <string name="main_sender_you">You: %s</string>
@@ -77,6 +78,9 @@
<string name="main_permission_notifications">QUIK needs permission to display notifications</string> <string name="main_permission_notifications">QUIK needs permission to display notifications</string>
<string name="main_permission_allow">Allow</string> <string name="main_permission_allow">Allow</string>
<string name="scheduled_menu_send_now">Send now</string>
<string name="scheduled_menu_edit_message">Edit message</string>
<string name="drawer_inbox">Inbox</string> <string name="drawer_inbox">Inbox</string>
<string name="drawer_archived">Archived</string> <string name="drawer_archived">Archived</string>
<string name="drawer_scheduled">Scheduled</string> <string name="drawer_scheduled">Scheduled</string>
@@ -108,6 +112,10 @@
<item quantity="other">Are you sure you would like to send %d messages now?</item> <item quantity="other">Are you sure you would like to send %d messages now?</item>
</plurals> </plurals>
<string name="dialog_edit_scheduled_message_title">Edit message</string>
<string name="dialog_edit_scheduled_message">Editing this message will remove it from the schedule.\n\nMake sure to re-submit it on the next screen, or it will be lost.\n\nDo you want to continue?</string>
<string name="dialog_edit_scheduled_message_positive_button">Yes, edit the message</string>
<string name="dialog_clear_compose_title">Clear message</string> <string name="dialog_clear_compose_title">Clear message</string>
<string name="dialog_clear_compose">Clear the message? This action can\'t be undone.</string> <string name="dialog_clear_compose">Clear the message? This action can\'t be undone.</string>