Commit Graph

2381 Commits

Author SHA1 Message Date
Torsten Grote
d05237d2c1 My Blogs tab: Show all blogs the user created
This does not yet support multiple identities. It just shows blogs
created by the first identity, but can easily be adapted for
multi-identity support.

Closes #410
2016-07-04 14:35:08 -03:00
Torsten Grote
4c4f4ad2d5 Add a My Blogs tab with option to add new blogs
Clicking the plus in the toolbar open the `CreateBlogActivity` which
allows the user to create a new blog. Only the first identity is
considered, but support for more identities can be easily added later.

The actual list of blogs in the My Blogs tab will be done in the next
commit.
2016-07-04 14:35:07 -03:00
str4d
759b1c7448 Merge branch '333-font-color' into 'master'
Font Colors and Separate Themes

Once applied this commit will change the font colors according to the
design and move all themes into a dedicated file.

Closes #333

See merge request !228
2016-07-03 00:07:03 +00:00
Ernir Erlingsson
57ce7e3f63 Merge branch '397-remove-unused-java-layout-helpers' into 'master'
Remove unused Java layout helpers

Closes #397

See merge request !232
2016-07-01 13:13:16 +00:00
Torsten Grote
f84bba5d79 Remove unused Java layout helpers
Closes #397
2016-06-30 12:03:12 -03:00
Torsten Grote
bb6e249980 Merge branch '230-make-timestamps-prettier-and-more-useful' into 'master'
Make timestamps prettier and more useful

Here's some example timestamps I have been testing with. That's how it will look like when this MR is merged:

![device-2016-06-28-184748](/uploads/c082ac0f54b50c27f9a1c5ef8865998b/device-2016-06-28-184748.png)

Closes #230

See merge request !235
2016-06-30 14:16:07 +00:00
Torsten Grote
d8df9c9955 Make timestamps prettier and more useful 2016-06-30 11:14:12 -03:00
Ernir Erlingsson
ebe80c773d Merge branch '326-trim-leading-and-trailing-whitespace-when-displaying-messages' into 'master'
Trim leading and trailing whitespace when displaying messages

Closes #326

See merge request !234
2016-06-29 21:24:37 +00:00
Torsten Grote
123f59cd96 Trim leading and trailing whitespace when displaying messages
Closes #326
2016-06-28 17:01:41 -03:00
Torsten Grote
66a1f85859 Font Colors and Separate Themes
Once applied this commit will change the font colors according to the
design and move all themes into a dedicated file.

Closes #333
2016-06-28 12:16:57 -03:00
Torsten Grote
f270624f39 Merge branch '365-contact-exchange-protocol' into 'master'
Deduplicate contact exchange protocol

`ContactExchangeTask` was originally extracted from the Bluetooth invitation task; this completes the refactoring.

Closes #365.

See merge request !199
2016-06-27 16:06:38 +00:00
Torsten Grote
94927c2f60 Bumped expiry date to 1 August 2016. 2016-06-27 11:39:43 -03:00
Torsten Grote
ecbf5621f2 Merge branch '448-make-use-of-existing-translations' into 'master'
Make use of Existing Translations

Adds first translations to source code and sets up transifex config
file. Pull more translations later with:

```bash
 cd briar-android
 tx pull --mode=developer
```
Closes #448

![device-2016-06-23-145337](/uploads/14c557adf185dce516ca94295b4db965/device-2016-06-23-145337.png)

See merge request !226
2016-06-27 14:35:04 +00:00
Torsten Grote
4d3a333915 Make use of Existing Translations
Adds first translations to source code and sets up transifex config
file. Pull more translations later with:

 cd briar-android
 tx pull --mode=developer

Closes #448
2016-06-27 11:31:42 -03:00
Ernir Erlingsson
9ac1a13711 Merge branch '442-author-s-identicon-nickname-and-status-are-separated-in-forum-post-layout' into 'master'
Separate Date and Author Name in Forum Posts

This also fixes the issue there the trust indicator was shown at the top on some devices.

![device-2016-06-23-152315](/uploads/62786502942bbccadf809fedd72cedd1/device-2016-06-23-152315.png)

Closes #442

See merge request !227
2016-06-27 10:09:54 +00:00
Ernir Erlingsson
946d7cb3e7 Merge branch '446-addidentityhook-sometimes-not-run-for-first-identity' into 'master'
Fix IdentityManager hooks

