Merge pull request #858 from Infomaniak/leave-if-compose-init-fail

Display error & leave Compose screen if Draft init fails

Author: sirambd

app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/DraftController.kt

@@ -108,12 +108,14 @@ object DraftController {
     //endregion
 
     //region Open Draft
-    fun Draft.setPreviousMessage(draftMode: DraftMode, message: Message, context: Context, realm: MutableRealm) {
+    fun Draft.setPreviousMessage(draftMode: DraftMode, message: Message, context: Context, realm: MutableRealm): Boolean {
+
+        var isSuccess = true
 
         val previousMessage = if (message.isFullyDownloaded) {
             message
         } else {
-            realm.fetchIncompleteMessages(listOf(message))
+            isSuccess = realm.fetchIncompleteMessages(listOf(message)).isEmpty()
             MessageController.getMessage(message.uid, realm)!!
         }
 
@@ -151,6 +153,8 @@ object DraftController {
             }
             DraftMode.NEW_MAIL -> Unit
         }
+
+        return isSuccess
     }
 
     private fun Context.replyQuote(message: Message): String {

app/src/main/java/com/infomaniak/mail/ui/main/newMessage/NewMessageFragment.kt

@@ -32,9 +32,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.webkit.WebView
-import android.widget.ArrayAdapter
-import android.widget.ListPopupWindow
-import android.widget.PopupWindow
+import android.widget.*
 import androidx.core.net.MailTo
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -93,7 +91,6 @@ class NewMessageFragment : Fragment() {
         initUi()
         initDraftAndViewModel()
 
-        focusCorrectView()
         setOnFocusChangedListeners()
 
         doAfterSubjectChange()
@@ -140,23 +137,29 @@ class NewMessageFragment : Fragment() {
     private fun initDraftAndViewModel() {
         newMessageViewModel.initDraftAndViewModel(newMessageActivityArgs).observe(viewLifecycleOwner) { isSuccess ->
             if (isSuccess) {
+                showKeyboardInCorrectView()
                 populateViewModelWithExternalMailData()
                 populateUiWithViewModel()
             } else {
+                displayOpeningDraftErrorToast()
                 requireActivity().finish()
             }
         }
     }
 
-    private fun focusCorrectView() = with(binding) {
+    private fun showKeyboardInCorrectView() = with(binding) {
         when (newMessageActivityArgs.draftMode) {
             DraftMode.REPLY,
-            DraftMode.REPLY_ALL -> bodyText.requestFocus()
+            DraftMode.REPLY_ALL -> bodyText.showKeyboard()
             DraftMode.NEW_MAIL,
-            DraftMode.FORWARD -> toField.requestFocus()
+            DraftMode.FORWARD -> toField.showKeyboardInTextInput()
         }
     }
 
+    private fun displayOpeningDraftErrorToast() {
+        Toast.makeText(requireActivity(), getString(R.string.failToOpenDraft), Toast.LENGTH_SHORT).show()
+    }
+
     private fun setOnFocusChangedListeners() = with(binding) {
         val listener = View.OnFocusChangeListener { _, hasFocus -> if (hasFocus) fieldGotFocus(null) }
         subjectTextField.onFocusChangeListener = listener

app/src/main/java/com/infomaniak/mail/ui/main/newMessage/NewMessageViewModel.kt

@@ -101,13 +101,11 @@ class NewMessageViewModel(application: Application) : AndroidViewModel(applicati
                 draft = if (draftExists) {
                     getLatestDraft(draftLocalUuid, realm = this)
                         ?: fetchDraft(draftResource!!, messageUid!!)
-                        ?: run {
-                            // TODO: Add Loader to block UI while waiting for `fetchDraft` API call to finish
-                            return@writeBlocking false
-                        }
+                        ?: run { return@writeBlocking false }
                 } else {
                     isNewMessage = true
                     createDraft(draftMode, previousMessageUid, recipient)
+                        ?: run { return@writeBlocking false }
                 }
 
                 if (draft.identityId.isNullOrBlank()) draft.addMissingSignatureData(realm = this)
@@ -139,7 +137,7 @@ class NewMessageViewModel(application: Application) : AndroidViewModel(applicati
         }
     }
 
-    private fun MutableRealm.createDraft(draftMode: DraftMode, previousMessageUid: String?, recipient: Recipient?): Draft {
+    private fun MutableRealm.createDraft(draftMode: DraftMode, previousMessageUid: String?, recipient: Recipient?): Draft? {
         return Draft().apply {
             initLocalValues(priority = Priority.NORMAL, mimeType = ClipDescription.MIMETYPE_TEXT_HTML)
             initSignature(realm = this@createDraft)
@@ -148,7 +146,10 @@ class NewMessageViewModel(application: Application) : AndroidViewModel(applicati
                 DraftMode.REPLY, DraftMode.REPLY_ALL, DraftMode.FORWARD -> {
                     previousMessageUid
                         ?.let { uid -> MessageController.getMessage(uid, realm = this@createDraft) }
-                        ?.let { message -> setPreviousMessage(draftMode, message, context, realm = this@createDraft) }
+                        ?.let { message ->
+                            val isSuccess = setPreviousMessage(draftMode, message, context, realm = this@createDraft)
+                            if (!isSuccess) return null
+                        }
                 }
             }
         }

app/src/main/java/com/infomaniak/mail/ui/main/newMessage/RecipientFieldView.kt

@@ -154,6 +154,10 @@ class RecipientFieldView @JvmOverloads constructor(
         }
     }
 
+    fun showKeyboardInTextInput() {
+        binding.textInput.showKeyboard()
+    }
+
     private fun setupChipsRecyclerView() = with(binding) {
         chipsRecyclerView.adapter = contactChipAdapter
 

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

@@ -51,6 +51,10 @@
     <string name="addUnknownRecipientTitle">Einen Empfänger hinzufügen</string>
     <string name="appSecurityDescription">Schützen Sie den Zugriff auf Ihre App, indem Sie Ihre Telefonsperre aktivieren.</string>
     <string name="archiveFolder">Archiviert</string>
+    <string name="attachAddressDescription">Sie haben bereits eine Infomaniak-Mailadresse, loggen Sie sich jetzt ein.</string>
+    <string name="attachAddressInputHint">Mailadresse hinzufügen</string>
+    <string name="attachAddressPasswordInputHint">Passwort für die Mailadresse</string>
+    <string name="attachAddressTitle">Mailadresse hinzufügen</string>
     <string name="attachmentActionCamera">Kamera</string>
     <string name="attachmentActionFile">Eine Datei anhängen</string>
     <string name="attachmentActionPhotoLibrary">Ein Foto aus der Fotobibliothek senden</string>
@@ -68,6 +72,7 @@
     <string name="buttonAccountSwitch">Konto ändern</string>
     <string name="buttonAddAccount">Account hinzufügen</string>
     <string name="buttonAddEmailAddress">Eine E-Mail-Adresse hinzufügen</string>
+    <string name="buttonAttachEmailAddress">Mailadresse hinzufügen</string>
     <string name="buttonAttachment">Einen Anhang hinzufügen</string>
     <string name="buttonAvailableSoon">Bald verfügbar</string>
     <string name="buttonBold">Kühn</string>
@@ -131,6 +136,7 @@
     <string name="contentDescriptionButtonNext">Weiter</string>
     <string name="contentDescriptionButtonOpenSystemSettings">Öffnen Sie die Benachrichtigungseinstellungen des Systems</string>
     <string name="contentDescriptionButtonSettings">Einstellungen</string>
+    <string name="contentDescriptionButtonShowPassword">Passwort anzeigen</string>
     <string name="contentDescriptionContactAlreadyUsed">Kontakt bereits als Empfänger verwendet</string>
     <string name="contentDescriptionDownloadIndicator">Herunterladen von</string>
     <string name="contentDescriptionIconAttachments">Hat Anhänge</string>
@@ -161,15 +167,15 @@
     <string name="emptyStateSearchTitle">Keine Ergebnisse</string>
     <string name="emptyStateTrashDescription">Verschieben Sie die Nachrichten in den Papierkorb. Sie werden nach 30 Tagen endgültig gelöscht.</string>
     <string name="emptyStateTrashTitle">Der Papierkorb ist leer</string>
+    <string name="errorAttachAddressInput">Nur Infomaniak-Mailadressen werden unterstützt</string>
     <string name="errorLoginDescription">Die Verbindung ist fehlgeschlagen.</string>
     <string name="errorLoginTitle">Login-Fehler</string>
     <string name="errorNewFolderAlreadyExists">Ein Ordner mit diesem Namen existiert bereits</string>
     <string name="errorNewFolderNameTooLong">Der Ordnername sollte nicht länger als 255 Zeichen sein.</string>
+    <string name="failToOpenDraft">Öffnen des Entwurfs fehlgeschlagen</string>
     <string name="favoritesFolder">Favoriten</string>
     <string name="fromTitle">Von:</string>
     <string name="googlePlayServicesAreRequired">Google Play Services sind erforderlich</string>
-    <string name="helpChatbot">Chatbot</string>
-    <string name="helpFAQ">FAQ</string>
     <string name="inboxFolder">Posteingang</string>
     <string name="loadingText">Laden…</string>
     <string name="menuDrawerAdvancedActions">Erweiterte Aktionen</string>

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

@@ -51,6 +51,10 @@
     <string name="addUnknownRecipientTitle">Añadir un destinatario</string>
     <string name="appSecurityDescription">Protege el acceso a tu aplicación activando el bloqueo del teléfono.</string>
     <string name="archiveFolder">Archivado</string>
+    <string name="attachAddressDescription">Si ya dispone de una dirección de correo electrónico Infomaniak, conéctese ahora.</string>
+    <string name="attachAddressInputHint">Dirección de correo electrónico que desea añadir</string>
+    <string name="attachAddressPasswordInputHint">Contraseña de la dirección de correo electrónico</string>
+    <string name="attachAddressTitle">Añadir dirección de correo electrónico</string>
     <string name="attachmentActionCamera">Cámara</string>
     <string name="attachmentActionFile">Adjuntar un archivo</string>
     <string name="attachmentActionPhotoLibrary">Enviar una foto desde la fototeca</string>
@@ -68,6 +72,7 @@
     <string name="buttonAccountSwitch">Cambiar de cuenta</string>
     <string name="buttonAddAccount">Añadir una cuenta</string>
     <string name="buttonAddEmailAddress">Añadir una dirección de correo electrónico</string>
+    <string name="buttonAttachEmailAddress">Añadir dirección de correo electrónico</string>
     <string name="buttonAttachment">Añadir un archivo adjunto</string>
     <string name="buttonAvailableSoon">Disponible en breve</string>
     <string name="buttonBold">Negrita</string>
@@ -131,6 +136,7 @@
     <string name="contentDescriptionButtonNext">Siguiente</string>
     <string name="contentDescriptionButtonOpenSystemSettings">Abrir la configuración de notificaciones del sistema</string>
     <string name="contentDescriptionButtonSettings">Ajustes</string>
+    <string name="contentDescriptionButtonShowPassword">Mostrar contraseña</string>
     <string name="contentDescriptionContactAlreadyUsed">Contacto ya utilizado como destinatario</string>
     <string name="contentDescriptionDownloadIndicator">Descargar</string>
     <string name="contentDescriptionIconAttachments">Tiene accesorios</string>
@@ -161,15 +167,15 @@
     <string name="emptyStateSearchTitle">Sin resultados</string>
     <string name="emptyStateTrashDescription">Mueve los mensajes a la papelera. Se borrarán definitivamente pasados 30 días.</string>
     <string name="emptyStateTrashTitle">La papelera está vacía</string>
+    <string name="errorAttachAddressInput">Sólo se admiten las direcciones de correo electrónico Infomaniak</string>
     <string name="errorLoginDescription">La conexión ha fallado.</string>
     <string name="errorLoginTitle">Error de inicio de sesión</string>
     <string name="errorNewFolderAlreadyExists">Ya existe una carpeta con este nombre</string>
     <string name="errorNewFolderNameTooLong">El nombre de la carpeta no debe superar los 255 caracteres</string>
+    <string name="failToOpenDraft">No se ha podido abrir el borrador</string>
     <string name="favoritesFolder">Favoritos</string>
     <string name="fromTitle">De:</string>
     <string name="googlePlayServicesAreRequired">Se requieren los servicios de Google Play</string>
-    <string name="helpChatbot">Chatbot</string>
-    <string name="helpFAQ">PREGUNTAS FRECUENTES</string>
     <string name="inboxFolder">Bandeja de entrada</string>
     <string name="loadingText">Cargando…</string>
     <string name="menuDrawerAdvancedActions">Acciones avanzadas</string>

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

@@ -51,6 +51,10 @@
     <string name="addUnknownRecipientTitle">Ajoutez un destinataire</string>
     <string name="appSecurityDescription">Protégez l’accès à votre application en activant le verrouillage de votre téléphone.</string>
     <string name="archiveFolder">Archive</string>
+    <string name="attachAddressDescription">Vous possédez déjà une adresse mail Infomaniak, connectez-vous dès maintenant.</string>
+    <string name="attachAddressInputHint">Adresse mail à ajouter</string>
+    <string name="attachAddressPasswordInputHint">Mot de passe de l’adresse mail</string>
+    <string name="attachAddressTitle">Ajoutez une adresse mail</string>
     <string name="attachmentActionCamera">Appareil photo</string>
     <string name="attachmentActionFile">Joindre un fichier</string>
     <string name="attachmentActionPhotoLibrary">Envoyer une photo depuis la photothèque</string>
@@ -69,6 +73,7 @@
     <string name="buttonAccountSwitch">Changer de compte</string>
     <string name="buttonAddAccount">Ajouter un compte</string>
     <string name="buttonAddEmailAddress">Ajouter une adresse mail</string>
+    <string name="buttonAttachEmailAddress">Ajouter l’adresse mail</string>
     <string name="buttonAttachment">Ajouter une pièce jointe</string>
     <string name="buttonAvailableSoon">Bientôt disponible</string>
     <string name="buttonBold">Gras</string>
@@ -132,6 +137,7 @@
     <string name="contentDescriptionButtonNext">Suivant</string>
     <string name="contentDescriptionButtonOpenSystemSettings">Ouvrir les paramètres de notification du système</string>
     <string name="contentDescriptionButtonSettings">Paramètres</string>
+    <string name="contentDescriptionButtonShowPassword">Voir le mot de passe</string>
     <string name="contentDescriptionContactAlreadyUsed">Contact déjà utilisé comme destinataire</string>
     <string name="contentDescriptionDownloadIndicator">Téléchargement</string>
     <string name="contentDescriptionIconAttachments">Contient des pièces jointes</string>
@@ -162,15 +168,15 @@
     <string name="emptyStateSearchTitle">Aucun résultat</string>
     <string name="emptyStateTrashDescription">Déplacez les messages dans la corbeille. Ils seront supprimés définitivement au bout de 30 jours.</string>
     <string name="emptyStateTrashTitle">La corbeille est vide</string>
+    <string name="errorAttachAddressInput">Seules les adresses mails Infomaniak sont supportées</string>
     <string name="errorLoginDescription">La connexion a échoué.</string>
     <string name="errorLoginTitle">Erreur de connexion</string>
     <string name="errorNewFolderAlreadyExists">Un dossier de ce nom existe déjà</string>
     <string name="errorNewFolderNameTooLong">Le nom du dossier ne doit pas dépasser 255 caractères</string>
+    <string name="failToOpenDraft">Échec de l’ouverture du brouillon</string>
     <string name="favoritesFolder">Favoris</string>
     <string name="fromTitle">De :</string>
     <string name="googlePlayServicesAreRequired">Les Google Play Services sont requis</string>
-    <string name="helpChatbot">Chatbot</string>
-    <string name="helpFAQ">FAQ</string>
     <string name="inboxFolder">Boîte de réception</string>
     <string name="loadingText">Chargement…</string>
     <string name="menuDrawerAdvancedActions">Actions avancées</string>

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

@@ -51,6 +51,10 @@
     <string name="addUnknownRecipientTitle">Aggiungere un destinatario</string>
     <string name="appSecurityDescription">Proteggete l’accesso alla vostra applicazione attivando il blocco del telefono.</string>
     <string name="archiveFolder">Archiviato</string>
+    <string name="attachAddressDescription">Se hai già un indirizzo e-mail Infomaniak, accedi ora.</string>
+    <string name="attachAddressInputHint">Indirizzo e-mail da aggiungere</string>
+    <string name="attachAddressPasswordInputHint">Password per l’indirizzo e-mail</string>
+    <string name="attachAddressTitle">Aggiungi indirizzo e-mail</string>
     <string name="attachmentActionCamera">Macchina fotografica</string>
     <string name="attachmentActionFile">Allegare un file</string>
     <string name="attachmentActionPhotoLibrary">Inviare una foto dalla libreria fotografica</string>
@@ -68,6 +72,7 @@
     <string name="buttonAccountSwitch">Modifica del conto</string>
     <string name="buttonAddAccount">Aggiungere un account</string>
     <string name="buttonAddEmailAddress">Aggiungere un indirizzo e-mail</string>
+    <string name="buttonAttachEmailAddress">Aggiungere l’indirizzo e-mail</string>
     <string name="buttonAttachment">Aggiungere un allegato</string>
     <string name="buttonAvailableSoon">Disponibile a breve</string>
     <string name="buttonBold">In grassetto</string>
@@ -131,6 +136,7 @@
     <string name="contentDescriptionButtonNext">Avanti</string>
     <string name="contentDescriptionButtonOpenSystemSettings">Aprire le impostazioni di notifica del sistema</string>
     <string name="contentDescriptionButtonSettings">Impostazioni</string>
+    <string name="contentDescriptionButtonShowPassword">Mostra password</string>
     <string name="contentDescriptionContactAlreadyUsed">Contatto già utilizzato come destinatario</string>
     <string name="contentDescriptionDownloadIndicator">Scaricare</string>
     <string name="contentDescriptionIconAttachments">Dispone di allegati</string>
@@ -161,15 +167,15 @@
     <string name="emptyStateSearchTitle">Nessun risultato</string>
     <string name="emptyStateTrashDescription">Spostate i messaggi nel cestino. Verranno eliminati definitivamente dopo 30 giorni.</string>
     <string name="emptyStateTrashTitle">Il cestino è vuoto</string>
+    <string name="errorAttachAddressInput">Sono supportati solo gli indirizzi e-mail Infomaniak</string>
     <string name="errorLoginDescription">La connessione non è riuscita.</string>
     <string name="errorLoginTitle">Errore di accesso</string>
     <string name="errorNewFolderAlreadyExists">Esiste già una cartella con questo nome</string>
     <string name="errorNewFolderNameTooLong">Il nome della cartella non deve superare i 255 caratteri</string>
+    <string name="failToOpenDraft">Impossibile aprire la bozza</string>
     <string name="favoritesFolder">Preferiti</string>
     <string name="fromTitle">Da:</string>
     <string name="googlePlayServicesAreRequired">I servizi Google Play sono necessari</string>
-    <string name="helpChatbot">Chatbot</string>
-    <string name="helpFAQ">FAQ</string>
     <string name="inboxFolder">Posta in arrivo</string>
     <string name="loadingText">Caricamento…</string>
     <string name="menuDrawerAdvancedActions">Azioni avanzate</string>