Merge pull request #549 from jorgeblacio/release_0_21_13

danieltigse · web-flow · commit 139b1d7ef0c3 · 2019-09-26T14:18:31.000-05:00
Various bug fixes.
diff --git a/src/main/kotlin/com/criptext/mail/bgworker/BackgroundWorkManager.kt b/src/main/kotlin/com/criptext/mail/bgworker/BackgroundWorkManager.kt
@@ -12,13 +12,13 @@ abstract class BackgroundWorkManager<in I: Any, O: Any> {
     var listener: ((O) -> Unit)? = null
         set (newListener) {
                 if (newListener != null) {
-                    state.keys.forEach({ key ->
+                    state.keys.forEach { key ->
                         val workState = state[key]
                         if (workState is WorkState.Done)  {
                             state.remove(key)
                             newListener(workState.result)
                         }
-                    })
+                    }
                 }
           field = newListener
         }
@@ -35,6 +35,4 @@ abstract class BackgroundWorkManager<in I: Any, O: Any> {
             runner.workInBackground(worker)
         }
     }
-
-
 }
diff --git a/src/main/kotlin/com/criptext/mail/db/dao/AccountDao.kt b/src/main/kotlin/com/criptext/mail/db/dao/AccountDao.kt
@@ -95,4 +95,9 @@ interface AccountDao {
             where recipientId=:recipientId AND domain=:domain""")
     fun updateRefreshToken(recipientId: String, domain: String, token: String)
 
+    @Query("""UPDATE account
+            SET signature=:signature
+            where id=:id""")
+    fun updateSignature(id: Long, signature: String)
+
 }
diff --git a/src/main/kotlin/com/criptext/mail/push/services/NewMailActionService.kt b/src/main/kotlin/com/criptext/mail/push/services/NewMailActionService.kt
@@ -33,8 +33,15 @@ class NewMailActionService : IntentService("New Mail Action Service") {
         val manager = this.applicationContext
                 .getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val db = AppDatabase.getAppDatabase(this)
-        if(activeAccount.userEmail != data.recipientId.plus("@${data.domain}"))
-            activeAccount = ActiveAccount.loadFromDB(db.accountDao().getAccount(data.recipientId, data.domain)!!)!!
+        if(activeAccount.userEmail != data.recipientId.plus("@${data.domain}")) {
+            val account = db.accountDao().getAccount(data.recipientId, data.domain)
+            if(account != null){
+                activeAccount = ActiveAccount.loadFromDB(account)!!
+            } else {
+                deletePush(storage, manager)
+                return
+            }
+        }
         val requestHandler = PushAPIRequestHandler(NotificationError(this), manager,
                 activeAccount, HttpClient.Default(),
                 storage)
@@ -49,17 +56,21 @@ class NewMailActionService : IntentService("New Mail Action Service") {
                         EmailDetailLocalDB.Default(db, this.filesDir), db.emailDao(), db.pendingEventDao(), db.accountDao())
             }
             DELETE -> {
-                val notCount = storage.getInt(KeyValueStorage.StringKey.NewMailNotificationCount, 0)
-                if((notCount - 1) <= 0) {
-                    manager.cancel(CriptextNotification.INBOX_ID)
-                }
-                storage.putInt(KeyValueStorage.StringKey.NewMailNotificationCount,
-                        if(notCount <= 0) 0 else notCount - 1)
+                deletePush(storage, manager)
             }
             else -> throw IllegalArgumentException("Unsupported action: " + data.action)
         }
     }
 
+    private fun deletePush(storage: KeyValueStorage, manager: NotificationManager){
+        val notCount = storage.getInt(KeyValueStorage.StringKey.NewMailNotificationCount, 0)
+        if((notCount - 1) <= 0) {
+            manager.cancel(CriptextNotification.INBOX_ID)
+        }
+        storage.putInt(KeyValueStorage.StringKey.NewMailNotificationCount,
+                if(notCount <= 0) 0 else notCount - 1)
+    }
+
     private fun getIntentData(intent: Intent?, activeRecipientId: String): IntentData {
         val action = intent!!.action ?: ""
         val notificationId = intent.getIntExtra("notificationId", 0)
diff --git a/src/main/kotlin/com/criptext/mail/scenes/composer/workers/SaveEmailWorker.kt b/src/main/kotlin/com/criptext/mail/scenes/composer/workers/SaveEmailWorker.kt
@@ -68,7 +68,7 @@ class SaveEmailWorker(
 
     private fun getEmailPreview(emailId: Long): EmailThread {
         val email = db.loadFullEmail(emailId, account)!!
-        val label = db.getLabelById(currentLabel.id, account.id)!!
+        val label = db.getLabelById(currentLabel.id, account.id) ?: Label.defaultItems.inbox
         return db.getEmailThreadFromEmail(email.email, label.text, Label.defaultItems.rejectedLabelsByFolder(label.text).map { it.id }, account.userEmail, account)
     }
 
diff --git a/src/main/kotlin/com/criptext/mail/scenes/mailbox/MailboxSceneController.kt b/src/main/kotlin/com/criptext/mail/scenes/mailbox/MailboxSceneController.kt
@@ -200,7 +200,6 @@ class MailboxSceneController(private val scene: MailboxScene,
             scene.showExtraAccountsBadge(false)
             scene.hideMultipleAccountsMenu()
             threadListController.clear()
-            model.threads.clear()
             dataSource.submitRequest(MailboxRequest.SetActiveAccount(account))
         }
 
diff --git a/src/main/kotlin/com/criptext/mail/scenes/mailbox/workers/SendMailWorker.kt b/src/main/kotlin/com/criptext/mail/scenes/mailbox/workers/SendMailWorker.kt
@@ -338,7 +338,7 @@ class SendMailWorker(private val signalClient: SignalClient,
         return when (finalResult) {
             is Result.Success -> {
                 db.increaseContactScore(listOf(emailId))
-                val label = db.getLabelById(currentLabel.id, activeAccount.id)!!
+                val label = db.getLabelById(currentLabel.id, activeAccount.id) ?: Label.defaultItems.inbox
                 val thread = db.getEmailThreadFromEmail(currentEmail!!, label.text, Label.defaultItems.rejectedLabelsByFolder(label.text).map { it.id }, activeAccount.userEmail, activeAccount)
                 MailboxResult.SendMail.Success(EmailPreview.fromEmailThread(thread), currentLabel, isSecure)
             }
diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/data/SettingsDataSource.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/data/SettingsDataSource.kt
@@ -36,6 +36,13 @@ class SettingsDataSource(
                     activeAccount = activeAccount,
                     publishFn = { res -> flushResults(res) }
             )
+            is SettingsRequest.UpdateSignature -> UpdateSignatureWorker(
+                    signature = params.signature,
+                    accountDao = settingsLocalDB.accountDao,
+                    activeAccount = activeAccount,
+                    httpClient = httpClient,
+                    publishFn = { res -> flushResults(res) }
+            )
         }
     }
 }
diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/data/SettingsRequest.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/data/SettingsRequest.kt
@@ -3,4 +3,5 @@ package com.criptext.mail.scenes.settings.data
 sealed class SettingsRequest{
     class ResetPassword: SettingsRequest()
     class SyncBegin: SettingsRequest()
+    data class UpdateSignature(val signature: String): SettingsRequest()
 }
diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/data/SettingsResult.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/data/SettingsResult.kt
@@ -1,6 +1,5 @@
 package com.criptext.mail.scenes.settings.data
 
-import com.criptext.mail.db.models.Label
 import com.criptext.mail.utils.UIMessage
 
 sealed class SettingsResult{
@@ -14,4 +13,9 @@ sealed class SettingsResult{
         data class NoDevicesAvailable(val message: UIMessage): SyncBegin()
         data class Failure(val message: UIMessage): SyncBegin()
     }
+
+    sealed class UpdateSignature: SettingsResult() {
+        class Success: UpdateSignature()
+        data class Failure(val message: UIMessage): UpdateSignature()
+    }
 }
diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/signature/SignatureController.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/signature/SignatureController.kt
@@ -75,6 +75,7 @@ class SignatureController(
 
     private fun updateSignature(){
         activeAccount.updateSignature(storage, scene.getSignature())
+        dataSource.submitRequest(SettingsRequest.UpdateSignature(scene.getSignature()))
     }
 
 }
diff --git a/src/main/kotlin/com/criptext/mail/scenes/settings/workers/UpdateSignatureWorker.kt b/src/main/kotlin/com/criptext/mail/scenes/settings/workers/UpdateSignatureWorker.kt
@@ -0,0 +1,54 @@
+package com.criptext.mail.scenes.settings.workers
+
+import com.criptext.mail.R
+import com.criptext.mail.api.HttpClient
+import com.criptext.mail.api.HttpErrorHandlingHelper
+import com.criptext.mail.api.ServerErrorException
+import com.criptext.mail.bgworker.BackgroundWorker
+import com.criptext.mail.bgworker.ProgressReporter
+import com.criptext.mail.db.KeyValueStorage
+import com.criptext.mail.db.dao.AccountDao
+import com.criptext.mail.db.models.ActiveAccount
+import com.criptext.mail.scenes.settings.data.SettingsAPIClient
+import com.criptext.mail.scenes.settings.data.SettingsResult
+import com.criptext.mail.utils.EmailAddressUtils
+import com.criptext.mail.utils.ServerCodes
+import com.criptext.mail.utils.UIMessage
+import com.github.kittinunf.result.Result
+import com.github.kittinunf.result.mapError
+
+
+class UpdateSignatureWorker(val httpClient: HttpClient,
+                            val activeAccount: ActiveAccount,
+                            private val signature: String,
+                            private val accountDao: AccountDao,
+                            override val publishFn: (SettingsResult) -> Unit)
+    : BackgroundWorker<SettingsResult.UpdateSignature> {
+
+    override val canBeParallelized = true
+
+    override fun catchException(ex: Exception): SettingsResult.UpdateSignature {
+        return SettingsResult.UpdateSignature.Failure(createErrorMessage(ex))
+    }
+
+    override fun work(reporter: ProgressReporter<SettingsResult.UpdateSignature>): SettingsResult.UpdateSignature? {
+        val result = Result.of {
+            accountDao.updateSignature(activeAccount.id, signature)
+        }
+
+        return when (result) {
+            is Result.Success -> SettingsResult.UpdateSignature.Success()
+            is Result.Failure -> catchException(result.error)
+        }
+
+    }
+
+    override fun cancel() {
+        TODO("not implemented") //To change body of created functions use CRFile | Settings | CRFile Templates.
+    }
+
+    private val createErrorMessage: (ex: Exception) -> UIMessage = { ex ->
+        UIMessage(R.string.local_error, arrayOf(ex.toString()))
+    }
+
+}
diff --git a/src/main/kotlin/com/criptext/mail/scenes/signup/SignUpSceneController.kt b/src/main/kotlin/com/criptext/mail/scenes/signup/SignUpSceneController.kt
@@ -241,6 +241,7 @@ class SignUpSceneController(
     }
 
     private fun handleRegisterUserFailure(result: SignUpResult.RegisterUser.Failure) {
+        scene.initListeners(uiObserver)
         scene.showError(result.message)
         resetWidgetsFromModel()
         when(result.exception)
diff --git a/src/main/kotlin/com/criptext/mail/utils/AccountUtils.kt b/src/main/kotlin/com/criptext/mail/utils/AccountUtils.kt
@@ -7,7 +7,7 @@ import com.criptext.mail.db.models.ActiveAccount
 object AccountUtils {
     fun setUserAsActiveAccount(user: Account, storage: KeyValueStorage): ActiveAccount{
         val activeAccount = ActiveAccount(id = user.id, name = user.name, recipientId = user.recipientId,
-                deviceId = user.deviceId, jwt = user.jwt, signature = "", refreshToken = user.refreshToken,
+                deviceId = user.deviceId, jwt = user.jwt, signature = user.signature, refreshToken = user.refreshToken,
                 domain = user.domain)
         storage.putString(KeyValueStorage.StringKey.ActiveAccount,
                 activeAccount.toJSON().toString())

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ abstract class BackgroundWorkManager<in I: Any, O: Any> {`
`12`	`12`	`var listener: ((O) -> Unit)? = null`
`13`	`13`	`set (newListener) {`
`14`	`14`	`if (newListener != null) {`
`15`		`- state.keys.forEach({ key ->`
	`15`	`+ state.keys.forEach { key ->`
`16`	`16`	`val workState = state[key]`
`17`	`17`	`if (workState is WorkState.Done) {`
`18`	`18`	`state.remove(key)`
`19`	`19`	`newListener(workState.result)`
`20`	`20`	`}`
`21`		`- })`
	`21`	`+ }`
`22`	`22`	`}`
`23`	`23`	`field = newListener`
`24`	`24`	`}`
`@@ -35,6 +35,4 @@ abstract class BackgroundWorkManager<in I: Any, O: Any> {`
`35`	`35`	`runner.workInBackground(worker)`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-`
`39`		`-`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,9 @@ interface AccountDao {`
`95`	`95`	`where recipientId=:recipientId AND domain=:domain""")`
`96`	`96`	`fun updateRefreshToken(recipientId: String, domain: String, token: String)`
`97`	`97`
	`98`	`+ @Query("""UPDATE account`
	`99`	`+ SET signature=:signature`
	`100`	`+ where id=:id""")`
	`101`	`+ fun updateSignature(id: Long, signature: String)`
	`102`	`+`
`98`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class SaveEmailWorker(`
`68`	`68`
`69`	`69`	`private fun getEmailPreview(emailId: Long): EmailThread {`
`70`	`70`	`val email = db.loadFullEmail(emailId, account)!!`
`71`		`- val label = db.getLabelById(currentLabel.id, account.id)!!`
	`71`	`+ val label = db.getLabelById(currentLabel.id, account.id) ?: Label.defaultItems.inbox`
