Commit Graph

2033 Commits

Author SHA1 Message Date
Marc Blank
19423a8ec0 am 80eb4fd0: (-s ours) am d1c56ea1: Ensure protocol version always set in sync services DO NOT MERGE
Merge commit '80eb4fd0fed32800cd0c78e0e26ca0b3d54c7d2b'

* commit '80eb4fd0fed32800cd0c78e0e26ca0b3d54c7d2b':
  Ensure protocol version always set in sync services DO NOT MERGE
2010-01-11 13:00:41 -08:00
Marc Blank
80eb4fd0fe am d1c56ea1: Ensure protocol version always set in sync services DO NOT MERGE
Merge commit 'd1c56ea144fb3e91ad1fdf8bba4c57531ec9cc18' into eclair-plus-aosp

* commit 'd1c56ea144fb3e91ad1fdf8bba4c57531ec9cc18':
  Ensure protocol version always set in sync services DO NOT MERGE
2010-01-10 19:34:21 -08:00
Romain Guy
a4d32a8fec Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:47 -08:00
Marc Blank
d1c56ea144 Ensure protocol version always set in sync services DO NOT MERGE
* A recent change caused an issue in which protocolVersion could
  be null, resulting in an NPE
* Ensure that protocolVersion is always set to a valid version,
  defaulting to 2.5

Change-Id: Ifba6c8089fdbd93dffe38ab9895cfd3e994e29d0
Bug: 2353859
2010-01-08 14:34:21 -08:00
Makoto Onuki
63ba69d5d0 Merge "Move stub logging classes to org.apache.james.mime4j" 2010-01-08 10:32:50 -08:00
Eric Fischer
215c710bfb Merge "Update with latest translations." 2010-01-08 10:02:36 -08:00
Marc Blank
0f2e1a8009 Merge "Make sure protocol version is always set in sync services" 2010-01-08 09:20:59 -08:00
Marc Blank
2cb9c55f3b Add new tests for Email sync parsing
Change-Id: Ib3be60b5f439f79f62f62eff607673e34c75506d
2010-01-07 20:27:39 -08:00
Makoto Onuki
a31cb777eb Move stub logging classes to org.apache.james.mime4j 2010-01-07 16:56:43 -08:00
Eric Fischer
0833476c49 Update with latest translations. 2010-01-07 15:57:27 -08:00
Marc Blank
89ab89dd83 Make sure protocol version is always set in sync services
* A recent change caused an issue in which protocolVersion could
  be null, resulting in an NPE
* Ensure that protocolVersion is always set to a valid version,
  defaulting to 2.5