This commit makes sure that there is only one identity manager that is
initialized early enough so hooks can be added properly.

Closes #446

See merge request !225
2016-06-27 10:00:31 +00:00
str4d
b71a303bf8 Deduplicate contact exchange protocol
ContactExchangeTask was originally extracted from the Bluetooth invitation
task; this completes the refactoring.
2016-06-25 13:41:58 +12:00
Torsten Grote
a9996b4fb1 Separate Date and Author Name in Forum Posts
Closes #442
2016-06-23 15:24:21 -03:00
Torsten Grote
9c2250277b Fix IdentityManager hooks
This commit makes sure that there is only one identity manager that is
initialized early enough so hooks can be added properly.

Closes #446
2016-06-23 14:04:25 -03:00
Torsten Grote
4176f592df Merge branch '436-automatic-personal-blogs-backend' into 'master'
Backend for Automatic Micro Blogs

This MR introduces automatic personal blogs to the Blog client. When a contact is added, her personal blog will also be added automatically. Also, when a new identity is added, a personal blog for that identity is created.

The first commit changes the blog paradigm to short-form blogs and introduces other things that will be useful later in the UI (!214) such as a BlogPostAdded event and the possibility to delete/remove blogs (not the personal ones).

This MR is based on !224 to prevent crashes that are fixed by it. So please review and merge !224 first.

See merge request !223
2016-06-23 15:05:46 +00:00
Torsten Grote
91aa81041e Store and expose time a blog post was received
This is useful when sorting blog posts in the combined feed. It ensures
you do not miss older posts that were just synced to you.
2016-06-23 11:58:25 -03:00
Torsten Grote
a8f51fcb8a Backend for Automatic Personal Blogs
When a contact is added, her personal blog will also be added automatically.
Also, when a new identity is added, a personal blog for that identity is created.

Part of #436
2016-06-23 11:58:25 -03:00
Torsten Grote
30fe9f6e2a Change Blog Paradigm to Short-Form
Removes teaser and makes body mandatory.

It also adds support for deleting blogs and
introduces a getAuthorStatus() method to the IdentityManager
that takes a running transaction.
2016-06-23 10:47:44 -03:00
str4d
5a9615265e Merge branch '441-group-descriptor-can-be-too-long-causes-crash' into 'master'
Remove MAX_GROUP_DESCRIPTOR_LENGTH

Closes #441

See merge request !224
2016-06-23 09:27:48 +00:00
Torsten Grote
59320f02b7 Remove MAX_GROUP_DESCRIPTOR_LENGTH
Closes #441
2016-06-22 11:47:38 -03:00
Torsten Grote
3e4be038f2 Merge branch '426-forum-improvements' into 'master'
Forum improvements

Forum Activity improvements:

* Orientation changes now restore the activity properly, e.g. input text and state is retained
* Snack bar is now, when appropriate, clickable
* The bottom divider is no longer visible for the bottom entry
* Code refactoring for improved simplicity and less redundancy
* Timestamp check to ensure that new posts are not older than the latest post

Closes #426 
Closes #423 
Closes #424 

See merge request !218
2016-06-22 14:45:44 +00:00
Ernir Erlingsson
a2a5b746c5 Forum improvements 2016-06-22 13:50:12 +02:00
Torsten Grote
08cc5500ef Merge branch 'nav-drawer-instance-restore-fix' into 'master'
Fixing fragment instance restore

Alas, it turns out that my neat way of integrating the Fragments into the dependency graph was not without problems. Me and @grote discovered that this presented us with a lot of problems on orientation changes as the Activity is re-created, and therefore parts of the dependency graph. The simplest solution was simply to abandon the idea, i.e. with this branch Fragments are no longer part of the dependency graph. 

See merge request !215
2016-06-21 13:59:56 +00:00
Torsten Grote
ee0c4c07a7 Merge branch '354-private-chat-input-field' into 'master'
synched conversation and forum input

Closes #354

See merge request !219
2016-06-21 12:10:35 +00:00
Ernir Erlingsson
ac8c1c0eee synched conversation and forum input 2016-06-21 13:47:33 +02:00
Ernir Erlingsson
8a29207bd0 Fixing fragment instance restore 2016-06-20 21:56:50 +02:00
Torsten Grote
192ee41600 Merge branch '403-blog-sharing-client' into 'master'
Implement Blog Sharing Client

