Commit Graph

2438 Commits

Author SHA1 Message Date
Torsten Grote
bca12bb0e5 Show Personal Blog When Clicking On Post in Combined Blog Feed
Closes #415
2016-08-01 11:26:53 +01:00
akwizgran
32578e2cab Merge branch '535-formatexception-when-loading-contact-list-after-receiving-invitation' into 'master'
Use Client Layer Events in ContactListFragment

This prevents trying to access the same group metadata in different groups.
Also, the conversation does not need to be reloaded once introduction messages arrive.

Closes #535

See merge request !254
2016-08-01 10:21:31 +00:00
akwizgran
0ffbc28792 Validator should call getMessageMetadataForValidator(). 2016-08-01 11:16:22 +01:00
akwizgran
38979ef504 Controllers should depend on ResultHandler not its impl. 2016-07-31 15:21:15 +01:00
akwizgran
5c186db4e4 Fixed a test that was broken by validation changes. 2016-07-31 15:18:14 +01:00
akwizgran
49437522f6 Fixed a test that was broken by my code cleanup. 2016-07-31 14:15:23 +01:00
akwizgran
6511c13752 Merge branch '544-persistentdata-classes-aren-t-thread-safe' into 'master'
Remove PersistentData classes as they aren't thread-safe

This MR depends on !244 and does not claim to resolve *all* issues with the ForumActivity.

Closes #544

See merge request !253
2016-07-30 15:52:19 +00:00
akwizgran
1bfa1016b4 Code cleanup, added FIXMEs for bigger issues. 2016-07-30 16:43:15 +01:00
akwizgran
f3d0ffa09f Merge branch '310-client-layer-events-for-forums' into 'master'
Introduce client layer events for forums

The forum UI depended on sync layer events such as `MessageStateChangedEvent`.
Now, the forum client broadcasts its own high-level event (`ForumPostReceivedEvent`)
with the information the UI needs (`ForumPostHeader`).

Closes #310

See merge request !244
2016-07-30 14:34:17 +00:00
Torsten Grote
d8272d875b Remove ForumPersistentData 2016-07-29 15:36:15 -03:00
Torsten Grote
e782e699fe Remove BlogPersistentData 2016-07-29 15:29:04 -03:00
Torsten Grote
bdb876552d Allow Validator to access metadata for pending messages
Database queries for metadata only returned it for messages that were delivered already.
However, there are cases (e.g. a pending message needs to be delivered) where
the validator needs to retrieve the metadata from the database.

For these cases, a special database query has been introduced.
2016-07-29 15:17:18 -03:00
Torsten Grote
e1bdede4f5 Introduce client layer events for forums
The forum UI depended on sync layer events such as MessageStateChangedEvent.
Now, the forum client broadcasts its own high-level event (`ForumPostReceivedEvent`)
with the information the UI needs (`ForumPostHeader`).

Closes #310
2016-07-29 15:16:52 -03:00
akwizgran
9ff4758683 Merge branch '533-explain-why-forum-can-t-be-shared-with-contact' into 'master'
Explain why forum can't be shared with contact

Closes #533

See merge request !252
2016-07-29 17:33:17 +00:00
akwizgran
fa0639d220 Overlay background colour as an alternative to setAlpha(). 2016-07-29 18:29:14 +01:00
Torsten Grote
3d22d43868 Use Client Layer Events in ContactListFragment
This prevents trying to access the same group metadata in different groups.
Also, the conversation does not need to be reloaded once introduction messages arrive.

Closes #535
2016-07-28 14:30:18 -03:00
Torsten Grote
bbf12ca0c4 Explain why forum can't be shared with contact
Closes #533
2016-07-28 11:21:34 -03:00
Ernir Erlingsson
04d2ede2e1 Merge branch '515-starting-intent-from-preferences-does-not-work-with-different-app-id' into 'master'
Allow different package IDs (for preference intents)

Closes #515

See merge request !248
2016-07-27 19:34:41 +00:00
Torsten Grote
c47171c06e Update translations and expiry date 2016-07-27 15:09:25 -03:00
Torsten Grote
7318aa562e Allow different package IDs (for preference intents)
Closes #515
2016-07-25 13:15:57 -03:00
str4d
ddbac36913 Merge branch '410-my-blogs-tab-with-option-to-add-new-blogs' into 'master'
Micro Blogs UI

**Attention:** This MR includes several other commits which are supposed to end up in separate MRs. I suggest that you review **per commit**. Once the first two commits have green light, I can split out the other commits into other MRs. This way I don't have to work myself through a long rebase chain every time I make a change to the bottom MR.

