1
0
mirror of https://github.com/etesync/android synced 2024-11-29 11:28:19 +00:00
Commit Graph

835 Commits

Author SHA1 Message Date
Tom Hacohen
d21a498925 Webview: improve whitelist, and include all of the "accounts/" subpath. 2017-03-24 16:09:19 +00:00
Tom Hacohen
e7694924b4 Automatically fix non-dirty entries with null etag on upgrade
Commit 5d1c90dcba fixed a bug where
entries added from the server were marked as "local only" (null etag)
which was causing issues. That commit fixes it for newly added resources,
but existing resources remained broken.

This commit goes through the database and fixes all of the existing
broken resources. It skips dirty entries because figuring out if they
were just created or updated is complex, and the chances of doing an
update at exactly the same time there are dirty entries is quite low,
so the complexity involved is just not worth it.
2017-03-24 15:33:07 +00:00
Tom Hacohen
7562a7a76b ViewCollection: use the new LocalCalendar.findByName to get calendar. 2017-03-24 14:52:27 +00:00
Tom Hacohen
19ceab96b0 Bump version. 2017-03-24 14:48:00 +00:00
Tom Hacohen
5d1c90dcba Resource: set eTag when creating a new one from server.
Before this commit we would create new entries from the server without
an etag, essentially marking them as "local only". While the actual
value of the eTag is not currently used, null or not matters.
Because the resources were "local only", we would get weird behaviours
like having an "ADD" action when changing a resource.
2017-03-24 14:40:29 +00:00
Tom Hacohen
84244330b7 Always log deletes, even when not previously added to server.
Before this change we would only add "deletes" to the server when the
resource has been previously uploaded. This means that if a resource has
been created and then deleted before a sync, it would not be saved,
which is essentially data-loss.
This commit fixes it, so we always upload a delete entry.
2017-03-24 14:08:57 +00:00
Tom Hacohen
99fe3457fc Refresh ViewCollectionActivity when edited/deleted
Until now we were just closing it when opening a view that can cause a
change. This is nicer.
2017-03-24 13:57:25 +00:00
Tom Hacohen
0cd57851ad Journal model: call the postLoad callback on fetch too.
It's really annoying that it doesn't do it automatically as it should,
in the meanwhile, add this workaround.

