Commit Graph

2304 Commits

Author SHA1 Message Date
Torsten Grote
8c2fd905a1 Merge branch '392-use-new-metadata-queries-for-forum-sharing' into 'master'
Handle invitations to the same forum by multiple contacts

This also uses the new metadata queries in the forum sharing client.

Please note that this is based on !184.

See merge request !188
2016-05-19 14:35:58 +00:00
Torsten Grote
38a4f73cdc Handle invitations to the same forum by multiple contacts
Closes #391
2016-05-19 11:34:28 -03:00
Torsten Grote
1a175beac9 Use new metadata queries in Forum Sharing Client
Closes #392
2016-05-19 11:34:28 -03:00
Torsten Grote
7e9ff40837 Merge branch '378-replace-bdf-with-classes-for-forum-sharing-client' into 'master'
Replace BDF data structures with classes in forum sharing client

This introduces two new classes for protocol session states: One for the sharer and one for the invitee.
The respective classes for protocol state machines and actions have been moved into these classes as inner classes.
The two new classes replace the `BdfDictionary` that was used before to represent the local state information of a forum sharing session.

A similar technique is used for local actions and protocol messages.

Local actions are just represented by one Enum and protocol messages have their own classes now that also handle serialization into BdfDictionaries and BdfLists.

Closes #378 

See merge request !184
2016-05-19 14:32:41 +00:00
Torsten Grote
bd01c3732e Also use dedicated classes to represent messages instead of BdfDictionary 2016-05-19 11:32:09 -03:00
Torsten Grote
9532a60f43 Use dedicated Enum for protocol Actions 2016-05-19 11:30:23 -03:00
Torsten Grote
d2722eed92 Turn local session state into its own class instead of BdfDictionary 2016-05-19 11:30:19 -03:00
Torsten Grote
886c8feb34 Merge branch '395-convert-createidentityactivity-to-xml' into 'master'
Turn the UI of `CreateIdentityActivity` into XML

Closes #395

See merge request !194
2016-05-19 14:24:35 +00:00
str4d
c7f73f9247 Merge branch '399-contact-list-unread-messages' into 'master'
Contact List Unread Messages

Adds unread count as bubble to avatar image in contact list.

Please note that this is based on !190.

![device-2016-05-18-124534](/uploads/647dbdcff73a69eb6cf1814f85cbffe6/device-2016-05-18-124534.png)![device-2016-05-18-124339](/uploads/fa56a44f229234bb86fdebf8f9060927/device-2016-05-18-124339.png)

Closes #399

See merge request !192
2016-05-19 03:45:13 +00:00
str4d
35156d698f Merge branch '337-avatars' into 'master'
Increase Avatar border and change shadow color

![device-2016-05-16-123230](/uploads/8000fb506ee91e61149f838b3f661b46/device-2016-05-16-123230.png)
![device-2016-05-16-123251](/uploads/723bf452704f18b519c3fbdc469595a7/device-2016-05-16-123251.png)

See merge request !190
2016-05-19 03:38:09 +00:00
str4d
1366972449 Merge branch '396-convert-expiredactivity-to-xml' into 'master'
Convert ExpiredActivity to XML

Closes #396

See merge request !196
2016-05-19 03:31:06 +00:00
Torsten Grote
3d25c41e7a Add unread count as bubble to avatar image in contact list
Closes #399
2016-05-18 12:46:38 -03:00
Torsten Grote
ba928875df Merge branch '375-extract-forumfactory-from-forummanager' into 'master'
Extract ForumFactory from ForumManager

The code for creating forums in ForumManager was used by
ForumSharingManager and also needed by InviteeEngine.
This extracts it into its own class.

Closes #375

See merge request !195
2016-05-18 14:59:29 +00:00
Torsten Grote
cac0f30816 Convert ExpiredActivity to XML
Closes #396
2016-05-16 17:08:48 -03:00
Torsten Grote
aad9f5142b Extract ForumFactory from ForumManager
The code for creating forums in ForumManager was used by
ForumSharingManager and also needed by InviteeEngine.
This extracts it into its own class.

