Commit Graph

455 Commits

Author SHA1 Message Date
Ernir Erlingsson
8bb1d444c6 interlude 2016-05-11 11:52:56 +02:00
Ernir Erlingsson
adb7d37f86 implementing robolectric and mockito 2016-05-11 11:52:56 +02:00
Ernir Erlingsson
aa3ef896f5 further polish 2016-05-11 11:52:56 +02:00
Ernir Erlingsson
da50c5dcc3 cleanup and minor refactoring 2016-05-11 11:52:56 +02:00
Ernir Erlingsson
e809aaa932 merge and update 2016-05-11 11:50:34 +02:00
Ernir Erlingsson
ef3b41dc1d comment & log cleanup 2016-05-11 11:50:34 +02:00
Ernir Erlingsson
604cfd5202 Fix transport update 2016-05-11 11:50:34 +02:00
Ernir Erlingsson
a14e981236 Switched AppBus for ResultHandler, Controller for Helper. Added the basics for LifecycleControllers and implemented it for BriarActivity and NavDrawerActivity 2016-05-11 11:50:34 +02:00
Ernir Erlingsson
27098db18f fix compile error 2016-05-11 11:50:34 +02:00
Ernir Erlingsson
8d021aab50 cleaning up 2016-05-11 11:50:34 +02:00
Ernir Erlingsson
5d8ba660c2 merge 2016-05-11 11:50:33 +02:00
Ernir Erlingsson
a9de12520d phase 2: helpers and app bus 2016-05-11 11:42:38 +02:00
Ernir Erlingsson
7b552bde1e phase 1: Activities and Fragments 2016-05-11 11:42:38 +02:00
akwizgran
1724fbe5a9 Merge branch '121-new-forum-sharing-ui' into 'master'
Forum Sharing Client UI

This changes `ShareForumActivity` to use two fragments to facilitate
forum sharing with the new Forum Sharing Client backend.

The `ContactSelectorFragment` allows the user to select a
number of contacts. If there is an ongoing sharing session or the forum
is already shared with the contact, it is disabled in the list. If there
is at least one contact selected, a button appears in the toolbar that
brings the user to the `ShareForumMessageFragment` where the user can
write an optional message to be send along with the invitation.

After sending an invitation, the user is brought back to the forum that
she shared and there is a snackbar showing up briefly to indicate the
successful invitation.

The invitation is shown along with the message within the private
conversation of each contact. The person who shares the forum also sees
the invitation and the message as outgoing messages that also display
the current status of the messages.

A notification is shown like for other private messages as well.

Please note that this commit does not include a way for users to respond
to invitations. This is in MR !172. Both MRs are based on the new backend in !170.

![device-2016-05-03-182928](/uploads/48499ca4c149a8e7f13f8b28a24537ad/device-2016-05-03-182928.png)
![device-2016-05-03-182855](/uploads/5f49c43bf8f39780862247848a5b9c27/device-2016-05-03-182855.png)

See merge request !171
2016-05-11 09:13:07 +00:00
Torsten Grote
3a9d66a85f Forum Sharing Client UI
This changes `ShareForumActivity` to use two fragments to facilitate
forum sharing with the new Forum Sharing Client backend.

The `ContactSelectorFragment` allows the user to select a
number of contacts. If there is an ongoing sharing session or the forum
is already shared with the contact, it is disabled in the list. If there
is at least one contact selected, a button appears in the toolbar that
brings the user to the `ShareForumMessageFragment` where the user can
write an optional message to be send along with the invitation.

After sending an invitation, the user is brought back to the forum that
she shared and there is a snackbar showing up briefly to indicate the
successful invitation.

The invitation is shown along with the message within the private
conversation of each contact. The person who shares the forum also sees
the invitation and the message as outgoing messages that also display
the current status of the messages.

A notification is shown like for other private messages as well.

Please note that this commit does not include a way for users to respond
to invitations.
2016-05-10 21:04:08 -03:00
Torsten Grote
bcfdd848a4 Modernize AvailableForumsActivity
Turn list of available forums into a BriarRecyclerView with XML layout.
Allow to respond to forum invitations from the list of available forums.
The user can either accept or decline an invitation.
2016-05-10 20:07:42 -03:00
akwizgran
0b3486536e Merge branch '305-new-forum-list' into 'master'
New List of Forums