`72`	`72`	`return db.getEmailThreadFromEmail(email.email, label.text, Label.defaultItems.rejectedLabelsByFolder(label.text).map { it.id }, account.userEmail, account)`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,6 @@ class MailboxSceneController(private val scene: MailboxScene,`
`200`	`200`	`scene.showExtraAccountsBadge(false)`
`201`	`201`	`scene.hideMultipleAccountsMenu()`
`202`	`202`	`threadListController.clear()`
`203`		`- model.threads.clear()`
`204`	`203`	`dataSource.submitRequest(MailboxRequest.SetActiveAccount(account))`
`205`	`204`	`}`
`206`	`205`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ class SendMailWorker(private val signalClient: SignalClient,`
`338`	`338`	`return when (finalResult) {`
`339`	`339`	`is Result.Success -> {`
`340`	`340`	`db.increaseContactScore(listOf(emailId))`
`341`		`- val label = db.getLabelById(currentLabel.id, activeAccount.id)!!`
	`341`	`+ val label = db.getLabelById(currentLabel.id, activeAccount.id) ?: Label.defaultItems.inbox`
`342`	`342`	`val thread = db.getEmailThreadFromEmail(currentEmail!!, label.text, Label.defaultItems.rejectedLabelsByFolder(label.text).map { it.id }, activeAccount.userEmail, activeAccount)`
`343`	`343`	`MailboxResult.SendMail.Success(EmailPreview.fromEmailThread(thread), currentLabel, isSecure)`
`344`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,13 @@ class SettingsDataSource(`
`36`	`36`	`activeAccount = activeAccount,`
`37`	`37`	`publishFn = { res -> flushResults(res) }`
`38`	`38`	`)`
	`39`	`+ is SettingsRequest.UpdateSignature -> UpdateSignatureWorker(`
	`40`	`+ signature = params.signature,`
	`41`	`+ accountDao = settingsLocalDB.accountDao,`
	`42`	`+ activeAccount = activeAccount,`
	`43`	`+ httpClient = httpClient,`
	`44`	`+ publishFn = { res -> flushResults(res) }`
	`45`	`+ )`
`39`	`46`	`}`
`40`	`47`	`}`
`41`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@ package com.criptext.mail.scenes.settings.data`
`3`	`3`	`sealed class SettingsRequest{`
`4`	`4`	`class ResetPassword: SettingsRequest()`
`5`	`5`	`class SyncBegin: SettingsRequest()`
	`6`	`+ data class UpdateSignature(val signature: String): SettingsRequest()`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package com.criptext.mail.scenes.settings.data`
`2`	`2`
`3`		`-import com.criptext.mail.db.models.Label`
`4`	`3`	`import com.criptext.mail.utils.UIMessage`
`5`	`4`
`6`	`5`	`sealed class SettingsResult{`
`@@ -14,4 +13,9 @@ sealed class SettingsResult{`
`14`	`13`	`data class NoDevicesAvailable(val message: UIMessage): SyncBegin()`
`15`	`14`	`data class Failure(val message: UIMessage): SyncBegin()`
`16`	`15`	`}`
	`16`	`+`
	`17`	`+ sealed class UpdateSignature: SettingsResult() {`
	`18`	`+ class Success: UpdateSignature()`
	`19`	`+ data class Failure(val message: UIMessage): UpdateSignature()`
	`20`	`+ }`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ class SignatureController(`
`75`	`75`
`76`	`76`	`private fun updateSignature(){`
`77`	`77`	`activeAccount.updateSignature(storage, scene.getSignature())`
	`78`	`+ dataSource.submitRequest(SettingsRequest.UpdateSignature(scene.getSignature()))`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`}`