Initial focus in message compose screen #8664
+148
−120
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package com.fsck.k9.ui.compose | ||
|
|
||
| import android.content.Intent | ||
| import android.net.Uri | ||
| import android.nfc.NfcAdapter | ||
| import android.os.Parcelable | ||
| import androidx.core.content.IntentCompat | ||
| import com.fsck.k9.activity.MessageCompose | ||
| import org.openintents.openpgp.util.OpenPgpApi | ||
|
|
||
| @Suppress("NestedBlockDepth", "MaxLineLength") | ||
| class IntentDataMapper { | ||
|
There was a problem hiding this comment. Ideally this would be covered by tests. |
||
|
|
||
| fun initFromIntent(intent: Intent): IntentData { | ||
| val action: String? = intent.action | ||
| var intentData = IntentData() | ||
|
|
||
| if ( | ||
| Intent.ACTION_VIEW == action || | ||
| Intent.ACTION_SENDTO == action || | ||
| NfcAdapter.ACTION_NDEF_DISCOVERED == action | ||
| ) { | ||
| intent.data?.let { data -> | ||
| intentData = intentData.copy(mailToUri = data) | ||
| } | ||
| } | ||
|
|
||
| if (( | ||
| Intent.ACTION_SEND == action || Intent.ACTION_SEND_MULTIPLE == action || | ||
| Intent.ACTION_SENDTO == action || Intent.ACTION_VIEW == action | ||
| ) | ||
| ) { | ||
| intentData = intentData.copy( | ||
| startedByExternalIntent = true, | ||
| extraText = intent.getCharSequenceExtra(Intent.EXTRA_TEXT), | ||
| intentType = intent.type, | ||
| ) | ||
|
|
||
| if ((Intent.ACTION_SEND == action)) { | ||
| val extraStream = IntentCompat.getParcelableExtra( | ||
| intent, | ||
| Intent.EXTRA_STREAM, | ||
| Uri::class.java, | ||
| ) | ||
| intentData = intentData.copy(extraStream = extraStream) | ||
| } else { | ||
| val list: List<Parcelable>? = IntentCompat.getParcelableArrayListExtra( | ||
| intent, | ||
| Intent.EXTRA_STREAM, | ||
| Parcelable::class.java, | ||
| ) | ||
| list?.let { | ||
| for (parcelable in it) { | ||
| intentData = intentData.copy(extraStream = parcelable as Uri) | ||
| } | ||
| } | ||
| } | ||
| intentData = intentData.copy( | ||
| subject = intent.getStringExtra(Intent.EXTRA_SUBJECT), | ||
| shouldInitFromSendOrViewIntent = true, | ||
| ) | ||
| } | ||
|
|
||
| if ((MessageCompose.ACTION_AUTOCRYPT_PEER == action)) { | ||
| intentData = intentData.copy( | ||
| trustId = intent.getStringExtra(OpenPgpApi.EXTRA_AUTOCRYPT_PEER_ID), | ||
| startedByExternalIntent = true, | ||
| ) | ||
| } | ||
| return intentData | ||
| } | ||
| } | ||
|
|
||
| data class IntentData( | ||
| val startedByExternalIntent: Boolean = false, | ||
| val shouldInitFromSendOrViewIntent: Boolean = false, | ||
| val mailToUri: Uri? = null, | ||
| val extraText: CharSequence? = null, | ||
| val intentType: String? = null, | ||
| val extraStream: Uri? = null, | ||
| val subject: String? = null, | ||
| val trustId: String? = null, | ||
| ) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of creating a class member that could leak, it's better to keep it as is and change the
messageLoaderCallbacksto a private class and inject therecipientMvpViewwhen creating it.This is possible as
recipientMvpViewis only needed inonCreate.