Closes #375
2016-05-16 16:56:44 -03:00
Torsten Grote
9d686e16e0 Increase Avatar border and change shadow color 2016-05-16 12:36:59 -03:00
Torsten Grote
2880043c07 Turn the UI of CreateIdentityActivity into XML
Closes #395
2016-05-16 12:19:47 -03:00
Torsten Grote
fb85345392 Merge branch '318-conversation-avatar-animation' into 'master'
Disable Conversation Exit Transition and Animate Bulb

Works-around #318

See merge request !193
2016-05-16 13:22:04 +00:00
Torsten Grote
0b67ec9201 Merge branch '372-clean-up-introduction-session-states-when-removing-contact' into 'master'
Clean up Introduction Session States

...for introducer when both introducees have been deleted.

It can't be deleted when only one introducee is removed, because then all messages in the private conversation with the other introducee will disappear, because their corresponding session state can't be found anymore.

Closes #372

See merge request !189
2016-05-16 13:18:57 +00:00
Ernir Erlingsson
fcf21b7ed7 Merge branch 'gradle-upgrade' into 'master'
Upgrade Gradle to 2.13, add local Maven repo



See merge request !186
2016-05-14 19:22:42 +00:00
Torsten Grote
6e545d0100 disable exit transition until we have a fix for it 2016-05-13 17:25:14 -03:00
str4d
69026054cd Add bulb to scene transition, make transitionName unique for each contact 2016-05-13 16:51:24 -03:00
akwizgran
b818d6846c Don't close keyboard after sending private message. #355 2016-05-13 11:55:43 +01:00
akwizgran
950c6525f6 Bumped version to 0.12 and expiry date to 1 July 2016. 2016-05-13 11:52:11 +01:00
Torsten Grote
db4b79fcae Clean up Introduction Session States
for introducer when both introducees have been deleted.

Closes #372
2016-05-12 18:21:18 -03:00
akwizgran
e0b0187157 Merge branch '222-simple-metadata-queries' into 'master'
Simple metadata queries

Adds support for retrieving metadata that matches all key/value pairs in a query object. This is a minimal version of #222 that can be extended if we need other query capabilities.

See merge request !187
2016-05-12 17:31:43 +00:00
akwizgran
0903a3e12d Merge branch '386-rotate-crash' into 'master'
Rotate crash fix

The problem was that two controllers were trying to unbind the Briar service where of course only one was needed.

I did the following

* Restructured the relevant Controllers
* Made a more permanent solution so that the last fragment will always be reloaded on config changes and Activity restarts.

Closes #386

See merge request !183
2016-05-12 17:30:55 +00:00
akwizgran
1528aa0d12 Code review nitpicks. 2016-05-12 18:29:09 +01:00
akwizgran
f2ab0eff53 Simple metadata queries. #222
Added support for retrieving metadata that matches all key/value pairs in a query.
2016-05-12 17:40:11 +01:00
akwizgran
7412ca59ac Looks like we don't need Maven Central. 2016-05-12 14:25:00 +01:00
akwizgran
ec083d617e Upgraded Gradle to 2.13, added local Maven repo. 2016-05-12 13:36:34 +01:00
akwizgran
af1f267d4b Merge branch '385-bqp-lan' into 'master'
Add BQP support to LanTcpPlugin

Closes #385

See merge request !185
2016-05-12 11:55:56 +00:00
akwizgran
5db584bd0a Merge branch '374-avatars-for-available-forums' into 'master'
Add forum avatars to list of available forums

![device-2016-05-11-152154](/uploads/864b4f42f35afe4a1dadc6cd42fa730d/device-2016-05-11-152154.png)

Closes #374