Bug: 2353859
Change-Id: I6e07ba3df5362c988658e401bebc1776a6780876
2010-01-07 11:59:57 -08:00
Makoto Onuki
f06d3c2d90 Merge "Unbundle: Remove the use of internal SSL APIs." 2010-01-07 10:43:03 -08:00
Mihai Preda
6974852b58 Merge "MessageView: fix rename next/prev in landscape." 2010-01-07 02:31:55 -08:00
Mihai Preda
e2ddc55ed0 MessageView: fix rename next/prev in landscape.
Bug 2353633.
2010-01-06 18:09:38 +01:00
Makoto Onuki
fc59359db5 Unbundle: Remove the use of internal SSL APIs.
1. Replaced SSLContextImpl with SSLContext with TLS.  (They're the same, according to crazybob)
2. Copied SSLSocketFactory from org.apache.http.conn.ssl, so that we can use the hidden costructor.  (Which wasn't in the original code -- it was added by the android team, which is why it's hidden.)
2010-01-05 16:57:17 -08:00
Jean-Baptiste Queru
b5a7afaba1 explicit set an "optional" tag 2010-01-05 11:09:51 -08:00
Makoto Onuki
f39e5f38eb Unbundling: Get rid of the reference to the hidden field.
Remove the reference to CursorAdapter.mDataValid.
2010-01-04 17:13:09 -08:00
Marc Blank
86919853f7 am e83d0d64: am bb12286f: Merge change Ie25ac73d into eclair-mr2
Merge commit 'e83d0d640e9964500097571d9dea4993e5609123'

* commit 'e83d0d640e9964500097571d9dea4993e5609123':
  Fix "back key" flow for Email account setup
2009-12-22 11:25:58 -08:00
Marc Blank
e83d0d640e am bb12286f: Merge change Ie25ac73d into eclair-mr2
Merge commit 'bb12286f287efcdb841f6b0e3d448e1f3fa8929c' into eclair-mr2-plus-aosp

* commit 'bb12286f287efcdb841f6b0e3d448e1f3fa8929c':
  Fix "back key" flow for Email account setup
2009-12-22 11:23:35 -08:00
Android (Google) Code Review
bb12286f28 Merge change Ie25ac73d into eclair-mr2
* changes:
  Fix "back key" flow for Email account setup
2009-12-22 11:21:15 -08:00
Mihai Preda
0de7377985 am 78f609db: am af1bf487: MessageView: upon delete move to older instead of newer.
Merge commit '78f609db56500c01f75ea2d8742468907255f7ba'

* commit '78f609db56500c01f75ea2d8742468907255f7ba':
  MessageView: upon delete move to older instead of newer.
2009-12-22 10:15:58 -08:00
Mihai Preda
1e1bb40062 am 9d024a5b: am 2b6dfc97: Merge change I55f52567 into eclair-mr2
Merge commit '9d024a5b4f42d9d7687d06e5f86f9c68f22fccf8'

* commit '9d024a5b4f42d9d7687d06e5f86f9c68f22fccf8':
  MessageCompose: fix NPE cased by WebView set to null in onDestroy().
2009-12-22 10:15:53 -08:00
Mihai Preda
78f609db56 am af1bf487: MessageView: upon delete move to older instead of newer.
Merge commit 'af1bf48773154226fd88ab823a250fafa2814241' into eclair-mr2-plus-aosp

* commit 'af1bf48773154226fd88ab823a250fafa2814241':
  MessageView: upon delete move to older instead of newer.
2009-12-22 06:22:34 -08:00
Mihai Preda
af1bf48773 MessageView: upon delete move to older instead of newer.
Bug 2233586
2009-12-22 15:16:14 +01:00
Mihai Preda
9d024a5b4f am 2b6dfc97: Merge change I55f52567 into eclair-mr2
Merge commit '2b6dfc9796b6c54b329e234244e076a8dc6d3a07' into eclair-mr2-plus-aosp

* commit '2b6dfc9796b6c54b329e234244e076a8dc6d3a07':
  MessageCompose: fix NPE cased by WebView set to null in onDestroy().
2009-12-22 05:22:13 -08:00
Android (Google) Code Review
2b6dfc9796 Merge change I55f52567 into eclair-mr2
* changes:
  MessageCompose: fix NPE cased by WebView set to null in onDestroy().
2009-12-22 05:19:44 -08:00
Makoto Onuki
ec82f9d7c0 email unbundling: get rid of the write access to the CursorAdapter.mDataValid.
MessageListAdapter.doRequery() is supporsed to do the same thing as CursorAdapter.onContentChanged() does.  So the entire method body can be replaced with super.onContentChanged().
2009-12-21 15:30:42 -08:00
Marc Blank
f6bc2d95b2 am 4b31f3c7: (-s ours) am 27051e48: Merge change Ife6689fa into eclair
Merge commit '4b31f3c7a6caf0967beef208c172c899c8b6fac1'

* commit '4b31f3c7a6caf0967beef208c172c899c8b6fac1':
  Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
2009-12-21 11:51:50 -08:00
Marc Blank
f9b1491a28 am 420f6648: (-s ours) am bfc5de35: Merge change I06d98e54 into eclair
Merge commit '420f664891b2f46356bfc5cdd645aae727ecc71f'

* commit '420f664891b2f46356bfc5cdd645aae727ecc71f':
  Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
2009-12-21 11:51:46 -08:00
Marc Blank
f0b258a745 am c76a22b0: (-s ours) am c874824c: Merge change Iad377728 into eclair
Merge commit 'c76a22b01a2cb78fe75cc591066441fbcf3d90ac'

* commit 'c76a22b01a2cb78fe75cc591066441fbcf3d90ac':
  Don't delete referenced messages from the Exchange server DO NOT MERGE
2009-12-21 11:51:42 -08:00
Marc Blank
4b31f3c7a6 am 27051e48: Merge change Ife6689fa into eclair
Merge commit '27051e480f9cc5396aacc3cc5e520d5875390548' into eclair-plus-aosp

* commit '27051e480f9cc5396aacc3cc5e520d5875390548':
  Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
2009-12-21 11:48:22 -08:00
Marc Blank
420f664891 am bfc5de35: Merge change I06d98e54 into eclair
Merge commit 'bfc5de35fa08b6e747e5d5afe72bffafca08ce2a' into eclair-plus-aosp

* commit 'bfc5de35fa08b6e747e5d5afe72bffafca08ce2a':
  Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
2009-12-21 11:48:18 -08:00
Marc Blank
c76a22b01a am c874824c: Merge change Iad377728 into eclair
Merge commit 'c874824ca8b76f795575538ffa34138e2de47cad' into eclair-plus-aosp

* commit 'c874824ca8b76f795575538ffa34138e2de47cad':
  Don't delete referenced messages from the Exchange server DO NOT MERGE
2009-12-21 11:48:14 -08:00
Android (Google) Code Review
27051e480f Merge change Ife6689fa into eclair
* changes:
  Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
2009-12-21 11:42:09 -08:00
Android (Google) Code Review
bfc5de35fa Merge change I06d98e54 into eclair
* changes:
  Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
2009-12-21 11:41:24 -08:00
Android (Google) Code Review
c874824ca8 Merge change Iad377728 into eclair
* changes:
  Don't delete referenced messages from the Exchange server DO NOT MERGE
2009-12-21 11:40:43 -08:00
Marc Blank
f1efd65a5e Fix "back key" flow for Email account setup
* The existing flow is badly broken; every "back" causes the user
  to leave the setup flow and therefore have to start from scratch.
  This is a very bad user experience, as previously entered data is
  lost and must be re-entered.
* The fix corrects these problems, allowing the user to back up
  through screens UNTIL the account is successfully created.
* After account creation, the user is returned to the proper screen,
  depending on whether we're in "eas flow mode" or not

Bug: 2337511
Change-Id: Ie25ac73dfcd8a1dca36e1b31c75ffb22359840d1
2009-12-21 11:28:53 -08:00
Marc Blank
320a065b6b am 719610ab: am 42e5dca4: Add sanity checks in SyncManager and EasSyncService
Merge commit '719610ab8faee6a0c0ed4ff748cd1eeec3459fa6'

* commit '719610ab8faee6a0c0ed4ff748cd1eeec3459fa6':
  Add sanity checks in SyncManager and EasSyncService
2009-12-18 16:50:58 -08:00
Marc Blank
719610ab8f am 42e5dca4: Add sanity checks in SyncManager and EasSyncService
Merge commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1' into eclair-mr2-plus-aosp

* commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1':
  Add sanity checks in SyncManager and EasSyncService
2009-12-18 16:47:18 -08:00
Makoto Onuki
03e9e2d886 Fix typo 2009-12-18 16:36:44 -08:00
Marc Blank
42e5dca4ef Add sanity checks in SyncManager and EasSyncService
* Prevent possible NPE's

Change-Id: I2b3c747609c6a87ec6060fd59006f2912dfcc591
2009-12-18 13:54:53 -08:00
Makoto Onuki
425fd30a9c Email unbundling: Use accessor for CursorAdapter.mCursor and ListActivity.getListView().
Also added a todo for ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS.
2009-12-18 13:26:04 -08:00
Android (Google) Code Review
99bfd7e9b7 Merge change Ibf071fa6
* changes:
  Unbundling email: Make Base64 hidden API free.
2009-12-17 10:25:05 -08:00
Android (Google) Code Review
5e09b8b543 Merge change I4e398aef
* changes:
  Unbundling email: Stub out apache logging.  (See b/2226160)
2009-12-17 10:25:03 -08:00
Makoto Onuki
bf071fa625 Unbundling email: Make Base64 hidden API free.
Seems like it's the simplest way to make it.
- Base64 no longer implements BinaryEncoder/Decoder.  Email app doesn't use them.
- Copied Decoder/EncoderException.  Email app doesn't catch them either.
2009-12-16 16:59:00 -08:00
Makoto Onuki
22a4e0ddbf Unbundling email: Stub out apache logging. (See b/2226160)
Let me know if you don't like the package name.
2009-12-16 16:44:10 -08:00
Andrew Stadler
7d8d18cd6d am 1889528e: am 68011bdd: Revised strings in corporate mail settings screen.
Merge commit '1889528e72f0d001c43f3aaea5dc2716326a4bfd'

* commit '1889528e72f0d001c43f3aaea5dc2716326a4bfd':
  Revised strings in corporate mail settings screen.
2009-12-16 16:38:10 -08:00
Andrew Stadler
1889528e72 am 68011bdd: Revised strings in corporate mail settings screen.
Merge commit '68011bddf01d6b62d621784fad9a43884ec434fd' into eclair-plus-aosp

* commit '68011bddf01d6b62d621784fad9a43884ec434fd':
  Revised strings in corporate mail settings screen.
2009-12-16 16:35:28 -08:00
Andrew Stadler
68011bddf0 Revised strings in corporate mail settings screen.
Bug: 2324042
2009-12-16 14:02:28 -08:00
Marc Blank
608ca667b2 Don't delete referenced messages from the Exchange server DO NOT MERGE
* Addresses #2287439 incompletely
* The most likely reason for a reply/forward to get stuck in the Outbox
  is that the referenced message has been deleted from the client, with
  the deletion occuring BEFORE the message gets sent (currently, the two
  are completely independent)
* This change causes deletes NOT to be sent to the server if the message
  to be deleted is referenced by an outgoing message

Change-Id: Iad3777282385bea82276f363d6f95ba8b07cc01c
2009-12-16 12:01:08 -08:00