This MR is full of commits that introduce features that we will not be using initially. The last commit implements the Micro Blogs UI on top of the framework the first commits establish and hides/disables all future features for now.

I suggest we merge this as is and clean things up later when we have a clearer idea what features we will be doing eventually.

![device-2016-06-23-135016](/uploads/600fc7c28c0c6c4a60d8273ffb55f30a/device-2016-06-23-135016.png)
![device-2016-06-22-181934](/uploads/e57cfbc162150bcd01d4683d4164406e/device-2016-06-22-181934.png)
![device-2016-06-23-142422](/uploads/5814f1e13b6d2230f2e4c12a8c5cd599/device-2016-06-23-142422.png)
![device-2016-06-23-142506](/uploads/d3ac268082b98bbcd068f3d6fe0c6712/device-2016-06-23-142506.png)
![device-2016-06-22-181913](/uploads/f5dcc1ed9a40ec5fa8f634864903f4cc/device-2016-06-22-181913.png)

Closes #436 

See merge request !214
2016-07-17 03:35:36 +00:00
str4d
c019d8ecf0 Address review comments 2016-07-17 03:33:25 +00:00
Ernir Erlingsson
c12c60d000 Merge branch '356-make-it-clearer-who-will-be-introduced' into 'master'
Make it clearer who will be introduced

Show contact names under avatars before sending introduction to make it clearer who will be introduced.

![device-2016-07-08-121836](/uploads/de13f6e75b9a573e561e9c810bbdb08b/device-2016-07-08-121836.png)

Closes #356

See merge request !242
2016-07-13 18:47:09 +00:00
str4d
8504cfa88b Re-enable UI if blog post fails to publish 2016-07-13 03:16:59 +00:00
str4d
dd1eed5aa7 Cleanup after review 2016-07-13 03:08:37 +00:00
str4d
39d91e026b Update introduction message text colours 2016-07-12 23:45:36 +00:00
str4d
67aa7c3269 Merge branch '461-forum-invitation-can-not-be-accepted-if-forum-already-added' into 'master'
Show all Forum Invitations, not only the first one to prevent cut-offs and forks

This MR solves the problems outlined in #461 by always showing forum invitations, even if the user already subscribed to the forum.

Available Forums have been renamed to Forum Invitations in the UI:

![device-2016-07-07-144141](/uploads/9c8d06decdd19117250e3faca0c38192/device-2016-07-07-144141.png)
![device-2016-07-07-144150](/uploads/9803f567c962a721b24d79359974a29f/device-2016-07-07-144150.png)

Closes #461

See merge request !241
2016-07-12 23:34:22 +00:00
str4d
85f96d8865 Update forum-exists text 2016-07-12 23:32:48 +00:00
str4d
89469f9d35 Merge branch '459-remove-step-string' into 'master'
Improved the contact addition header

Closes #459

See merge request !245
2016-07-12 12:34:40 +00:00
Ernir Erlingsson
55601bc2c3 removed step string 2016-07-12 12:21:50 +02:00
Ernir Erlingsson
9a4bf598ae Merge branch '346-some-cameras-can-t-focus-on-qr-codes' into 'master'
Set focus mode properly when scanning QR codes

This simple fix contributed by @m8r-v9bo74 fixed the issue on my Xperia
Pro that could never focus on the QR code before. Focusing and scanning
still works on my other test devices.

Closes #346

See merge request !243
2016-07-12 08:37:48 +00:00
str4d
ee68e35b36 Merge branch '360-feedback-for-introducer-when-introduction-request-is-sent' into 'master'
Show Snackbar after introduction request has been sent

Closes #360

See merge request !239
2016-07-12 05:33:09 +00:00
Ernir Erlingsson
8f02cf8307 Merge branch '151-explain-what-account-creation-means-on-first-run' into 'master'
Improve Account Setup Screen

