summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* AOSP/Email - Second part of the Security Vulnerability fix -Raman Tenneti2019-03-231-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Email App: Malicious app is able to compose message with hidden attachments and bypass attachments path checks attaching private files from /data/data/com.android.email/* + Ported the following CLs. Code is different from gmail. Made the changes to work with Email. ++ https://critique.corp.google.com/#review/136780360 +++ Differentiating our Compose intents from other app's intent. Added ComposeActivityEmailExternal method and it always returns true. Treat body and quoted text as plaintext if intent is external. Bug: 32068883 Bug: 32502421 Bug: 32589229 Test: manual - Ran the following tests on Pixel phone. Tested the Email UI. $ adb install -r out/target/product/marlin/system/app/Email/Email.apk $ adb install -r app-debug.apk Success $ adb shell am start -n com.test.poc.poc32589229/.MainActivity -a android.intent.action.MAIN Starting: Intent { act=android.intent.action.MAIN cmp=com.test.poc.poc32589229/.MainActivity } Duplicated the steps in https://b.corp.google.com/issues/32589229#comment5 and didn't get the attachments after the fix (was getting attachments before the fix). $ adb install -r out/target/product/marlin/testcases/EmailTests/EmailTests.apk Performing Streamed Install Success $ adb shell am instrument -w com.android.email.tests The number of failures are same as before (with or without this change). Tests run: 158, Failures: 5 Change-Id: I4eda17af7f60e1c92f49ffa6025b328f6481ec76 (cherry picked from commit c87d04b8c190f52c4f7e8a22dfaa2b5e065415fe)
* Disallow attaching files from our own EmailAttachmentProvider.Ekin Oguz2018-04-061-0/+5
| | | | | | | | | | | This is to backport a security fix reported in b/71814449 and b/72569023. Fix is using the same approach as b/27308057, which is to prevent Compose from accepting URIs with our own email attachment provider. Bug: b/71814449 Change-Id: Ib9df21648d00d2ef2da9fac05cc39fee253de8e2 (cherry picked from commit 7227751994624bdb2ba958714cc861b8bab41634)
* Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-0/+6
|\ | | | | | | | | | | | | Ticket: CYNGNOS-2373 Android 6.0.1 release 43 (MOB30J) Change-Id: I1241266b370fb1ba0560217684002d01867a0c77
| * Don't allow cachedFile Attachments if the content Uri is pointing to ↵Sam Lee2016-03-251-0/+6
| | | | | | | | | | | | | | | | | | | | EmailProvider. This is to backport a security fix reported by b/27308057 and b/27335139. Also, add Analytics for these errors. Bug: b/27335139 Change-Id: Iaacb34e4983cdf9a85487222ae930cb64d80a193
* | Improve notification coalescence algorithm.Danny Baumann2016-01-201-46/+55
| | | | | | | | | | | | | | | | | | | | | | | | Instead of coalescing for 15 seconds after the first change notification, coalesce until change notifications have been idle for at least 2 seconds. This avoids long update delays, which is especially jarring when using notifications on a wearable and the initial notification didn't yet include the message body. Also skip coalescence entirely for deletions; update immediately in that case. Change-Id: I67bed9a1af7b023020b0fd5429495eb45000e858
* | email: Add an ActionBar to the mail app's PreferenceActivityJorge Ruesga2015-10-181-5/+2
| | | | | | | | | | Change-Id: Id2ed98d2c2cd6648e179fb2942f3bc4479049cd0 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | email: fix Exchange sync frequency account setupJorge Ruesga2015-10-181-4/+4
| | | | | | | | | | | | | | | | Auto sync is not displayed as an option in sync frequency settings, because capabilities aren't filled. Just ensure account capabilities are always saved. Change-Id: I70b7ab9464a99eebf7f82726faa0fb2418e09a99 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | email: imap pushJorge Ruesga2015-10-184-13/+57
| | | | | | | | | | Change-Id: I8a184a5644e4322ee65d969e14cd47fe119f5df2 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | email: custom notification lightsJorge Ruesga2015-10-182-0/+117
| | | | | | | | | | Change-Id: I3aaed3c682ae33da925316a5b9a586796fe71229 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | email: fix eas autodiscoverJorge Ruesga2015-10-184-6/+46
| | | | | | | | | | Change-Id: Ifaf5f757f7f844e49f0ac635b477fcbef4926293 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | Fix NPE in getHierarchicalFoldertobitege2015-10-181-1/+3
| | | | | | | | | | | | | | | | Fixes exceptions like this: java.lang.NullPointerException: Attempt to read from field 'java.lang.String com.android.mail.providers.Folder.name' on a null object reference at com.android.email.activity.setup.MailboxSettings$MailboxSettingsFolderLoaderCallbacks.getHierarchicalFolder(MailboxSettings.java:377) Change-Id: I2c5dda84439caa5d894f5706c9c6a07079cda69c
* | email: finish the settings activity after delete its accountJorge Ruesga2015-10-181-6/+2
| | | | | | | | | | Change-Id: I540f1fe9dc874093ad0067cd56c9f0920620ece1 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | email: support per-folder notificationsJorge Ruesga2015-10-182-55/+576
| | | | | | | | | | | | | | This change enables support to configure per-folder notifications options. Change-Id: I6107340da3438ea223506bb22ff898cca179c1f6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* | email: add an option for delete the accountJorge Ruesga2015-10-181-0/+119
|/ | | | | Change-Id: I0f0f2b7ea950d5154f90cd60261c6918b7ad36b7 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
* Default to encrypted connections (YAY!)Tony Mantler2014-10-241-4/+4
| | | | | | b/18119357 Change-Id: I2fc79e7c2296f5f48e354c5fe97fd0ea6609bb17
* Don't assume mHostAuthRecv is loaded when checking outgoingTony Mantler2014-10-201-6/+18
| | | | | | b/18031180 Change-Id: I428021830db373145344a3477e1c5590e8062c10
* Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-devTony Mantler2014-10-141-0/+3
|\
| * Reload settings immediately after toggling syncTony Mantler2014-10-131-0/+3
| | | | | | | | | | | | | | | | | | Twiddling the AccountManager bits doesn't automatically trigger a content update, so we refresh manually in those cases. b/17330140 Change-Id: I294173c9baca231a6f3ff045d0b7795c6b2b2219
* | Initial account setup analyticsTony Mantler2014-10-131-0/+15
|/ | | | | | | | Just activity start/stop. b/17166224 Change-Id: If100a88d6b6fbe05165aaed90b1caaa9c3db12c3
* Revert "Update notification icon asset names (Email)"Rohan Shah2014-10-131-1/+2
| | | | | | | | Need to revert - doesn't build on Mac OS This reverts commit cc82965ac9a84d65c2e8e1152bd8f9929d5674cb. Change-Id: I98c03ebe85df29ff146d0cee6ae112ab36e6d8b0
* Update notification icon asset names (Email)Rohan Shah2014-10-101-2/+1
| | | | | Bug: 17936539 Change-Id: Ia2b3d4a18a30f9cfbfcda2c68a3ef579c0c75086
* Merge "Account authentication restyling" into ub-gmail-ur14-devTony Mantler2014-10-101-5/+4
|\
| * Account authentication restylingTony Mantler2014-10-081-5/+4
| | | | | | | | | | | | | | | | | | | | | | - Add minWidth to fragment - Remove extraneous LinearLayout and tweak margins to avoid layout jumps - Change + asset - Remove old + icon from prefs header from Email b/8134410 Change-Id: If3371017359b47d9e4280b09fd3bb074b024c23c
* | Restyle account setup flow nav buttonsTony Mantler2014-10-091-9/+0
|/ | | | | | b/17266006 Change-Id: Ie60e56b493ba23465a06cce8a3c37d3fd9d061e5
* Add ability to clear migration state to debug screenMartin Hibdon2014-09-241-0/+10
| | | | | | This makes it a lot easier to test migration code. Change-Id: I22de8c06c34964b8eb7182571094e54f04d739b8
* Changes to support smaller email tombstone apk sizePaul Westbrook2014-09-1684-27316/+59
| | | | | | | | | This reduces the tombstone down by 100K A follow-on cl will remove the unused resources from the tombstone build Bug: 17414014 Change-Id: I5d38811b17a5273ec726e750ab123e10e36cee04
* Display a warning if account is on security holdMartin Hibdon2014-09-122-9/+58
| | | | | | b/17258435 Change-Id: I654db15d59338621829cbb6df106b490ab7bb628
* Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-devRohan Shah2014-09-121-1/+1
|\
| * Tag Notifications with People (Email)Rohan Shah2014-09-101-1/+1
| | | | | | | | | | | | | | | | Just adding the argument for ContactLookupUriFetcher as null (Since we don't use Menagerie for non-Gmail). Bug: 15385612 Change-Id: Idbd76a181ba18fba81a9ff933e4f1a96c11d1b60
* | Merge "Sync account immediately upon restore" into ub-gmail-ur14-devTony Mantler2014-09-111-2/+6
|\ \
| * | Sync account immediately upon restoreTony Mantler2014-09-111-2/+6
| |/ | | | | | | | | | | b/17443087 Change-Id: Ib38fa3551090db85c1f7391fcaa8ce6a8ed7c375
* / Use correct password dialog for outgoing settingsTony Mantler2014-09-111-1/+3
|/ | | | | | | | We actually want to divert based on incoming protocol, not outgoing b/17460124 Change-Id: Ic7129d23d36f9f15e2ecbb25d3f11dae12bb56ac
* Merge "Remove unused resources" into ub-gmail-ur14-devPaul Westbrook2014-09-101-46/+0
|\
| * Remove unused resourcesPaul Westbrook2014-09-101-46/+0
| | | | | | | | | | | | | | | | | | | | Also remove broken & disabled tests that referenced otherwise unused resources Change resource names to prevent duplicate resources. Bug: 17414014 Change-Id: Iea9f9799ec19692707e2949473c6f97a3bd29f4b
* | Remove app icon from Setup and Mailbox SettingsTony Mantler2014-09-092-0/+11
|/ | | | | | b/16657133 Change-Id: I7ba77a3a355627c1df971aa7238969dfeeaebf28
* Remove password spaces warningTony Mantler2014-09-093-48/+27
| | | | | | b/17409681 Change-Id: Ia411999fc7652b520f17fa2538980d9ba4bd172a
* Fix spinners layout manglingTony Mantler2014-09-081-6/+7
| | | | | | | | | | Setting the gravity to center_vertical seems to make them behave. Not asking. Also clean up the layout file in general. b/17380851 Change-Id: I45ac202825295c577dd1a13a3176ac685bd9b9d8
* Merge "Fix the text of the authentication label on rotation" into ↵Martin Hibdon2014-09-081-8/+12
|\ | | | | | | ub-gmail-ur14-dev
| * Fix the text of the authentication label on rotationMartin Hibdon2014-09-081-8/+12
| | | | | | | | | | | | b/17410251 Change-Id: I1e902da85a8525e597d205d3be520e6eb6db7f50
* | Remove server-side sanitized HTML capability;James Lemieux2014-09-081-3/+3
|/ | | | | | | | | | | | | | | add client-side santized HTML capability b/16896849 The semantics of the SANITIZED_HTML capability have narrowed. It now means "Html email bodies for this account are assumed to be sanitized by the mail server" Consequently, accounts in Email no longer set this capability, but do set the new capability permitting client-side sanitization of email bodies Change-Id: Ie1343d8bedc2a17ab04e4df4b7c4ee14cfb01b64
* The error message "This field can't be blank" can be ignoredJames Lemieux2014-09-031-41/+0
| | | | | | | | | b/17367647 The friendly name paired with the email address is now considered optional when creating a new email account. Change-Id: I9398ae48e29ee0554efc9c46e9f2f380e7f17cf9
* Merge "Update search folder status in a finally block" into ub-gmail-ur14-devTony Mantler2014-08-281-130/+133
|\
| * Update search folder status in a finally blockTony Mantler2014-08-271-130/+133
| | | | | | | | | | | | | | | | Also clean up a dangerous logging call and clean up some warnings b/17283951 Change-Id: Ia295218e5ee1162dac68c5a8e7eff6a9dd74a918
* | Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-devMartin Hibdon2014-08-281-1/+7
|\ \
| * | Prevent account reconcilliation during migrationMartin Hibdon2014-08-281-1/+7
| |/ | | | | | | | | | | b/17221527 Change-Id: I7077a90af8317aa38e865e345aff7fb33083ddc2
* / Put debug screen back into settingsMartin Hibdon2014-08-2819-153/+155
|/ | | | | | | | | | | There is still work to be done here: * The debug setting is not persisted in Exchange, so if the exchange service is killed, when it restarts the logging will not be active. * Nothing in Exchange actually does any additional logging if this logging is turned on. Change-Id: Ic578e6956f70dd47fba9b2895385312f71c47abf
* b/17209397. NOOP getServiceMap() if we are in the tombstone app.Anthony Lee2014-08-251-0/+6
| | | | | | | | If this is the Email Tombstone app, we throw an ISE when we launch the app after resetting data because certain services do not exist in this version of the app. Change-Id: I01d88ac2b745d45c1835354b36837f8aaaf378d8
* Remove getSuggestionsAuthorityJin Cao2014-08-221-5/+0
| | | | Change-Id: I0675c1e59047723cef2ad072b9a1e003ca03aa11
* Merge "Remove default search for Email" into ub-gmail-ur14-devJin Cao2014-08-221-10/+1
|\
| * Remove default search for EmailJin Cao2014-08-221-10/+1
| | | | | | | | | | | | b/17209360 Change-Id: I798139e5ab6f8cd29dde1dd475de17138330d8c5
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 09:23:17 +0000