See merge request !182
2016-05-12 10:47:55 +00:00
str4d
02ed01ead8 Add BQP support to LanTcpPlugin 2016-05-12 02:49:34 +00:00
Ernir Erlingsson
eac17e74a1 cleanup 2016-05-11 23:55:45 +02:00
Ernir Erlingsson
698ca41720 Fixed the controllers and am now saving the current fragment 2016-05-11 23:50:11 +02:00
Torsten Grote
b87eb4a129 Add forum avatars to list of available forums
Closes #374
2016-05-11 15:20:34 -03:00
akwizgran
8ceaabddf4 Fixed dependencies of ForumSharingIntegrationTest. 2016-05-11 17:23:53 +01:00
akwizgran
926fdd85a8 Merge branch '337-forum-avatars' into 'master'
Forum Avatars

These new forum avatars are using the first letter of the forum and calculate the background color from forum's group ID.

Closes #337

![device-2016-05-11-124106](/uploads/afe926066f4306500c6ee23bb93b5b5b/device-2016-05-11-124106.png)

See merge request !178
2016-05-11 16:01:56 +00:00
Torsten Grote
e87991ecac Forum Avatars using the first letter of the forum and color from group
Also prevents the snackbar from hiding the bottom of the list.

Closes #337
2016-05-11 12:47:54 -03:00
akwizgran
3193b73687 Merge branch 'start-plugins-async' into 'master'
Start plugins asynchronously

This prevents other services from getting stuck behind the plugin manager while the Tor plugin is starting, which takes several seconds. The plugin manager waits for each plugin to start before stopping it.

I've also added some canaries to plugins and services to ensure instances aren't started more than once.

See merge request !181
2016-05-11 14:46:55 +00:00
akwizgran
3680cad9b8 Merge branch 'poller-refactoring' into 'master'
Poller refactoring, replace Timer with ScheduledExecutorService

* Replace Timer with ScheduledExecutorService (closes #258)
* Move automatic connection logic from PluginManager to Poller
* Reschedule polling when connections are opened or closed, making the poller more responsive to reductions in the polling interval


See merge request !180
2016-05-11 14:45:50 +00:00
akwizgran
3d8dd899a0 Merge branch '328-report-primer' into 'master'
Collect dev report data on a thread with a looper

Closes #328.

See merge request !166
2016-05-11 14:42:12 +00:00
akwizgran
2f11f81582 Collect dev report data on a thread with a looper. #328 2016-05-11 15:41:22 +01:00
akwizgran
6873dbc493 UI code cleanup. 2016-05-11 13:52:40 +01:00
akwizgran
7a3bcc58ae Inject fragments. Fixes an NPE due to uninitialised fields. 2016-05-11 13:31:45 +01:00
akwizgran
2a980af69a Set border of author avatars to @color/briar_primary. 2016-05-11 11:54:40 +01:00
akwizgran
41e282f19a Merge branch '274-code-encapsulation' into 'master'
274 code encapsulation

The goal of this branch is to better compartmentalize, structure and simplify the code in the Android module. It does this via the following techniques:

* Extended use of Dagger by introducing a component for Activities that injects, among other things, SharedPreferences and Fragments. The latter makes it possible to mock fragments more easily and letting Dagger automatically handle its injections.
* Decouple Briar API code, from the activities and Fragments, and encapsulate in re-usable Controller classes
* Introduce a UI-thread App event bus that the Helper classes use to communicate with Activities & Fragments.
* Define the testing methods in the briar-android module per Robolectric and Mockito

NOTE! Don't be alarmed if you see the contact introduction message one more time, one of the changes was to purify UI shared preferences from the Briar shared preferences, which now only contain preferences related to the API and it's usage.

closes #274 



See merge request !130
2016-05-11 10:54:07 +00:00
Ernir Erlingsson
f81c8fcbd0 rebased with master 2016-05-11 12:22:53 +02:00
Ernir Erlingsson
c93e78f178 modifications based on Akwizgran's comments 2016-05-11 11:55:17 +02:00