Multiple accounts from and push#431
Merged
danieltigse merged 1 commit intoMar 22, 2019
Merged
Conversation
jorgeblacio
force-pushed
the
_multiple_accounts_from_and_push
branch
from
356234d to
61c6d92
Compare
danieltigse
requested changes
Mar 22, 2019
| okAction.putExtra("randomId", pushData.randomId) | ||
| okAction.putExtra("deviceType", pushData.deviceType.ordinal) | ||
| okAction.putExtra("version", pushData.syncFileVersion) | ||
| okAction.putExtra(MessagingInstance.ACCOUNT, pushData.recipientId) |
| okAction.putExtra("deviceName", pushData.deviceName) | ||
| okAction.putExtra("deviceType", pushData.deviceType.ordinal) | ||
| okAction.putExtra("version", pushData.syncFileVersion) | ||
| okAction.putExtra(MessagingInstance.ACCOUNT, pushData.recipientId) |
| object Hosts { | ||
| const val restApiBaseUrl = "https://api.criptext.com" | ||
| const val webSocketBaseUrl = "wss://socket.criptext.com" | ||
| const val restApiBaseUrl = "https://stage.mail.criptext.com" |
| companion object { | ||
|
|
||
| val mainDomain = "criptext.com" | ||
| val mainDomain = "jigl.com" |
|
|
||
| fun seed(contactDao: ContactDao){ | ||
| contacts = contactDao.getAll(1) | ||
| contacts = contactDao.getAll() |
Contributor
There was a problem hiding this comment.
delete the entire file
| var activeAccount = ActiveAccount.loadFromStorage(storage)!! | ||
| val data = getIntentData(intent, activeAccount.recipientId) | ||
| val db = AppDatabase.getAppDatabase(this) | ||
| activeAccount = ActiveAccount.loadFromDB(db.accountDao().getAccountByRecipientId(data.recipientId)!!)!! |
| .getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager | ||
| val storage = KeyValueStorage.SharedPrefs(this) | ||
| val db = AppDatabase.getAppDatabase(this) | ||
| activeAccount = ActiveAccount.loadFromDB(db.accountDao().getAccountByRecipientId(data.recipientId)!!)!! |
| var activeAccount = ActiveAccount.loadFromStorage(storage)!! | ||
| val data = getIntentData(intent, activeAccount.recipientId) | ||
| val db = AppDatabase.getAppDatabase(this) | ||
| activeAccount = ActiveAccount.loadFromDB(db.accountDao().getAccountByRecipientId(data.recipientId)!!)!! |
| feedController.reloadFeeds() | ||
| dataSource.submitRequest(MailboxRequest.GetMenuInformation()) | ||
| generalDataSource.submitRequest(GeneralRequest.TotalUnreadEmails(model.selectedLabel.text)) | ||
| handleIntentExtras(resultData.extrasData) |
Contributor
There was a problem hiding this comment.
and the socket connection?
| object EmailAddressUtils { | ||
|
|
||
| val CRIPTEXT_DOMAIN_SUFFIX = "@criptext.com" | ||
| val CRIPTEXT_DOMAIN_SUFFIX = "@jigl.com" |
…fications for them as well.
jorgeblacio
force-pushed
the
_multiple_accounts_from_and_push
branch
from
61c6d92 to
c2c37bb
Compare
danieltigse
approved these changes
Mar 22, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.