The adapter of the `ForumListFragment` has been changed into a
`BriarRecyclerView` and all its code has been adapted and simplified
accordingly.

All UI of the forum list is now defined in XML layouts. This enabled me to move the snackbar into onCreate().

Before:

![device-2016-05-03-165331](/uploads/961cc2c043464f446584de4ae0ad527b/device-2016-05-03-165331.png)

After:

![device-2016-05-03-165117](/uploads/e22ede3e9a3330762b3ae84f86ca6ec5/device-2016-05-03-165117.png)


See merge request !175
2016-05-10 14:55:47 +00:00
akwizgran
f22ea85222 Merge branch '322-forum-sharing-client' into 'master'
Forum Sharing Client Backend

This MR replaces the old `ForumSharingManagerImpl` with a new one
which is based on state machines and the `ProtocolEngine`.

There is a `SharerEngine` and a `InviteeEngine` that take care of state
transitions, messages, events and trigger actions to be carried out by
the `ForumSharingManagerImpl`. This is all very similar to the
Introduction Client.

The general sharing paradigm has been changed from sharing as a state to
sharing as an action. Now the UI can allow users to invite contacts to
forums. The contacts can accept or decline the invitation. Also, the
Forum Sharing Manager is notified when users leave a forum.

Please note that you will need the UI to actually test this. It is coming up soon in another MR.

Closes #322

See merge request !170
2016-05-09 16:30:21 +00:00
str4d
b81a567468 First part of BQP UI improvements.
Includes parallel improvements to Bluetooth key exchange UI.
2016-05-06 13:57:30 +01:00
akwizgran
2ecccc66d1 Ensure that Plugin instances aren't reused. 2016-05-06 12:14:38 +01:00
akwizgran
69f23ead9b Ensure that Service instances aren't reused. 2016-05-06 12:14:37 +01:00
akwizgran
33c1f16356 Merge branch '370-nav-drawer-remember-fragment' into 'master'
Remember the selected fragment from the NavDrawer

and stay in it when configuration changes

Closes #370

See merge request !176
2016-05-06 09:20:06 +00:00
Torsten Grote
271e390b9d New List of Forums
The adapter of the `ForumListFragment` has been changed into a
`BriarRecyclerView` and all its code has been adapted and simplified
accordingly.

All UI of the forum list is now defined in XML layouts.
2016-05-04 18:07:12 -03:00
Torsten Grote
9bef114c35 Forum Sharing Client backend
This commit replaces the old ForumSharingManagerImpl with a new one
which is based on state machines and the ProtocolEngine.

There is a SharerEngine and a InviteeEngine that take care of state
transitions, messages, events and trigger actions to be carried out by
the ForumSharingManagerImpl. This is all very similar to the
Introduction Client.

The general sharing paradigm has been changed from sharing as a state to
sharing as an action. Now the UI can allow users to invite contacts to
forums. The contacts can accept or decline the invitiation. Also, the
Forum Sharing Manger is notified when users leave a forum.

Closes #322
2016-05-04 17:02:22 -03:00
Torsten Grote
6f1360c398 Remember the selected fragment from the NavDrawer
and stay in it when configuration changes

Closes #370
2016-05-04 11:25:05 -03:00
akwizgran
5a84e0fe5c Added "Touch to open Briar" to ongoing notification. 2016-05-04 09:32:47 +01:00
akwizgran
5fab9c383d Updated forum toasts and renamed delete icon. 2016-05-03 16:21:26 +01:00
akwizgran
da60e567e0 Merge branch '305-remove-forum' into 'master'
Move forum removal action from long press menu to action bar

This is part of the UI changes for #305 

See merge request !164
2016-05-03 15:02:01 +00:00
Torsten Grote
684898ef09 Move forum removal action from long press menu to action bar
part of UI changes for #305
2016-05-03 12:00:09 -03:00
akwizgran
3b65144ff6 Merge branch '154-ongoing-notification' into 'master'
Set ongoing notification to minimum priority

Setting the priority of the ongoing notification to PRIORITY_MIN prevents it from being shown in the status bar on Android 4.1 and later. The service still runs in the foreground.

Thanks to @str4d for finding the solution. Closes #154.