Closes #403

See merge request !220
2016-06-20 17:16:45 +00:00
str4d
13e3eec6b3 Implement BlogSharingManager 2016-06-18 19:02:52 +12:00
str4d
9ae64124d3 Factor out generic sharing code from ForumSharingManger 2016-06-18 19:02:48 +12:00
Ernir Erlingsson
5df2776dc2 Merge branch '78-fix-test' into 'master'
Fix test broken by #78



See merge request !221
2016-06-17 08:31:35 +00:00
str4d
19fdf3ffd0 Fix test broken by #78 2016-06-17 04:48:13 +00:00
Ernir Erlingsson
e7dce02709 Merge branch '402-blog-client-implementation' into 'master'
Blog Client with Factories and Validator

This implements a simple initial blog client that covers the basic blog actions, but no deletion/removal of blogs, yet.

Classes for Blogs and Blog Post Headers have been introduced along with the associated factories.

A `BlogPostValidator` has been added that validates incoming blog posts.

Closes #402
Closes #404

See merge request !212
2016-06-15 20:26:35 +00:00
Ernir Erlingsson
f823b8ba4c Merge branch '78-trust-indicators' into '402-blog-client-implementation'
New Trust Level Indicator Replaces The Stars

This implements a generic `TrustIndicatorView` with a `setTrustLevel()`
method which updates the drawable according to the `Author.State`.

It also removes unused files from the repo.

This is based on !212 and should only be merged after it.

Closes #78

See merge request !217
2016-06-15 20:17:59 +00:00
Torsten Grote
dc048187f5 New Trust Level Indicator Replaces The Stars
This implements a generic `TrustIndicatorView` with a `setTrustLevel()`
method which updates the drawable according to the `Author.State`.

Closes #78
2016-06-15 12:41:43 -03:00
Torsten Grote
da68ef78f1 Blog Client with Factory and Validator
This implements a simple initial blog client that covers the basic blog
actions, but no deletion/removal of blogs, yet.

Classes for Blogs and Blog Post Headers have been introduced along with
the associated factories.

A `BlogPostValidator` has been added that validates incoming blog posts.

Closes #402
Closes #404
2016-06-15 11:16:28 -03:00
Torsten Grote
bbed673150 Merge branch '433-forum-persistance' into 'master'
fix persistance

Closes #433

See merge request !216
2016-06-15 14:11:42 +00:00
Ernir Erlingsson
69b0bec033 fix persistance 2016-06-14 23:53:05 +02:00
str4d
a11e30c2b3 Merge branch '390-change-password' into 'master'
Add a UI for changing the password

Closes #390

See merge request !213
2016-06-11 22:51:24 +00:00
str4d
c5708ee3ce Add a UI for changing the password 2016-06-11 22:49:45 +00:00
Torsten Grote
e96838e731 Merge branch '430-npe-in-forumsharingstatusactivity' into 'master'
Fix NPE in ForumSharingStatusActivity by only accessing group in contact list

Only access group in contact list where it is guaranteed to exist.

Closes #430

See merge request !211
2016-06-08 13:49:09 +00:00
Torsten Grote
6697b06530 Fix NPE in ForumSharingStatusActivity
by checking if a group ID exists.

Closes #430
2016-06-08 10:47:47 -03:00
Torsten Grote
1bb17a3979 Merge branch '309-client-layer-events-for-messaging' into 'master'
Client layer events for messaging

Adds and uses a new `PrivateMessageReceivedEvent` and eliminate the need for an event for adding local messages. Both done in separate commits.

This addresses part of #309

See merge request !208
2016-06-08 13:37:34 +00:00
Torsten Grote
9d826631e9 Add private message to list right away, so eliminate need for an event 2016-06-08 10:31:26 -03:00
Torsten Grote
b26acdf228 Introduce a PrivateMessageReceivedEvent and use it in the Android app 2016-06-08 10:31:26 -03:00
Torsten Grote
69fba1aa17 Merge branch '388-forum-sharing-race-condition' into 'master'
Address Race-Condition in Forum Sharing

When Two Contacts Share Same Forum with each other at the same time a race condition causes them both to delete each other's invitation. This is solved by an Alice/Bob test as suggested in #388.

See merge request !205
2016-06-08 13:29:12 +00:00