I reported it to upstream:
https://github.com/requery/requery/issues/487
2017-03-24 13:57:25 +00:00
Tom Hacohen
415d5d5447 Clear journal cache on account deletion (fix account re-add issue)
Clearing the cache is a good idea regardless, though because of the
unique constraints in the cache on the journal name, this was causing
issues when deleting an account and then adding it back.
2017-03-24 13:57:25 +00:00
Tom Hacohen
f984b76ec6 Add import from vCard (vcf)/iCal (ics)
This commit adds a basic UI for importing contacts and calendars from a
file.
2017-03-24 13:57:25 +00:00
Tom Hacohen
24b170a170 View collection activity: only create fragment on first load. 2017-03-24 12:49:19 +00:00
Tom Hacohen
231684e0d4 Local event/contact: Add a way to add/update as dirty 2017-03-24 12:49:11 +00:00
Tom Hacohen
d98d58360e LocalCalendar: Add a function to get calendar by name. 2017-03-23 16:42:54 +00:00
Tom Hacohen
ec39aceb1a Mark CollectionInfo id as deprecated.
This is now implemented in the ORM and not the collection info itself.
2017-03-23 15:38:08 +00:00
Tom Hacohen
e9428c6ec7 Sync manager: Fix log messages to be the state strings and not int ids. 2017-03-12 17:08:03 +00:00
Tom Hacohen
4603cc960e Update changelog. 2017-03-10 18:16:13 +00:00
Tom Hacohen
7afb086c76 Debug activity: Show the number of entries per journal. 2017-03-10 17:15:09 +00:00
Tom Hacohen
ced3d7283d Remove change journal from main page. 2017-03-10 17:15:09 +00:00
Tom Hacohen
b0b5891e40 Add a collection view activity and move the journal viewer there 2017-03-10 17:15:09 +00:00
Tom Hacohen
3d217f47af Webview: Only load pages from a whilelist, not all.
This was causing issues with the dashboard page because of stripe.
The best mitigation at the moment, is to only load pages from a whitelist.
2017-03-10 14:38:08 +00:00
Tom Hacohen
e4043642db Suppress XSS warning.
We are only loading external websites, no use controlled data.
2017-03-10 14:36:53 +00:00
Tom Hacohen
838cc2a79d Merge contacts/calendars collection handling
This also removes the "stats" from the edit collection screen.
2017-03-10 14:19:17 +00:00
Tom Hacohen
3530821ddd JournalViewer: add an activity to view the journal.
It's very raw and hacky at the moment, it's just a preview release so
people could see their data is saved, and can look at it in its raw
form until we implement a nicer view.
2017-03-09 22:25:45 +00:00
Tom Hacohen
42a644cabb EntryEntity: make content a SyncEntry instead of a string.
It was always of this type, this change just makes it so it's
automatically converted instead of manually.
2017-03-09 22:17:22 +00:00
Tom Hacohen
cee9576155 JournalModel: persist collection info inside the model instead of sqlite
This change moves the collection info away from raw sqlite in favour of
the requery ORM.
2017-03-09 22:15:08 +00:00
Tom Hacohen
bd5beaaf91 Move SyncEntry to the models package.
This unties it from the sync manager, and will let us better reuse it.
2017-03-09 22:15:08 +00:00
Tom Hacohen
a794ee35cf Remove a mention of davdroid from log. 2017-03-09 22:15:08 +00:00
Tom Hacohen
36a8edfb5d Bump version. 2017-03-09 22:15:08 +00:00
Tom Hacohen
431c54ab91 Show the number of journal entries on the collection detail screens. 2017-03-09 22:15:02 +00:00
Tom Hacohen
29fd177a95 Cache journals locally.
This is useful both as an anti-tampering mechanism, and will be used
later when interacting with the journal is implemented.
2017-03-09 22:14:22 +00:00
Tom Hacohen
afcb00e4f1 Account screen: Use translatable strings for the titles 2017-03-09 16:57:00 +00:00
Tom Hacohen
b9b930939f Allow renaming collections.
I mistakingly disallowed it when I added the edit collection ability.
There is no problem with changing the display name.
2017-03-09 16:57:00 +00:00
Tom Hacohen
4c7ae90b36 Encryption setup page: add a note about why we are asking for an additional password. 2017-03-08 18:46:12 +00:00
Tom Hacohen
83fde4b81d Use DEBUG_REMOTE_URL to also override the webUri.
Before this commit it was only used to override the api endpoint,
not it's also used to override the weburl. This is needed since we now
load the etesync website inside the app and not in an external web
browser.
2017-03-08 17:27:48 +00:00
Tom Hacohen
baff2e886c Traslation: make log authority untranslatable. 2017-03-08 17:15:50 +00:00
Tom Hacohen
f84bd386f1 Create collection: only update url after pushed to server.
Without this change, if the putting on server of a new collection fails,
the url would already be updated, and since having a url indicates it
exists on the server, trying to save it later would result in a 404.
2017-03-08 17:11:49 +00:00
Tom Hacohen
32df64000f Add stats to the collection edit page. 2017-03-08 17:11:48 +00:00
Tom Hacohen
7bb57c15a9 Add an edit collection page. 2017-03-08 17:11:48 +00:00
Tom Hacohen
ce3483cee2 Create collection: update collection if already exists (info.url is set). 2017-03-08 17:11:48 +00:00
Tom Hacohen
e7138842c8 Journal manager: Add a way to update a journal. 2017-03-08 17:11:48 +00:00
Tom Hacohen
1b3a4bf318 Add a way to count calendar events/contacts. 2017-03-08 17:11:48 +00:00
Tom Hacohen
4a196102a1 Collection info: serialize url, but not to json. 2017-03-08 17:11:48 +00:00
Tom Hacohen
c6fbecc0ff Strings-de: Fix malformed closer. 2017-03-08 11:17:28 +00:00
Tom Hacohen
9e8cfa77fa Remove another unused string. 2017-03-08 10:16:17 +00:00
Tom Hacohen
366a69ab1f Add a contributors file. 2017-03-08 10:16:17 +00:00
Larson Maerz
f785ed77cd Update German translation. 2017-03-08 10:16:17 +00:00
Tom Hacohen
64be5a278d Merge: Open EteSync links in WebView instead of the default browser
It's nicer to have the EteSync links opened inside the app for a more native
feel until we implement the respective pages natively inside the app.
2017-03-06 17:04:41 +00:00
Tal Hacohen
8c9ec3bcc7 Replace all etesync links to open in the webview activity. 2017-03-06 17:54:18 +01:00
Tal Hacohen
c041ddb690 Add webview activity to handle etesync link. 2017-03-06 17:54:17 +01:00
Tom Hacohen
57810cd5f5 Bump version. 2017-03-02 13:56:31 +00:00