See merge request !169
2016-05-03 14:59:19 +00:00
Torsten Grote
9f9a216305 Prepare for new Forum Sharing Client
Methods for creating, adding and removing forums have been moved to the
`ForumManager`. In order to still handle removing forums properly, a
`RemoveForumHook` has been introduced.

Methods for sharing forums with all current and future contacts have
been removed along with the localGroup where this information was saved.

The `ShareForumActivity` now has the proper label.

The `SessionId` and the `ProtocolEngine` have been moved to the
`clients` package.

This addresses part of #322 and part of what has been discussed in #320.
2016-05-03 11:48:45 -03:00
akwizgran
b57b65e803 Merge branch '331-viewfinder' into 'master'
Reinitialise viewfinder when camera view is shown

Thanks to @str4d for finding the cause of the bug. Closes #331.

See merge request !165
2016-05-03 14:38:37 +00:00
akwizgran
160adca198 Merge branch 'use-android-executor' into 'master'
Use Android executor for background API calls

Some Android API calls need to be made from a thread with a message queue, but to keep the UI responsive they shouldn't be made from the UI thread.

This patch gives AndroidExecutor a captive thread with a message queue to execute tasks, and converts various background tasks from creating their own threads to using AndroidExecutor and IoExecutor.

This allows us to upgrade the support library to 23.2.1. Fixes #332.

See merge request !161
2016-05-03 14:34:49 +00:00
akwizgran
3d4abee1a4 Merge branch '305-forum-list-snackbar' into 'master'
Add Snackbar and Toolbar Button to Forum List

This MR is a small change that replaces the custom UI elements in
the forum list with a Snackbar and a Toolbar menu.

It also fixes a background color that was still present with fragment from the NavDrawer.

Before:

![before](/uploads/6dcc545827c035dcffcdf7863893753e/before.png)

After:

![after](/uploads/427de01d8bec779ee81e6ebded3fcd2b/after.png)

It addresses one part (2b) of #305 and is part of #121.


See merge request !163
2016-05-03 13:51:44 +00:00
akwizgran
25b165ac1e Set ongoing notification to minimum priority. #154 2016-05-03 14:14:15 +01:00
akwizgran
7ad21708fe Reinitialise viewfinder when camera view is shown. #331 2016-05-03 09:53:09 +01:00
akwizgran
ea973b61c6 Bumped expiry date to 1 June 2016. 2016-05-02 17:02:01 +01:00
Torsten Grote
82e1ef0ea6 Add Snackbar and Toolbar Button to Forum List
This commit is a small change that replaces the custom UI elements in
the forum list with a Snackbar and an Toolbar menu.

Addresses one part (2b) of #305
2016-05-02 13:00:19 -03:00
akwizgran
0a088af010 Use IoExecutor for background IO tasks. 2016-05-02 16:54:40 +01:00
akwizgran
c21854fbe4 Use AndroidExecutor for background tasks that make API calls. 2016-05-02 16:54:35 +01:00
akwizgran
c72e5be804 Removed old user feedback activity. #336 2016-04-29 22:54:37 +01:00
akwizgran
29071fcc79 Merge branch '325-briar-recycler-view' into 'master'
Don't allow 'this' to escape the constructor

Fixes #325.

See merge request !155
2016-04-29 21:20:02 +00:00
str4d
1a90d3c39f Don't save the user's email automatically from crash reports 2016-04-28 16:44:05 +12:00
str4d
c44b6a4095 Implement encrypted feedback 2016-04-28 16:44:01 +12:00
akwizgran
f2fc0a43c9 Don't delete unsent reports on application start 2016-04-27 22:22:21 +12:00
akwizgran
d06a6e25cb Check that result of File#listFiles() is not null. 2016-04-27 22:22:21 +12:00
str4d
f73f0aa4ab Migrate crash reports to ACRA 2016-04-27 22:22:16 +12:00
akwizgran
8630f6f24f Don't allow 'this' to escape the constructor. 2016-04-26 10:03:28 +01:00
akwizgran
141d6497ef Removed unused layout code and imports. 2016-04-26 09:34:48 +01:00
akwizgran
11a4ca6b9c Merge branch '271-port-splash-and-create-forum' into 'master'
Converts the splash screen to XML format

Removes all programatic calls that modify the layout and uses the XML
resource instead.

See merge request !123
2016-04-26 08:13:29 +00:00