diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 0ae131c9..42bb477d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -28,9 +28,9 @@ import android.os.Build import android.provider.ContactsContract import android.provider.Settings import android.provider.Telephony -import android.webkit.MimeTypeMap -import androidx.core.content.FileProvider 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.blocking.BlockingActivity 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.NotificationManager import dev.octoshrimpy.quik.manager.PermissionManager +import dev.octoshrimpy.quik.model.ScheduledMessage import java.io.File import javax.inject.Inject import javax.inject.Singleton @@ -100,9 +101,42 @@ class Navigator @Inject constructor( intent.putExtra(Intent.EXTRA_TEXT, body) intent.putExtra("mode", mode) - attachments?.takeIf { it.isNotEmpty() }?.let { - intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(attachments)) - } + 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) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt index fcc5646f..165bf0e3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt @@ -81,9 +81,24 @@ class ComposeActivityModule { @Provides @Named("mode") - fun provideSharedAction(activity: ComposeActivity): String { - return activity.intent.getStringExtra("mode") ?: ""; - } + fun provideSharedAction(activity: ComposeActivity): String = + 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 @IntoMap diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index daa4ca56..6d0805eb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -91,8 +91,11 @@ class ComposeViewModel @Inject constructor( @Named("threadId") private val threadId: Long, @Named("addresses") private val addresses: List, @Named("text") private val sharedText: String, - @Named("attachments") private val sharedAttachments: List, + @Named("attachments") val sharedAttachments: List, @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 context: Context, private val activeConversationManager: ActiveConversationManager, @@ -134,7 +137,20 @@ class ComposeViewModel @Inject constructor( private var bluetoothMicManager: BluetoothMicManager? = null 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) } val initialConversation = threadId.takeIf { it != 0L } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index e1dc3738..6319c13c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -49,6 +49,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override val optionsItemIntent: Subject = PublishSubject.create() override val deleteScheduledMessages: Subject> = PublishSubject.create() override val sendScheduledMessages: Subject> = PublishSubject.create() + override val editScheduledMessage: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] } @@ -85,12 +86,16 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { }) // 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 = ((scheduledMessageAdapter.itemCount > 1) && (state.selectedMessages != 0)) - toolbar.menu.findItem(R.id.copy)?.isVisible = (state.selectedMessages != 0) - toolbar.menu.findItem(R.id.send_now)?.isVisible = (state.selectedMessages != 0) + toolbar.menu.findItem(R.id.delete)?.isVisible = + ((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 compose.isVisible = state.upgraded @@ -123,6 +128,17 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { .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 { menuInflater.inflate(R.menu.scheduled_messages, menu) return super.onCreateOptionsMenu(menu) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt index b1717287..2ca1b2ea 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt @@ -29,12 +29,14 @@ interface ScheduledView : QkView { val optionsItemIntent: Observable val deleteScheduledMessages: Observable> val sendScheduledMessages: Observable> + val editScheduledMessage: Observable val backPressedIntent: Observable fun clearSelection() fun toggleSelectAll() fun showDeleteDialog(messages: List) fun showSendNowDialog(messages: List) + fun showEditMessageDialog(message: Long) fun finishActivity() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index e2449208..881c0788 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -81,6 +81,13 @@ class ScheduledViewModel @Inject constructor( .autoDisposable(view.scope()) .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) view.deleteScheduledMessages .observeOn(AndroidSchedulers.mainThread()) @@ -101,6 +108,20 @@ class ScheduledViewModel @Inject constructor( 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 view.optionsItemIntent .filter { it == android.R.id.home } diff --git a/presentation/src/main/res/menu/scheduled_messages.xml b/presentation/src/main/res/menu/scheduled_messages.xml index 1e86b168..82cd2712 100644 --- a/presentation/src/main/res/menu/scheduled_messages.xml +++ b/presentation/src/main/res/menu/scheduled_messages.xml @@ -44,7 +44,14 @@ + + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 1a1a8a4b..1cd06c3d 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -58,6 +58,7 @@ Mark unread Block Send now + Edit message Rename conversation Syncing messages… You: %s @@ -77,6 +78,9 @@ QUIK needs permission to display notifications Allow + Send now + Edit message + Inbox Archived Scheduled @@ -108,6 +112,10 @@ Are you sure you would like to send %d messages now? + Edit 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? + Yes, edit the message + Clear message Clear the message? This action can\'t be undone.