* Explain what "account creation" means on first run (#151)
* Use hints instead of dedicated text views
* Move password strength meter up into the user's view
* Always move user's view to current input field
* Improve "Forgot Password" dialog

![Screenshot_20160627-142116](/uploads/7fadc812f62c5f22f6ba73735d139064/Screenshot_20160627-142116.png)
![Screenshot_20160627-142127](/uploads/da27fb864bbe34168665a51b60747181/Screenshot_20160627-142127.png)
![Screenshot_20160627-142135](/uploads/19ddb247a043f56f9429a98e9655cd9f/Screenshot_20160627-142135.png)
![Screenshot_20160627-142153](/uploads/5d859e029a9584598a5cd6a391e697d3/Screenshot_20160627-142153.png)
![Screenshot_20160627-142204](/uploads/f59a79fc30528a17aece31f2c45d4638/Screenshot_20160627-142204.png)
![Screenshot_20160627-142241](/uploads/a493df940ae69b7ae1eecba598b4d378/Screenshot_20160627-142241.png)

Please note that the dialog button colors will be changed in !214 to the official design. Here they have the old colors.

Closes #151, #207

See merge request !229
2016-07-11 08:36:25 +00:00
Torsten Grote
193cdc42d9 Set focus mode properly when scanning QR codes
This simple fix contributed by @m8r-v9bo74 fixed the issue on my Xperia
Pro that could never focus on the QR code before. Focusing and scanning
still works on my other test devices.

Closes #346
2016-07-08 13:12:32 -03:00
Torsten Grote
91492c3068 Improve Account Setup Screen
* Explain what "account creation" means on first run
* Use hints instead of dedicated text views
* Move password strength meter up into the user's view
* Always move user's view to current input field
* Improve "Forgot Password" dialog

Closes #151
2016-07-08 12:55:04 -03:00
Torsten Grote
412bf162ce Show contact names under avatars before sending introduction
to make it clearer who will be introduced.
2016-07-08 12:39:26 -03:00
Ernir Erlingsson
3a3d717884 Merge branch '327-empty-state-design' into 'master'
Simple Empty State Messages

This MR implements very basic and simple empty state messages for the
current features.

This is how it looks (note that the contact add FAB will be removed soon):

![Screenshot_20160629-125146](/uploads/4c6a8be041cc48b0aba165dd507453d5/Screenshot_20160629-125146.png)
![device-2016-06-29-130834](/uploads/821677074d7d3e6435574a0711f3a0a7/device-2016-06-29-130834.png)
![Screenshot_20160629-125138](/uploads/a39a465db51f8e009ab0b6ee34d4a7e7/Screenshot_20160629-125138.png)
![Screenshot_20160629-125853](/uploads/1dab114bbe7ba379b20a5d298c8fa25c/Screenshot_20160629-125853.png)

Closes #327

See merge request !236
2016-07-08 08:50:10 +00:00
Torsten Grote
6301b2a9a2 Change Available Forums into Forum Invitations 2016-07-07 14:48:28 -03:00
Torsten Grote
c577efacbe Show all Forum Invitations, not only the first 2016-07-07 14:48:28 -03:00
Torsten Grote
fa5304c145 Add tests to ensure Forum Posts are synchronized both ways
even after re-sharing an existing forum.
2016-07-07 14:48:06 -03:00
Torsten Grote
f0a784b4af Merge branch '449-contact-fab' into 'master'
Removed the Fab and moved the icon into the toolbar

Closes #449

See merge request !240
2016-07-07 14:09:22 +00:00
Ernir Erlingsson
b2b97f31f3 Removed the Fab and moved the icon into the toolbar 2016-07-07 15:40:44 +02:00
Ernir Erlingsson
e9789435cc Merge branch '452-hide-identities-initially' into 'master'
Hide Identity Selector When Adding Contact

Closes #452

See merge request !233
2016-07-06 20:29:18 +00:00
Ernir Erlingsson
ba86690ce0 Merge branch '455-update-timestamps-of-messages-every-minute' into 'master'
Update Timestamps Every Minute

Yes by using `notifyDataSetChanged()` I am invalidating everything, but view binding is very fast and the RecyclerView is smart about it. I could parse the dataset and use `notifyItemChanged()` only on the elements that matter, but this is not generic and a lot more code which is not necessarily faster. I suggest we go with my simple and generic approach for now and optimize when we actually notice a performance problem.

Closes #455

See merge request !238
2016-07-06 20:25:35 +00:00
Torsten Grote
db2d965006 Show Snackbar after introduction request has been sent
Closes #360
2016-07-06 13:58:20 -03:00
Torsten Grote
b99650b070 Hide Identity Selector When Adding Contact
Closes #452
2016-07-06 13:09:41 -03:00
Torsten Grote
bc0b226fff Update Timestamps Every Minute
Closes #455
2016-07-06 11:33:25 -03:00
Ernir Erlingsson
3ae3fdab63 Merge branch '450-blog-client-unit-tests' into 'master'
Blog Client Unit and Integration Tests

Closes #450

See merge request !230
2016-07-06 09:55:16 +00:00
Torsten Grote
d8b5710a42 Blog Feed: Show 'Scroll To' link only if scrolling possible 2016-07-04 16:28:57 -03:00
Torsten Grote
fd7278b488 Combined Blog Feed
This commit addes a combined blog feed that shows all posts of all
subscribed blogs in the order the blog posts have been received.

For now, this commit also hides other blog functionality like adding
additional blogs and browsing individual blogs.

Closes #417
2016-07-04 14:37:23 -03:00